NxWidgets server initialization must be performed in the kernel when NxWdigets is built in kernel mode

10 files changed, 989 insertions, 176 deletions

diff --git a/NxWidgets/ChangeLog.txt b/NxWidgets/ChangeLog.txt
index f45fde705..d29b815aa 100644
--- a/NxWidgets/ChangeLog.txt
+++ b/NxWidgets/ChangeLog.txt
@@ -411,3 +411,9 @@
   the one-time, start-up initialization logic (2013-10-30).
 
 1.11 2014-xx-xx Gregory Nutt <gnutt@nuttx.org>
+
+* NxWidgets/Kconfig and NxWidgets::CNxServer:  Server initialization can
+  now be disabled in the configuration (in fact, it is disabled by default).
+  This is because in the kernel build mode, the NX server must be initialized
+  in kernel mode by the RTOS before applications using the server run in
+  user mode.
diff --git a/NxWidgets/Kconfig b/NxWidgets/Kconfig
index 0ee006aba..b6ac4fb7d 100644
--- a/NxWidgets/Kconfig
+++ b/NxWidgets/Kconfig
@@ -26,9 +26,17 @@ config NXWIDGETS_FLICKERFREE
 		lower-performance flicker-reductions measures where-ever thay may
 		be available.
 
+config NXWIDGETS_EXTERNINIT
+	bool "External display Initialization"
+	default 0
+	depends on NXWIDGET_SERVERINIT
+	---help---
+		Define to support external display initialization.
+
 config NXWIDGETS_DEVNO
 	int "LCD Device Number"
 	default 0
+	depends on NXWIDGETS_EXTERNINIT || NX_LCDDRIVER
 	---help---
 		LCD device number (in case there are more than one LCDs connected).
 		Default: 0
@@ -39,6 +47,22 @@ config NXWIDGETS_VPLANE
 	---help---
 		Only a single video plane is supported. Default: 0
 
+if NX_MULTIUSER
+
+config NXWIDGET_SERVERINIT
+	bool "Start server"
+	default y
+	depends on !NUTTX_KERNEL
+	---help---
+		If this option is selected, then the NxWidgets::CNxServer class will
+		bring up the NX server when it is initialized.  If this option is
+		not selected then the NxWidgets::CNxServer constructor
+		initialization logic will assume that the NX server has been started
+		by other, external logic and will simply attempt to connect to the
+		server.
+
+if NXWIDGET_SERVERINIT
+
 config NXWIDGETS_SERVERPRIO
 	int "NX Server priority"
 	default 110
@@ -57,6 +81,8 @@ config NXWIDGETS_SERVERSTACK
 	---help---
 		NX server thread stack size (in multi-user mode).  Default 2048
 
+endif # NXWIDGET_SERVERINIT
+
 config NXWIDGETS_CLIENTPRIO
 	int "NX Client Priority"
 	default 100
@@ -78,10 +104,7 @@ config NXWIDGETS_LISTENERSTACK
 	---help---
 		NX listener thread stack size (in multi-user mode).  Default 2048
 
-config NXWIDGETS_EXTERNINIT
-	bool "Extern LCD Initialization"
-	---help---
-		Define to support external display initialization.
+endif # NX_MULTIUSER
 
 config NXWIDGET_EVENTWAIT
 	bool "Event Waiting"
diff --git a/NxWidgets/libnxwidgets/src/cnxserver.cxx b/NxWidgets/libnxwidgets/src/cnxserver.cxx
index 15f9bce5a..84f6701da 100644
--- a/NxWidgets/libnxwidgets/src/cnxserver.cxx
+++ b/NxWidgets/libnxwidgets/src/cnxserver.cxx
@@ -1,7 +1,7 @@
 /****************************************************************************
  * NxWidgets/libnxwidgets/src/cnxserver.cxx
  *
- *   Copyright (C) 2012 Gregory Nutt. All rights reserved.
+ *   Copyright (C) 2012, 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -156,7 +156,8 @@ bool CNxServer::connect(void)
   // Turn the LCD on at 75% power
 
   (void)m_hDevice->setpower(m_hDevice, ((3*CONFIG_LCD_MAXPOWER + 3)/4));
-#else
+
+#else // CONFIG_NX_LCDDRIVER
   int ret;
 
   // Initialize the frame buffer device
@@ -175,7 +176,8 @@ bool CNxServer::connect(void)
              CONFIG_NXWIDGETS_VPLANE);
       return false;
     }
-#endif
+
+#endif // CONFIG_NX_LCDDRIVER
 
   // Then open NX
 
@@ -188,7 +190,7 @@ bool CNxServer::connect(void)
 
   return true;
 }
-#endif
+#endif // CONFIG_NX_MULTIUSER
 
 /**
  * Connect to the NX Server -- Multi user version
@@ -212,6 +214,7 @@ bool CNxServer::connect(void)
       return false;
     }
 
+#ifdef CONFIG_NXWIDGET_SERVERINIT
   // Start the server task
 
   gvdbg("CNxServer::connect: Starting server task\n");
@@ -227,6 +230,8 @@ bool CNxServer::connect(void)
 
   usleep(50*1000);
 
+#endif // CONFIG_NXWIDGET_SERVERINIT
+
   // Connect to the server
 
   m_hNxServer = nx_connect();
@@ -286,7 +291,7 @@ bool CNxServer::connect(void)
 
   return true;
 }
-#endif
+#endif // CONFIG_NX_MULTIUSER
 
 /**
  * Disconnect to the NX Server -- Single user version
@@ -303,7 +308,7 @@ void CNxServer::disconnect(void)
       m_hNxServer = NULL;
     }
 }
-#endif
+#endif // CONFIG_NX_MULTIUSER
 
 /**
  * Disconnect to the NX Server -- Single user version
@@ -336,14 +341,14 @@ void CNxServer::disconnect(void)
       m_hNxServer = NULL;
     }
 }
-#endif
+#endif // CONFIG_NX_MULTIUSER
 
 /**
  * NX server thread.  This is the entry point into the server thread that
  * serializes the multi-threaded accesses to the display.
  */
 
-#ifdef CONFIG_NX_MULTIUSER
+#if defined(CONFIG_NX_MULTIUSER) && defined(CONFIG_NXWIDGET_SERVERINIT)
 int CNxServer::server(int argc, char *argv[])
 {
   FAR NX_DRIVERTYPE *dev;
@@ -381,7 +386,8 @@ int CNxServer::server(int argc, char *argv[])
   // Turn the LCD on at 75% power
 
   (void)dev->setpower(dev, ((3*CONFIG_LCD_MAXPOWER + 3)/4));
-#else
+
+#else // CONFIG_NX_LCDDRIVER
   // Initialize the frame buffer device
 
   ret = up_fbinitialize();
@@ -397,7 +403,8 @@ int CNxServer::server(int argc, char *argv[])
       gdbg("up_fbgetvplane failed, vplane=%d\n", CONFIG_NXWIDGETS_VPLANE);
       return 2;
     }
-#endif
+
+#endif // CONFIG_NX_LCDDRIVER
 
   // Then start the server
 
@@ -405,7 +412,7 @@ int CNxServer::server(int argc, char *argv[])
   gvdbg("nx_run returned: %d\n", errno);
   return EXIT_FAILURE;
 }
-#endif
+#endif // CONFIG_NX_MULTIUSER && CONFIG_NXWIDGET_SERVERINIT
 
 /**
  * This is the entry point of a thread that listeners for and dispatches
@@ -458,4 +465,4 @@ FAR void *CNxServer::listener(FAR void *arg)
   sem_post(&This->m_connsem);
   return NULL;
 }
-#endif
+#endif // CONFIG_NX_MULTIUSER
diff --git a/apps/NxWidgets/Kconfig b/apps/NxWidgets/Kconfig
index 0ee006aba..b6ac4fb7d 100644
--- a/apps/NxWidgets/Kconfig
+++ b/apps/NxWidgets/Kconfig
@@ -26,9 +26,17 @@ config NXWIDGETS_FLICKERFREE
 		lower-performance flicker-reductions measures where-ever thay may
 		be available.
 
+config NXWIDGETS_EXTERNINIT
+	bool "External display Initialization"
+	default 0
+	depends on NXWIDGET_SERVERINIT
+	---help---
+		Define to support external display initialization.
+
 config NXWIDGETS_DEVNO
 	int "LCD Device Number"
 	default 0
+	depends on NXWIDGETS_EXTERNINIT || NX_LCDDRIVER
 	---help---
 		LCD device number (in case there are more than one LCDs connected).
 		Default: 0
@@ -39,6 +47,22 @@ config NXWIDGETS_VPLANE
 	---help---
 		Only a single video plane is supported. Default: 0
 
+if NX_MULTIUSER
+
+config NXWIDGET_SERVERINIT
+	bool "Start server"
+	default y
+	depends on !NUTTX_KERNEL
+	---help---
+		If this option is selected, then the NxWidgets::CNxServer class will
+		bring up the NX server when it is initialized.  If this option is
+		not selected then the NxWidgets::CNxServer constructor
+		initialization logic will assume that the NX server has been started
+		by other, external logic and will simply attempt to connect to the
+		server.
+
+if NXWIDGET_SERVERINIT
+
 config NXWIDGETS_SERVERPRIO
 	int "NX Server priority"
 	default 110
@@ -57,6 +81,8 @@ config NXWIDGETS_SERVERSTACK
 	---help---
 		NX server thread stack size (in multi-user mode).  Default 2048
 
+endif # NXWIDGET_SERVERINIT
+
 config NXWIDGETS_CLIENTPRIO
 	int "NX Client Priority"
 	default 100
@@ -78,10 +104,7 @@ config NXWIDGETS_LISTENERSTACK
 	---help---
 		NX listener thread stack size (in multi-user mode).  Default 2048
 
-config NXWIDGETS_EXTERNINIT
-	bool "Extern LCD Initialization"
-	---help---
-		Define to support external display initialization.
+endif # NX_MULTIUSER
 
 config NXWIDGET_EVENTWAIT
 	bool "Event Waiting"
diff --git a/nuttx/configs/sam3u-ek/nxwm/defconfig b/nuttx/configs/sam3u-ek/nxwm/defconfig
index 75b4dc5d3..a82ea5311 100644
--- a/nuttx/configs/sam3u-ek/nxwm/defconfig
+++ b/nuttx/configs/sam3u-ek/nxwm/defconfig
@@ -39,7 +39,10 @@ CONFIG_RAW_BINARY=y
 # Debug Options
 #
 # CONFIG_DEBUG is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
+# CONFIG_DEBUG_NOOPT is not set
 
 #
 # System Type
@@ -60,6 +63,7 @@ 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
@@ -73,10 +77,18 @@ CONFIG_ARCH="arm"
 # 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_SAM34=y
 # CONFIG_ARCH_CHIP_STM32 is not set
 # 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="sam34"
 # CONFIG_ARMV7M_USEBASEPRI is not set
@@ -93,11 +105,20 @@ CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y
 # CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL is not set
 CONFIG_ARMV7M_OABI_TOOLCHAIN=y
 CONFIG_GPIO_IRQ=y
+CONFIG_ARCH_HAVE_EXTNAND=y
+CONFIG_ARCH_HAVE_EXTNOR=y
+CONFIG_ARCH_HAVE_EXTSRAM0=y
+CONFIG_ARCH_HAVE_EXTSRAM1=y
 
 #
 # AT91SAM3/4 Configuration Options
 #
 CONFIG_ARCH_CHIP_ATSAM3U4E=y
+# CONFIG_ARCH_CHIP_ATSAM3U4C is not set
+# CONFIG_ARCH_CHIP_ATSAM3U2E is not set
+# CONFIG_ARCH_CHIP_ATSAM3U2C is not set
+# CONFIG_ARCH_CHIP_ATSAM3U1E is not set
+# CONFIG_ARCH_CHIP_ATSAM3U1C is not set
 # CONFIG_ARCH_CHIP_ATSAM3X8E is not set
 # CONFIG_ARCH_CHIP_ATSAM3X8C is not set
 # CONFIG_ARCH_CHIP_ATSAM3X4E is not set
@@ -126,10 +147,15 @@ CONFIG_ARCH_CHIP_ATSAM3U4E=y
 # CONFIG_ARCH_CHIP_ATSAM4S16B is not set
 # CONFIG_ARCH_CHIP_ATSAM4S8C is not set
 # CONFIG_ARCH_CHIP_ATSAM4S8B is not set
+# CONFIG_ARCH_CHIP_ATSAM4E16E is not set
+# CONFIG_ARCH_CHIP_ATSAM4E16C is not set
+# CONFIG_ARCH_CHIP_ATSAM4E8E is not set
+# CONFIG_ARCH_CHIP_ATSAM4E8C is not set
 CONFIG_ARCH_CHIP_SAM3U=y
 # CONFIG_ARCH_CHIP_SAM3X is not set
 # CONFIG_ARCH_CHIP_SAM3A is not set
 # CONFIG_ARCH_CHIP_SAM4L is not set
+# CONFIG_ARCH_CHIP_SAM4E is not set
 # CONFIG_ARCH_CHIP_SAM4S is not set
 
 #
@@ -163,8 +189,12 @@ CONFIG_SAM34_UART0=y
 # CONFIG_SAM34_HSMCI is not set
 
 #
-# AT91SAM3/4 USART Configuration
+# External Memory Configuration
 #
+# CONFIG_SAM34_EXTNAND is not set
+# CONFIG_SAM34_EXTNOR is not set
+# CONFIG_SAM34_EXTSRAM0 is not set
+# CONFIG_SAM34_EXTSRAM1 is not set
 
 #
 # AT91SAM3/4 GPIO Interrupt Configuration
@@ -174,27 +204,16 @@ CONFIG_GPIOA_IRQ=y
 # CONFIG_GPIOC_IRQ is not set
 
 #
-# External Memory Configuration
-#
-CONFIG_ARCH_HAVE_EXTNAND=y
-CONFIG_ARCH_HAVE_EXTNOR=y
-CONFIG_ARCH_HAVE_EXTSRAM0=y
-CONFIG_ARCH_HAVE_EXTSRAM1=y
-# CONFIG_SAM34_EXTNAND is not set
-# CONFIG_SAM34_EXTNOR is not set
-# CONFIG_SAM34_EXTSRAM0 is not set
-# CONFIG_SAM34_EXTSRAM1 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=y
+CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_CUSTOM_STACK is not set
 # CONFIG_ADDRENV is not set
 CONFIG_ARCH_HAVE_VFORK=y
+CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 CONFIG_ARCH_HAVE_RAMFUNCS=y
@@ -207,10 +226,14 @@ CONFIG_ARCH_HAVE_RAMVECTORS=y
 #
 CONFIG_BOARD_LOOPSPERMSEC=8720
 # CONFIG_ARCH_CALIBRATION is not set
-CONFIG_RAM_START=0x20000000
-CONFIG_RAM_SIZE=32768
+
+#
+# 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
@@ -222,6 +245,12 @@ CONFIG_BOOT_RUNFROMFLASH=y
 # CONFIG_BOOT_COPYTORAM is not set
 
 #
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0x20000000
+CONFIG_RAM_SIZE=32768
+
+#
 # Board Selection
 #
 CONFIG_ARCH_BOARD_SAM3UEK=y
@@ -248,6 +277,7 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # CONFIG_BOARD_INITIALIZE is not set
 CONFIG_MSEC_PER_TICK=10
+# CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
@@ -317,16 +347,21 @@ CONFIG_DEV_NULL=y
 # 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 is not set
 # CONFIG_I2C is not set
 CONFIG_SPI=y
 CONFIG_SPI_OWNBUS=y
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_I2S 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=y
 # CONFIG_INPUT_TSC2007 is not set
@@ -361,6 +396,7 @@ CONFIG_LCD_MAXPOWER=31
 # 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=y
 # CONFIG_LCD_PORTRAIT is not set
 # CONFIG_LCD_RPORTRAIT is not set
@@ -376,10 +412,15 @@ CONFIG_LCD_LANDSCAPE=y
 # 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_ARCH_HAVE_UART0=y
+
+#
+# USART Configuration
+#
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_UART0_SERIAL_CONSOLE=y
@@ -414,6 +455,8 @@ CONFIG_UART0_2STOP=0
 #
 # Networking Support
 #
+# CONFIG_ARCH_HAVE_NET is not set
+# CONFIG_ARCH_HAVE_PHY is not set
 # CONFIG_NET is not set
 
 #
@@ -424,11 +467,14 @@ CONFIG_UART0_2STOP=0
 # File system configuration
 #
 # CONFIG_DISABLE_MOUNTPOINT 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_PROCFS is not set
 
 #
 # System Logging
@@ -609,7 +655,7 @@ CONFIG_CXX_NEWLONG=y
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
-# CONFIG_SYSTEM_COMPOSITE is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
@@ -656,7 +702,6 @@ CONFIG_CXX_NEWLONG=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP 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
 
@@ -705,10 +750,13 @@ CONFIG_NSH_LIBRARY=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_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
@@ -750,6 +798,7 @@ CONFIG_NSH_LIBRARY=y
 #
 # CONFIG_NSH_CMDOPT_DF_H is not set
 CONFIG_NSH_CODECS_BUFSIZE=128
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_MAXARGUMENTS=6
@@ -773,14 +822,15 @@ CONFIG_NXWIDGETS=y
 # NX Server/Device Configuration
 #
 CONFIG_NXWIDGETS_FLICKERFREE=y
+# CONFIG_NXWIDGETS_EXTERNINIT is not set
 CONFIG_NXWIDGETS_DEVNO=0
 CONFIG_NXWIDGETS_VPLANE=0
+CONFIG_NXWIDGET_SERVERINIT=y
 CONFIG_NXWIDGETS_SERVERPRIO=110
 CONFIG_NXWIDGETS_SERVERSTACK=1596
 CONFIG_NXWIDGETS_CLIENTPRIO=100
 CONFIG_NXWIDGETS_LISTENERPRIO=100
 CONFIG_NXWIDGETS_LISTENERSTACK=1596
-# CONFIG_NXWIDGETS_EXTERNINIT is not set
 # CONFIG_NXWIDGET_EVENTWAIT is not set
 
 #
@@ -812,7 +862,7 @@ CONFIG_NXWIDGETS_CURSORCONTROL_SIZE=4
 CONFIG_NXWM=y
 
 #
-# General settings
+# NxWM General settings
 #
 # CONFIG_NXWM_SYSTEM_CUSTOM_FONTID is not set
 CONFIG_NXWM_UNITTEST=y
@@ -825,6 +875,16 @@ CONFIG_NXWM_UNITTEST=y
 # CONFIG_NXWM_CUSTOM_TEXTCOLORS is not set
 
 #
+# Background Image
+#
+# CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
+CONFIG_NXWM_BACKGROUND_IMAGE=""
+
+#
+# NxWM Taskbar Configuration
+#
+
+#
 # Horizontal and vertical spacing of icons in the task bar
 #
 CONFIG_NXWM_TASKBAR_VSPACING=4
@@ -834,27 +894,22 @@ CONFIG_NXWM_TASKBAR_HSPACING=4
 CONFIG_NXWM_TASKBAR_LEFT=y
 # CONFIG_NXWM_TASKBAR_RIGHT is not set
 # CONFIG_NXWM_CUSTOM_TASKBAR_WIDTH is not set
+# CONFIG_NXWM_TASKBAR_ICONSCALE is not set
 # CONFIG_NXWM_DISABLE_MINIMIZE is not set
 # CONFIG_NXWM_TASKBAR_NO_BORDER is not set
 
 #
-# Tool Bar Configuration
+# NxWM Toolbar Configuration
 #
 # CONFIG_NXWM_CUSTOM_TOOLBAR_HEIGHT is not set
 
 #
-# Background Image
-#
-# CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
-CONFIG_NXWM_BACKGROUND_IMAGE=""
-
-#
-# Application Window Configuration
+# NxWM Application Window Configuration
 #
 # CONFIG_NXWM_CUSTOM_APPWINDOW_ICONS is not set
 
 #
-# Start Window Configuration
+# NxWM Start Window Configuration
 #
 
 #
@@ -877,6 +932,10 @@ CONFIG_NXWM_NXCONSOLE_STACKSIZE=1596
 # CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set
 # CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID is not set
 # CONFIG_NXWM_CUSTOM_NXCONSOLE_ICON is not set
+
+#
+# NxWM Touchscreen Configuration
+#
 CONFIG_NXWM_TOUCHSCREEN=y
 
 #
@@ -887,6 +946,10 @@ CONFIG_NXWM_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_NXWM_TOUCHSCREEN_SIGNO=5
 CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=100
 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1596
+
+#
+# NxWM Keyboard Configuration
+#
 CONFIG_NXWM_KEYBOARD=y
 
 #
@@ -899,16 +962,19 @@ CONFIG_NXWM_KEYBOARD_LISTENERPRIO=100
 CONFIG_NXWM_KEYBOARD_LISTENERSTACK=1024
 
 #
-# Calibration display settings
+# NxWM Calibration display settings
 #
+CONFIG_NXWM_CALIBRATION_MARGIN=40
 # CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set
+# CONFIG_NXWM_CALIBRATION_MESSAGES is not set
+# CONFIG_NXWM_CALIBRATION_ANISOTROPIC is not set
 # CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set
 CONFIG_NXWM_CALIBRATION_SIGNO=5
 CONFIG_NXWM_CALIBRATION_LISTENERPRIO=100
 CONFIG_NXWM_CALIBRATION_LISTENERSTACK=1024
 
 #
-# Hex Calculator display settings
+# NxWM Hex Calculator display settings
 #
 # CONFIG_NXWM_HEXCALCULATOR_CUSTOM_COLORS is not set
 # CONFIG_NXWM_CUSTOM_HEXCALCULATOR_ICON is not set
@@ -917,10 +983,23 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # CONFIG_NXWM_MEDIAPLAYER is not set
 
 #
+# Platform-specific Support
+#
+# CONFIG_PLATFORM_CONFIGDATA is not set
+
+#
 # System NSH Add-Ons
 #
 
 #
+# USB CDC/ACM Device Commands
+#
+
+#
+# USB Composite Device Commands
+#
+
+#
 # Custom Free Memory Command
 #
 # CONFIG_SYSTEM_FREE is not set
@@ -939,6 +1018,11 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 #
 
 #
+# NxPlayer media player library / command Line
+#
+# CONFIG_SYSTEM_NXPLAYER is not set
+
+#
 # RAM test
 #
 # CONFIG_SYSTEM_RAMTEST is not set
@@ -972,3 +1056,16 @@ CONFIG_READLINE_ECHO=y
 #
 # USB Monitor
 #
+
+#
+# Stack Monitor
+#
+
+#
+# USB Mass Storage Device Commands
+#
+
+#
+# Zmodem Commands
+#
+# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/nuttx/configs/sama5d3x-ek/nxwm/defconfig b/nuttx/configs/sama5d3x-ek/nxwm/defconfig
index b4279f283..d76f8abea 100644
--- a/nuttx/configs/sama5d3x-ek/nxwm/defconfig
+++ b/nuttx/configs/sama5d3x-ek/nxwm/defconfig
@@ -44,7 +44,9 @@ CONFIG_RAW_BINARY=y
 #
 # CONFIG_DEBUG is not set
 CONFIG_ARCH_HAVE_STACKCHECK=y
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 # CONFIG_DEBUG_SYMBOLS is not set
+# CONFIG_DEBUG_NOOPT is not set
 
 #
 # System Type
@@ -65,6 +67,7 @@ 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
@@ -112,7 +115,7 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
 # CONFIG_ARMV7A_TOOLCHAIN_GNU_OABI is not set
 
 #
-# ATSAMA5 Configuration Options
+# SAMA5 Configuration Options
 #
 # CONFIG_SAMA5_HAVE_UART0 is not set
 # CONFIG_SAMA5_HAVE_UART1 is not set
@@ -129,11 +132,12 @@ CONFIG_ARCH_CHIP_ATSAMA5D33=y
 # CONFIG_ARCH_CHIP_ATSAMA5D35 is not set
 
 #
-# ATSAMA5 Peripheral Support
+# SAMA5 Peripheral Support
 #
 # CONFIG_SAMA5_DBGU is not set
 # CONFIG_SAMA5_PIT is not set
 # CONFIG_SAMA5_WDT is not set
+# CONFIG_SAMA5_RTC is not set
 CONFIG_SAMA5_HSMC=y
 # CONFIG_SAMA5_SMD is not set
 # CONFIG_SAMA5_USART0 is not set
@@ -157,8 +161,6 @@ CONFIG_SAMA5_ADC=y
 # CONFIG_SAMA5_GMAC is not set
 CONFIG_SAMA5_LCDC=y
 # CONFIG_SAMA5_ISI is not set
-# CONFIG_SAMA5_SSC0 is not set
-# CONFIG_SAMA5_SSC1 is not set
 # CONFIG_SAMA5_CAN0 is not set
 # CONFIG_SAMA5_CAN1 is not set
 # CONFIG_SAMA5_SHA is not set
@@ -247,10 +249,11 @@ CONFIG_SAMA5_EBICS0_SIZE=134217728
 # CONFIG_SAMA5_EBICS0_EPROM is not set
 # CONFIG_SAMA5_EBICS0_LCD is not set
 CONFIG_SAMA5_EBICS0_NOR=y
-# CONFIG_SAMA5_EBICS0_NAND is not set
 # CONFIG_SAMA5_EBICS1 is not set
 # CONFIG_SAMA5_EBICS2 is not set
 # CONFIG_SAMA5_EBICS3 is not set
+# CONFIG_SAMA5_HAVE_NAND is not set
+# CONFIG_SAMA5_HAVE_PMECC is not set
 # CONFIG_SAMA5_BOOT_ISRAM is not set
 # CONFIG_SAMA5_BOOT_SDRAM is not set
 CONFIG_SAMA5_BOOT_CS0FLASH=y
@@ -269,11 +272,12 @@ CONFIG_SAMA5_DDRCS_HEAP_SIZE=262668288
 # CONFIG_ARCH_NOINTC is not set
 # CONFIG_ARCH_VECNOTIRQ is not set
 # CONFIG_ARCH_DMA is not set
-CONFIG_ARCH_IRQPRIO=y
+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=y
+CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_HAVE_RAMFUNCS is not set
@@ -284,8 +288,13 @@ CONFIG_ARCH_STACKDUMP=y
 #
 CONFIG_BOARD_LOOPSPERMSEC=49341
 # CONFIG_ARCH_CALIBRATION is not set
+
+#
+# Interrupt options
+#
 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
 CONFIG_ARCH_INTERRUPTSTACK=2048
+# CONFIG_ARCH_HAVE_HIPRI_INTERRUPT is not set
 
 #
 # Boot options
@@ -335,6 +344,7 @@ CONFIG_SAMA5_TSD_DEVMINOR=0
 #
 # CONFIG_BOARD_INITIALIZE is not set
 CONFIG_MSEC_PER_TICK=10
+# CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=200
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=32
@@ -404,13 +414,22 @@ CONFIG_DEV_NULL=y
 # 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 is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
+# CONFIG_I2S is not set
 # CONFIG_RTC is not set
 # CONFIG_WATCHDOG is not set
-# CONFIG_ANALOG is not set
+CONFIG_ANALOG=y
+CONFIG_ADC=y
+CONFIG_ADC_FIFOSIZE=8
+# CONFIG_ADC_ADS125X is not set
+# CONFIG_ADC_PGA11X is not set
+# CONFIG_DAC is not set
 # CONFIG_AUDIO_DEVICES is not set
+# CONFIG_VIDEO_DEVICES is not set
 # CONFIG_BCH is not set
 CONFIG_INPUT=y
 # CONFIG_INPUT_TSC2007 is not set
@@ -419,10 +438,12 @@ CONFIG_INPUT=y
 # CONFIG_LCD is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MTD is not set
+CONFIG_ARCH_NAND_HWECC=y
 # 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
@@ -466,6 +487,8 @@ CONFIG_USART1_2STOP=0
 #
 # Networking Support
 #
+# CONFIG_ARCH_HAVE_NET is not set
+# CONFIG_ARCH_HAVE_PHY is not set
 # CONFIG_NET is not set
 
 #
@@ -476,12 +499,15 @@ CONFIG_USART1_2STOP=0
 # File system configuration
 #
 # CONFIG_DISABLE_MOUNTPOINT 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
@@ -660,8 +686,10 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 #
 # Examples
 #
+# CONFIG_EXAMPLES_ADC is not set
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
@@ -805,6 +833,7 @@ CONFIG_NSH_LIBRARY=y
 #
 # CONFIG_NSH_CMDOPT_DF_H is not set
 CONFIG_NSH_CODECS_BUFSIZE=128
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_MAXARGUMENTS=6
@@ -828,14 +857,14 @@ CONFIG_NXWIDGETS=y
 # NX Server/Device Configuration
 #
 # CONFIG_NXWIDGETS_FLICKERFREE is not set
-CONFIG_NXWIDGETS_DEVNO=0
+# CONFIG_NXWIDGETS_EXTERNINIT is not set
 CONFIG_NXWIDGETS_VPLANE=0
+CONFIG_NXWIDGET_SERVERINIT=y
 CONFIG_NXWIDGETS_SERVERPRIO=110
 CONFIG_NXWIDGETS_SERVERSTACK=1596
 CONFIG_NXWIDGETS_CLIENTPRIO=100
 CONFIG_NXWIDGETS_LISTENERPRIO=100
 CONFIG_NXWIDGETS_LISTENERSTACK=1596
-# CONFIG_NXWIDGETS_EXTERNINIT is not set
 # CONFIG_NXWIDGET_EVENTWAIT is not set
 
 #
@@ -995,6 +1024,11 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # CONFIG_NXWM_MEDIAPLAYER is not set
 
 #
+# Platform-specific Support
+#
+# CONFIG_PLATFORM_CONFIGDATA is not set
+
+#
 # System NSH Add-Ons
 #
 
@@ -1025,6 +1059,11 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 #
 
 #
+# NxPlayer media player library / command Line
+#
+# CONFIG_SYSTEM_NXPLAYER is not set
+
+#
 # RAM test
 #
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig
index c9c855b48..1568c8282 100644
--- a/nuttx/configs/shenzhou/nxwm/defconfig
+++ b/nuttx/configs/shenzhou/nxwm/defconfig
@@ -43,7 +43,10 @@ CONFIG_INTELHEX_BINARY=y
 # Debug Options
 #
 # CONFIG_DEBUG is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+CONFIG_ARCH_HAVE_HEAPCHECK=y
 # CONFIG_DEBUG_SYMBOLS is not set
+# CONFIG_DEBUG_NOOPT is not set
 
 #
 # System Type
@@ -64,29 +67,40 @@ 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_IMX is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
-# CONFIG_ARCH_CHIP_LM3S 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_SAM3U is not set
+# CONFIG_ARCH_CHIP_NUC1XX is not set
+# CONFIG_ARCH_CHIP_SAMA5 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_BOARD_LOOPSPERMSEC=5483
-# CONFIG_ARCH_CALIBRATION is not set
 
 #
 # ARMV7M Configuration Options
@@ -97,6 +111,7 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
 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_NET_MULTICAST is not set
@@ -104,6 +119,24 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 #
 # 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
@@ -116,6 +149,15 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 # 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
@@ -123,6 +165,19 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 # CONFIG_ARCH_CHIP_STM32F105VBT7 is not set
 CONFIG_ARCH_CHIP_STM32F107VC=y
 # 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
@@ -132,13 +187,33 @@ CONFIG_ARCH_CHIP_STM32F107VC=y
 # 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=y
+# CONFIG_STM32_PERFORMANCELINE 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_STM32F30XX is not set
+# CONFIG_STM32_STM32F40XX is not set
 # CONFIG_STM32_DFU is not set
 
 #
 # STM32 Peripheral Support
 #
+# CONFIG_STM32_HAVE_USBDEV is not set
+CONFIG_STM32_HAVE_OTGFS=y
 # CONFIG_STM32_ADC1 is not set
 # CONFIG_STM32_ADC2 is not set
 # CONFIG_STM32_ADC3 is not set
@@ -152,7 +227,7 @@ CONFIG_STM32_CONNECTIVITYLINE=y
 CONFIG_STM32_ETHMAC=y
 # CONFIG_STM32_I2C1 is not set
 # CONFIG_STM32_I2C2 is not set
-# CONFIG_STM32_IWDG is not set
+# CONFIG_STM32_OTGFS is not set
 # CONFIG_STM32_PWR is not set
 # CONFIG_STM32_SPI1 is not set
 # CONFIG_STM32_SPI2 is not set
@@ -170,7 +245,7 @@ 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
 CONFIG_STM32_SPI=y
 
@@ -184,13 +259,17 @@ CONFIG_STM32_USART2_REMAP=y
 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_USART=y
 
 #
 # U[S]ART Configuration
 #
 # CONFIG_USART2_RS485 is not set
+# CONFIG_SERIAL_DISABLE_REORDERING is not set
+# CONFIG_STM32_USART_SINGLEWIRE is not set
 
 #
 # SPI Configuration
@@ -222,23 +301,39 @@ CONFIG_STM32_RMII_MCO=y
 #
 
 #
+# 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_IRQPRIO=y
+CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_CUSTOM_STACK is not set
 # CONFIG_ADDRENV is not set
+CONFIG_ARCH_HAVE_VFORK=y
+CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+CONFIG_ARCH_HAVE_RAMVECTORS=y
+# CONFIG_ARCH_RAMVECTORS is not set
 
 #
 # Board Settings
 #
-CONFIG_RAM_START=0x20000000
-CONFIG_RAM_SIZE=65536
+CONFIG_BOARD_LOOPSPERMSEC=5483
+# 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
@@ -250,11 +345,18 @@ CONFIG_BOOT_RUNFROMFLASH=y
 # CONFIG_BOOT_COPYTORAM is not set
 
 #
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0x20000000
+CONFIG_RAM_SIZE=65536
+
+#
 # Board Selection
 #
 # CONFIG_ARCH_BOARD_CLOUDCTRL is not set
 # CONFIG_ARCH_BOARD_OLIMEX_STM32P107 is not set
 CONFIG_ARCH_BOARD_SHENZHOU=y
+# CONFIG_ARCH_BOARD_VIEWTOOL_STM32F107 is not set
 # CONFIG_ARCH_BOARD_CUSTOM is not set
 CONFIG_ARCH_BOARD="shenzhou"
 
@@ -291,10 +393,13 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # RTOS Features
 #
+# CONFIG_BOARD_INITIALIZE is not set
 CONFIG_MSEC_PER_TICK=10
+# 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_JULIAN_TIME is not set
 CONFIG_START_YEAR=2012
 CONFIG_START_MONTH=9
@@ -305,13 +410,8 @@ CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 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_LPWORK is not set
 # CONFIG_SCHED_WAITPID is not set
+# CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=1
@@ -322,9 +422,16 @@ CONFIG_DISABLE_OS_API=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
 # CONFIG_DISABLE_MQUEUE is not set
-# CONFIG_DISABLE_MOUNTPOINT is not set
 # CONFIG_DISABLE_ENVIRON is not set
-CONFIG_DISABLE_POLL=y
+
+#
+# Signal Numbers
+#
+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)
@@ -352,26 +459,34 @@ CONFIG_PTHREAD_STACK_DEFAULT=1024
 #
 # Device Drivers
 #
+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_I2C is not set
 CONFIG_ARCH_HAVE_I2CRESET=y
+# CONFIG_I2C is not set
 CONFIG_SPI=y
 # CONFIG_SPI_OWNBUS is not set
 CONFIG_SPI_EXCHANGE=y
 # CONFIG_SPI_CMDDATA is not set
+# CONFIG_SPI_BITBANG is not set
+# CONFIG_I2S 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=y
 # CONFIG_INPUT_TSC2007 is not set
 CONFIG_INPUT_ADS7843E=y
 # CONFIG_ADS7843E_MULTIPLE is not set
+CONFIG_ADS7843E_SPIDEV=0
+CONFIG_ADS7843E_DEVMINOR=0
 CONFIG_ADS7843E_SPIMODE=0
 CONFIG_ADS7843E_FREQUENCY=100000
 CONFIG_ADS7843E_SWAPXY=y
@@ -379,25 +494,68 @@ CONFIG_ADS7843E_THRESHX=39
 CONFIG_ADS7843E_THRESHY=51
 # CONFIG_INPUT_STMPE811 is not set
 CONFIG_LCD=y
+
+#
+# Common LCD Settings
+#
 CONFIG_LCD_NOGETRUN=y
 CONFIG_LCD_MAXCONTRAST=1
 CONFIG_LCD_MAXPOWER=1
+
+#
+# Graphic LCD Devices
+#
 # CONFIG_LCD_P14201 is not set
 # CONFIG_LCD_NOKIA6100 is not set
+# CONFIG_LCD_MIO283QT2 is not set
 # CONFIG_LCD_UG9664HSWAG01 is not set
+# CONFIG_LCD_UG2864HSWEG01 is not set
+# CONFIG_LCD_UG2832HSWEG04 is not set
+# CONFIG_LCD_ST7567 is not set
 # CONFIG_LCD_UG2864AMBAG01 is not set
 CONFIG_LCD_SSD1289=y
 CONFIG_SSD1289_PROFILE1=y
 # CONFIG_SSD1289_PROFILE2 is not set
 # CONFIG_SSD1289_PROFILE3 is not set
+# CONFIG_LCD_SHARP_MEMLCD is not set
 CONFIG_LCD_LANDSCAPE=y
 # CONFIG_LCD_PORTRAIT is not set
 # CONFIG_LCD_RPORTRAIT is not set
 # CONFIG_LCD_RLANDSCAPE is not set
+
+#
+# Alphanumeric/Segment LCD Devices
+#
+# CONFIG_LCD_LCD1602 is not set
 # CONFIG_MMCSD is not set
 # CONFIG_MTD is not set
 CONFIG_NETDEVICES=y
+
+#
+# General Ethernet MAC Driver Options
+#
+# CONFIG_NETDEV_MULTINIC 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_VNET is not set
+
+#
+# External Ethernet PHY Device Support
+#
+# CONFIG_ETH0_PHY_NONE is not set
+# CONFIG_ETH0_PHY_KS8721 is not set
+# CONFIG_ETH0_PHY_KSZ8051 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_DM9161=y
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -407,6 +565,11 @@ CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 # CONFIG_16550_UART is not set
 CONFIG_ARCH_HAVE_USART2=y
+
+#
+# USART Configuration
+#
+CONFIG_USART2_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_USART2_SERIAL_CONSOLE=y
@@ -421,6 +584,10 @@ 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
@@ -437,20 +604,22 @@ CONFIG_USART2_2STOP=0
 #
 # Networking Support
 #
-CONFIG_NET=y
+CONFIG_ARCH_HAVE_NET=y
 CONFIG_ARCH_HAVE_PHY=y
-# CONFIG_ETH0_PHY_KS8721 is not set
-# CONFIG_ETH0_PHY_DP83848C is not set
-# CONFIG_ETH0_PHY_LAN8720 is not set
-CONFIG_ETH0_PHY_DM9161=y
+CONFIG_NET=y
 # CONFIG_NET_NOINTS is not set
 CONFIG_NET_MULTIBUFFER=y
+# CONFIG_NET_PROMISCUOUS is not set
 # CONFIG_NET_IPv6 is not set
 CONFIG_NSOCKET_DESCRIPTORS=16
 CONFIG_NET_NACTIVESOCKETS=16
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_BUFSIZE=562
 # CONFIG_NET_TCPURGDATA is not set
+
+#
+# TCP/IP Networking
+#
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=16
 CONFIG_NET_MAX_LISTENPORTS=16
@@ -458,10 +627,17 @@ CONFIG_NET_TCP_READAHEAD_BUFSIZE=562
 CONFIG_NET_NTCP_READAHEAD_BUFFERS=4
 CONFIG_NET_TCP_RECVDELAY=0
 CONFIG_NET_TCPBACKLOG=y
+# CONFIG_NET_TCP_SPLIT is not set
+# 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 is not set
+# CONFIG_NET_RXAVAIL is not set
 CONFIG_NET_ICMP=y
 CONFIG_NET_ICMP_PING=y
 # CONFIG_NET_PINGADDRCONF is not set
@@ -470,6 +646,7 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_RECEIVE_WINDOW=562
 CONFIG_NET_ARPTAB_SIZE=16
 # CONFIG_NET_ARP_IPIN is not set
+# CONFIG_NET_ROUTE is not set
 
 #
 # File Systems
@@ -478,15 +655,21 @@ CONFIG_NET_ARPTAB_SIZE=16
 #
 # File system configuration
 #
-# CONFIG_FS_FAT is not set
+# CONFIG_DISABLE_MOUNTPOINT 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_NFS is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_SMARTFS is not set
+# CONFIG_FS_PROCFS is not set
 
 #
 # System Logging
 #
+# CONFIG_SYSLOG_ENABLE is not set
 # CONFIG_SYSLOG is not set
 
 #
@@ -519,6 +702,7 @@ CONFIG_NX_KBD=y
 # Framed Window Borders
 #
 CONFIG_NXTK_BORDERWIDTH=4
+# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set
 CONFIG_NXTK_BORDERCOLOR1=0x5cb7
 CONFIG_NXTK_BORDERCOLOR2=0x21c9
 CONFIG_NXTK_BORDERCOLOR3=0xffdf
@@ -528,6 +712,7 @@ CONFIG_NXTK_BORDERCOLOR3=0xffdf
 # Font Selections
 #
 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
@@ -575,11 +760,17 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Memory Management
 #
+# CONFIG_MM_MULTIHEAP is not set
 # CONFIG_MM_SMALL is not set
 CONFIG_MM_REGIONS=1
 # CONFIG_GRAN is not set
 
 #
+# Audio Support
+#
+# CONFIG_AUDIO is not set
+
+#
 # Binary Formats
 #
 # CONFIG_BINFMT_DISABLE is not set
@@ -593,6 +784,10 @@ CONFIG_MM_REGIONS=1
 #
 # Library Routines
 #
+
+#
+# Standard C Library Options
+#
 CONFIG_STDIO_BUFFER_SIZE=64
 CONFIG_STDIO_LINEBUFFER=y
 CONFIG_NUNGET_CHARS=2
@@ -600,10 +795,14 @@ 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
@@ -612,6 +811,18 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
 
 #
+# Non-standard Library Support
+#
+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
+
+#
 # Basic CXX Support
 #
 # CONFIG_C99_BOOL8 is not set
@@ -629,7 +840,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 #
 
 #
-# Named Applications
+# Built-In Applications
 #
 
 #
@@ -637,8 +848,7 @@ CONFIG_HAVE_CXXINITIALIZE=y
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
-# CONFIG_SYSTEM_CDCACM is not set
-# CONFIG_SYSTEM_COMPOSITE is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
@@ -652,9 +862,10 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_LCDRW 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_NETTEST 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
@@ -669,11 +880,15 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_PASHELLO 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_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 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
@@ -682,15 +897,14 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP 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_WGET is not set
-# CONFIG_EXAMPLES_WLAN is not set
 
 #
-# Interpreters
+# Graphics Support
 #
+# CONFIG_TIFF is not set
 
 #
 # Interpreters
@@ -726,11 +940,7 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_XMLRPC is not set
 
 #
-# ModBus
-#
-
-#
-# FreeModbus
+# FreeModBus
 #
 # CONFIG_MODBUS is not set
 
@@ -738,15 +948,17 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # NSH Library
 #
 CONFIG_NSH_LIBRARY=y
-# CONFIG_NSH_BUILTIN_APPS is not set
 
 #
 # 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_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
@@ -782,13 +994,24 @@ CONFIG_NSH_LIBRARY=y
 # 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_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
+CONFIG_NSH_MAXARGUMENTS=6
 CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT 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
 CONFIG_NSH_TELNET=y
@@ -814,14 +1037,15 @@ CONFIG_NXWIDGETS=y
 # NX Server/Device Configuration
 #
 CONFIG_NXWIDGETS_FLICKERFREE=y
+# CONFIG_NXWIDGETS_EXTERNINIT is not set
 CONFIG_NXWIDGETS_DEVNO=0
 CONFIG_NXWIDGETS_VPLANE=0
+CONFIG_NXWIDGET_SERVERINIT=y
 CONFIG_NXWIDGETS_SERVERPRIO=110
 CONFIG_NXWIDGETS_SERVERSTACK=1596
 CONFIG_NXWIDGETS_CLIENTPRIO=100
 CONFIG_NXWIDGETS_LISTENERPRIO=100
 CONFIG_NXWIDGETS_LISTENERSTACK=1596
-# CONFIG_NXWIDGETS_EXTERNINIT is not set
 # CONFIG_NXWIDGET_EVENTWAIT is not set
 
 #
@@ -853,7 +1077,7 @@ CONFIG_NXWIDGETS_CURSORCONTROL_SIZE=4
 CONFIG_NXWM=y
 
 #
-# General settings
+# NxWM General settings
 #
 # CONFIG_NXWM_SYSTEM_CUSTOM_FONTID is not set
 CONFIG_NXWM_UNITTEST=y
@@ -866,6 +1090,16 @@ CONFIG_NXWM_UNITTEST=y
 # CONFIG_NXWM_CUSTOM_TEXTCOLORS is not set
 
 #
+# Background Image
+#
+# CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
+CONFIG_NXWM_BACKGROUND_IMAGE=""
+
+#
+# NxWM Taskbar Configuration
+#
+
+#
 # Horizontal and vertical spacing of icons in the task bar
 #
 CONFIG_NXWM_TASKBAR_VSPACING=4
@@ -875,21 +1109,22 @@ CONFIG_NXWM_TASKBAR_HSPACING=2
 CONFIG_NXWM_TASKBAR_LEFT=y
 # CONFIG_NXWM_TASKBAR_RIGHT is not set
 # CONFIG_NXWM_CUSTOM_TASKBAR_WIDTH is not set
+# CONFIG_NXWM_TASKBAR_ICONSCALE is not set
 # CONFIG_NXWM_DISABLE_MINIMIZE is not set
+# CONFIG_NXWM_TASKBAR_NO_BORDER is not set
 
 #
-# Tool Bar Configuration
+# NxWM Toolbar Configuration
 #
 # CONFIG_NXWM_CUSTOM_TOOLBAR_HEIGHT is not set
 
 #
-# Background Image
+# NxWM Application Window Configuration
 #
-# CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
-CONFIG_NXWM_BACKGROUND_IMAGE=""
+# CONFIG_NXWM_CUSTOM_APPWINDOW_ICONS is not set
 
 #
-# Start Window Configuration
+# NxWM Start Window Configuration
 #
 
 #
@@ -912,6 +1147,10 @@ CONFIG_NXWM_NXCONSOLE_STACKSIZE=1596
 # CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set
 # CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID is not set
 # CONFIG_NXWM_CUSTOM_NXCONSOLE_ICON is not set
+
+#
+# NxWM Touchscreen Configuration
+#
 CONFIG_NXWM_TOUCHSCREEN=y
 
 #
@@ -922,6 +1161,10 @@ CONFIG_NXWM_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_NXWM_TOUCHSCREEN_SIGNO=5
 CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=100
 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1596
+
+#
+# NxWM Keyboard Configuration
+#
 CONFIG_NXWM_KEYBOARD=y
 
 #
@@ -934,27 +1177,44 @@ CONFIG_NXWM_KEYBOARD_LISTENERPRIO=100
 CONFIG_NXWM_KEYBOARD_LISTENERSTACK=1024
 
 #
-# Calibration display settings
+# NxWM Calibration display settings
 #
+CONFIG_NXWM_CALIBRATION_MARGIN=40
 # CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set
+# CONFIG_NXWM_CALIBRATION_MESSAGES is not set
+# CONFIG_NXWM_CALIBRATION_ANISOTROPIC is not set
 # CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set
 CONFIG_NXWM_CALIBRATION_SIGNO=5
 CONFIG_NXWM_CALIBRATION_LISTENERPRIO=100
 CONFIG_NXWM_CALIBRATION_LISTENERSTACK=1024
 
 #
-# Hex Calculator display settings
+# NxWM Hex Calculator display settings
 #
 # CONFIG_NXWM_HEXCALCULATOR_CUSTOM_COLORS is not set
 # CONFIG_NXWM_CUSTOM_HEXCALCULATOR_ICON is not set
 CONFIG_NXWM_HEXCALCULATOR_CUSTOM_FONTID=y
 CONFIG_NXWM_HEXCALCULATOR_FONTID=5
+# CONFIG_NXWM_MEDIAPLAYER is not set
+
+#
+# Platform-specific Support
+#
+# CONFIG_PLATFORM_CONFIGDATA is not set
 
 #
 # System NSH Add-Ons
 #
 
 #
+# USB CDC/ACM Device Commands
+#
+
+#
+# USB Composite Device Commands
+#
+
+#
 # Custom Free Memory Command
 #
 # CONFIG_SYSTEM_FREE is not set
@@ -969,6 +1229,20 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # 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
@@ -993,3 +1267,20 @@ CONFIG_READLINE_ECHO=y
 # Sysinfo
 #
 # CONFIG_SYSTEM_SYSINFO is not set
+
+#
+# USB Monitor
+#
+
+#
+# Stack Monitor
+#
+
+#
+# USB Mass Storage Device Commands
+#
+
+#
+# Zmodem Commands
+#
+# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/nuttx/configs/sim/nxwm/defconfig b/nuttx/configs/sim/nxwm/defconfig
index f812d1ed2..5dfedf1c7 100644
--- a/nuttx/configs/sim/nxwm/defconfig
+++ b/nuttx/configs/sim/nxwm/defconfig
@@ -16,7 +16,7 @@ CONFIG_HOST_LINUX=y
 #
 # Build Configuration
 #
-CONFIG_APPS_DIR="../apps"
+# CONFIG_APPS_DIR="../apps"
 # CONFIG_BUILD_2PASS is not set
 
 #
@@ -40,7 +40,9 @@ CONFIG_APPS_DIR="../apps"
 #
 # CONFIG_DEBUG is not set
 # CONFIG_ARCH_HAVE_STACKCHECK is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
 CONFIG_DEBUG_SYMBOLS=y
+CONFIG_DEBUG_NOOPT=y
 
 #
 # System Type
@@ -76,7 +78,7 @@ CONFIG_SIM_FBBPP=32
 # 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_HAVE_IRQPRIO is not set
 # CONFIG_CUSTOM_STACK is not set
 # CONFIG_ADDRENV is not set
 # CONFIG_ARCH_HAVE_VFORK is not set
@@ -92,6 +94,12 @@ CONFIG_BOARD_LOOPSPERMSEC=5000
 # CONFIG_ARCH_CALIBRATION is not set
 
 #
+# Interrupt options
+#
+# CONFIG_ARCH_HAVE_INTERRUPTSTACK is not set
+# CONFIG_ARCH_HAVE_HIPRI_INTERRUPT is not set
+
+#
 # Boot options
 #
 # CONFIG_BOOT_RUNFROMEXTSRAM is not set
@@ -127,6 +135,7 @@ CONFIG_NSH_MMCSDMINOR=0
 #
 # CONFIG_BOARD_INITIALIZE is not set
 CONFIG_MSEC_PER_TICK=10
+# CONFIG_SYSTEM_TIME64 is not set
 CONFIG_RR_INTERVAL=0
 # CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=32
@@ -196,13 +205,17 @@ CONFIG_DEV_NULL=y
 # 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 is not set
 # CONFIG_I2C is not set
 # CONFIG_SPI is not set
+# CONFIG_I2S 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_LCD is not set
@@ -212,6 +225,7 @@ CONFIG_DEV_NULL=y
 # 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
@@ -238,6 +252,8 @@ CONFIG_SERIAL=y
 #
 # Networking Support
 #
+# CONFIG_ARCH_HAVE_NET is not set
+# CONFIG_ARCH_HAVE_PHY is not set
 # CONFIG_NET is not set
 
 #
@@ -248,6 +264,8 @@ CONFIG_SERIAL=y
 # File system configuration
 #
 # CONFIG_DISABLE_MOUNTPOINT is not set
+CONFIG_FS_READABLE=y
+CONFIG_FS_WRITABLE=y
 # CONFIG_FS_RAMMAP is not set
 CONFIG_FS_FAT=y
 CONFIG_FAT_LCNAMES=y
@@ -258,6 +276,7 @@ CONFIG_FAT_MAXFNAME=32
 # CONFIG_FS_NXFFS is not set
 CONFIG_FS_ROMFS=y
 # CONFIG_FS_SMARTFS is not set
+# CONFIG_FS_PROCFS is not set
 
 #
 # System Logging
@@ -437,6 +456,7 @@ CONFIG_HAVE_CXX=y
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
@@ -579,6 +599,7 @@ CONFIG_NSH_LIBRARY=y
 #
 # CONFIG_NSH_CMDOPT_DF_H is not set
 CONFIG_NSH_CODECS_BUFSIZE=128
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
 CONFIG_NSH_FILEIOSIZE=1024
 CONFIG_NSH_LINELEN=80
 CONFIG_NSH_MAXARGUMENTS=6
@@ -613,14 +634,14 @@ CONFIG_NXWIDGETS=y
 # NX Server/Device Configuration
 #
 # CONFIG_NXWIDGETS_FLICKERFREE is not set
-CONFIG_NXWIDGETS_DEVNO=0
+# CONFIG_NXWIDGETS_EXTERNINIT is not set
 CONFIG_NXWIDGETS_VPLANE=0
+CONFIG_NXWIDGET_SERVERINIT=y
 CONFIG_NXWIDGETS_SERVERPRIO=110
 CONFIG_NXWIDGETS_SERVERSTACK=16384
 CONFIG_NXWIDGETS_CLIENTPRIO=100
 CONFIG_NXWIDGETS_LISTENERPRIO=100
 CONFIG_NXWIDGETS_LISTENERSTACK=8192
-# CONFIG_NXWIDGETS_EXTERNINIT is not set
 # CONFIG_NXWIDGET_EVENTWAIT is not set
 
 #
@@ -652,7 +673,7 @@ CONFIG_NXWIDGETS_CURSORCONTROL_SIZE=4
 CONFIG_NXWM=y
 
 #
-# General settings
+# NxWM General settings
 #
 # CONFIG_NXWM_SYSTEM_CUSTOM_FONTID is not set
 CONFIG_NXWM_UNITTEST=y
@@ -665,6 +686,16 @@ CONFIG_NXWM_UNITTEST=y
 # CONFIG_NXWM_CUSTOM_TEXTCOLORS is not set
 
 #
+# Background Image
+#
+# CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
+CONFIG_NXWM_BACKGROUND_IMAGE=""
+
+#
+# NxWM Taskbar Configuration
+#
+
+#
 # Horizontal and vertical spacing of icons in the task bar
 #
 CONFIG_NXWM_TASKBAR_VSPACING=2
@@ -679,23 +710,17 @@ CONFIG_NXWM_TASKBAR_LEFT=y
 # CONFIG_NXWM_TASKBAR_NO_BORDER is not set
 
 #
-# Tool Bar Configuration
+# NxWM Toolbar Configuration
 #
 # CONFIG_NXWM_CUSTOM_TOOLBAR_HEIGHT is not set
 
 #
-# Background Image
-#
-# CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
-CONFIG_NXWM_BACKGROUND_IMAGE=""
-
-#
-# Application Window Configuration
+# NxWM Application Window Configuration
 #
 # CONFIG_NXWM_CUSTOM_APPWINDOW_ICONS is not set
 
 #
-# Start Window Configuration
+# NxWM Start Window Configuration
 #
 
 #
@@ -718,22 +743,31 @@ CONFIG_NXWM_NXCONSOLE_STACKSIZE=8192
 # CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set
 # CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID is not set
 # CONFIG_NXWM_CUSTOM_NXCONSOLE_ICON is not set
+
+#
+# NxWM Touchscreen Configuration
+#
 # CONFIG_NXWM_TOUCHSCREEN is not set
+
+#
+# NxWM Keyboard Configuration
+#
 # CONFIG_NXWM_KEYBOARD is not set
 
 #
-# Calibration display settings
+# NxWM Calibration display settings
 #
 CONFIG_NXWM_CALIBRATION_MARGIN=40
 # CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set
 # CONFIG_NXWM_CALIBRATION_MESSAGES is not set
+# CONFIG_NXWM_CALIBRATION_ANISOTROPIC is not set
 # CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set
 CONFIG_NXWM_CALIBRATION_SIGNO=5
 CONFIG_NXWM_CALIBRATION_LISTENERPRIO=100
 CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048
 
 #
-# Hex Calculator display settings
+# NxWM Hex Calculator display settings
 #
 # CONFIG_NXWM_HEXCALCULATOR_CUSTOM_COLORS is not set
 # CONFIG_NXWM_CUSTOM_HEXCALCULATOR_ICON is not set
@@ -741,6 +775,11 @@ CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048
 # CONFIG_NXWM_MEDIAPLAYER is not set
 
 #
+# Platform-specific Support
+#
+# CONFIG_PLATFORM_CONFIGDATA is not set
+
+#
 # System NSH Add-Ons
 #
 
@@ -771,6 +810,11 @@ CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048
 #
 
 #
+# NxPlayer media player library / command Line
+#
+# CONFIG_SYSTEM_NXPLAYER is not set
+
+#
 # RAM test
 #
 # CONFIG_SYSTEM_RAMTEST is not set
diff --git a/nuttx/configs/stm3220g-eval/nxwm/defconfig b/nuttx/configs/stm3220g-eval/nxwm/defconfig
index 80f5d5fec..3711e4b34 100644
--- a/nuttx/configs/stm3220g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3220g-eval/nxwm/defconfig
@@ -43,7 +43,10 @@ CONFIG_INTELHEX_BINARY=y
 # Debug Options
 #
 # CONFIG_DEBUG is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
+CONFIG_ARCH_HAVE_HEAPCHECK=y
 # CONFIG_DEBUG_SYMBOLS is not set
+# CONFIG_DEBUG_NOOPT is not set
 
 #
 # System Type
@@ -64,29 +67,40 @@ 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_IMX is not set
 # CONFIG_ARCH_CHIP_KINETIS is not set
-# CONFIG_ARCH_CHIP_LM3S 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_SAM3U is not set
+# CONFIG_ARCH_CHIP_NUC1XX is not set
+# CONFIG_ARCH_CHIP_SAMA5 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_BOARD_LOOPSPERMSEC=10926
-# CONFIG_ARCH_CALIBRATION is not set
 
 #
 # ARMV7M Configuration Options
@@ -97,6 +111,7 @@ CONFIG_BOARD_LOOPSPERMSEC=10926
 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_NET_MULTICAST is not set
@@ -104,6 +119,24 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 #
 # 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
@@ -116,6 +149,15 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 # 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
@@ -123,6 +165,19 @@ CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
 # CONFIG_ARCH_CHIP_STM32F105VBT7 is not set
 # CONFIG_ARCH_CHIP_STM32F107VC is not set
 CONFIG_ARCH_CHIP_STM32F207IG=y
+# 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
@@ -132,12 +187,33 @@ CONFIG_ARCH_CHIP_STM32F207IG=y
 # 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 is not set
+# CONFIG_STM32_VALUELINE is not set
+# CONFIG_STM32_CONNECTIVITYLINE is not set
+# CONFIG_STM32_PERFORMANCELINE is not set
+# CONFIG_STM32_HIGHDENSITY is not set
+# CONFIG_STM32_MEDIUMDENSITY is not set
+# CONFIG_STM32_LOWDENSITY is not set
 CONFIG_STM32_STM32F20XX=y
+# CONFIG_STM32_STM32F30XX is not set
+# CONFIG_STM32_STM32F40XX is not set
 CONFIG_STM32_DFU=y
 
 #
 # STM32 Peripheral Support
 #
+# CONFIG_STM32_HAVE_USBDEV is not set
+CONFIG_STM32_HAVE_OTGFS=y
 # CONFIG_STM32_ADC1 is not set
 # CONFIG_STM32_ADC2 is not set
 # CONFIG_STM32_ADC3 is not set
@@ -157,7 +233,6 @@ CONFIG_STM32_FSMC=y
 CONFIG_STM32_I2C1=y
 # CONFIG_STM32_I2C2 is not set
 # CONFIG_STM32_I2C3 is not set
-# CONFIG_STM32_IWDG is not set
 # CONFIG_STM32_OTGFS is not set
 # CONFIG_STM32_OTGHS is not set
 CONFIG_STM32_PWR=y
@@ -187,6 +262,7 @@ CONFIG_STM32_USART3=y
 # 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_I2C=y
 
@@ -198,15 +274,19 @@ CONFIG_STM32_I2C=y
 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_CCMEXCLUDE is not set
 # CONFIG_STM32_FSMC_SRAM is not set
+CONFIG_STM32_USART=y
 
 #
 # U[S]ART Configuration
 #
 # CONFIG_USART3_RS485 is not set
+# CONFIG_SERIAL_DISABLE_REORDERING is not set
+# CONFIG_STM32_USART_SINGLEWIRE is not set
 
 #
 # I2C Configuration
@@ -216,8 +296,6 @@ CONFIG_STM32_I2CTIMEOSEC=0
 CONFIG_STM32_I2CTIMEOMS=500
 CONFIG_STM32_I2CTIMEOTICKS=500
 # CONFIG_STM32_I2C_DUTY16_9 is not set
-# CONFIG_SDIO_DMA is not set
-# CONFIG_SDIO_WIDTH_D1_ONLY is not set
 
 #
 # Ethernet MAC configuration
@@ -242,23 +320,39 @@ CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004
 #
 
 #
+# 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_IRQPRIO=y
+CONFIG_ARCH_HAVE_IRQPRIO=y
 # CONFIG_CUSTOM_STACK is not set
 # CONFIG_ADDRENV is not set
+CONFIG_ARCH_HAVE_VFORK=y
+CONFIG_ARCH_IRQPRIO=y
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
+# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+CONFIG_ARCH_HAVE_RAMVECTORS=y
+# CONFIG_ARCH_RAMVECTORS is not set
 
 #
 # Board Settings
 #
-CONFIG_RAM_START=0x20000000
-CONFIG_RAM_SIZE=196608
+CONFIG_BOARD_LOOPSPERMSEC=10926
+# 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
@@ -270,6 +364,12 @@ CONFIG_BOOT_RUNFROMFLASH=y
 # CONFIG_BOOT_COPYTORAM is not set
 
 #
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0x20000000
+CONFIG_RAM_SIZE=196608
+
+#
 # Board Selection
 #
 CONFIG_ARCH_BOARD_STM3220G_EVAL=y
@@ -290,18 +390,21 @@ CONFIG_NSH_MMCSDSLOTNO=0
 #
 # Board-Specific Options
 #
+# CONFIG_STM32_ILI9320_DISABLE is not set
+# CONFIG_STM32_ILI9325_DISABLE is not set
 CONFIG_LCD_RDSHIFT=5
 CONFIG_STM3220G_LCD=y
-# CONFIG_CONFIG_STM32_ILI9320_DISABLE is not set
-# CONFIG_CONFIG_STM32_ILI9325_DISABLE is not set
 
 #
 # RTOS Features
 #
+# CONFIG_BOARD_INITIALIZE is not set
 CONFIG_MSEC_PER_TICK=10
+# 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_JULIAN_TIME is not set
 CONFIG_START_YEAR=2012
 CONFIG_START_MONTH=5
@@ -312,13 +415,8 @@ CONFIG_DEV_CONSOLE=y
 # CONFIG_FDCLONE_DISABLE is not set
 # CONFIG_FDCLONE_STDIO is not set
 CONFIG_SDCLONE_DISABLE=y
-CONFIG_SCHED_WORKQUEUE=y
-CONFIG_SCHED_WORKPRIORITY=192
-CONFIG_SCHED_WORKPERIOD=50000
-CONFIG_SCHED_WORKSTACKSIZE=2048
-CONFIG_SIG_SIGWORK=17
-# CONFIG_SCHED_LPWORK is not set
 CONFIG_SCHED_WAITPID=y
+# CONFIG_SCHED_STARTHOOK is not set
 # CONFIG_SCHED_ATEXIT is not set
 CONFIG_SCHED_ONEXIT=y
 CONFIG_SCHED_ONEXIT_MAX=1
@@ -329,9 +427,16 @@ CONFIG_DISABLE_OS_API=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
 # CONFIG_DISABLE_MQUEUE is not set
-# CONFIG_DISABLE_MOUNTPOINT is not set
 # CONFIG_DISABLE_ENVIRON is not set
-CONFIG_DISABLE_POLL=y
+
+#
+# Signal Numbers
+#
+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)
@@ -359,26 +464,31 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
 #
 # Device Drivers
 #
+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=y
 # CONFIG_I2C_SLAVE is not set
 CONFIG_I2C_TRANSFER=y
 # CONFIG_I2C_WRITEREAD is not set
 CONFIG_I2C_POLLED=y
 # CONFIG_I2C_TRACE is not set
-CONFIG_ARCH_HAVE_I2CRESET=y
 # CONFIG_I2C_RESET is not set
 # CONFIG_SPI is not set
+# CONFIG_I2S is not set
 CONFIG_RTC=y
 CONFIG_RTC_DATETIME=y
 # CONFIG_RTC_ALARM 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=y
 # CONFIG_INPUT_TSC2007 is not set
@@ -397,31 +507,68 @@ CONFIG_STMPE811_ADC_DISABLE=y
 CONFIG_STMPE811_GPIO_DISABLE=y
 CONFIG_STMPE811_TEMP_DISABLE=y
 CONFIG_LCD=y
+
+#
+# Common LCD Settings
+#
 CONFIG_LCD_NOGETRUN=y
 CONFIG_LCD_MAXCONTRAST=1
 CONFIG_LCD_MAXPOWER=1
+
+#
+# Graphic LCD Devices
+#
 # CONFIG_LCD_P14201 is not set
 # CONFIG_LCD_NOKIA6100 is not set
-# CONFIG_LCD_UG9664HSWAG01 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=y
 # CONFIG_LCD_PORTRAIT is not set
 # CONFIG_LCD_RPORTRAIT is not set
 # CONFIG_LCD_RLANDSCAPE is not set
+
+#
+# Alphanumeric/Segment LCD Devices
+#
+# CONFIG_LCD_LCD1602 is not set
 CONFIG_MMCSD=y
 CONFIG_MMCSD_NSLOTS=1
 # CONFIG_MMCSD_READONLY is not set
 CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
 # CONFIG_MMCSD_MMCSUPPORT is not set
 # CONFIG_MMCSD_HAVECARDDETECT is not set
-CONFIG_MMCSD_SPI=y
-CONFIG_MMCSD_SPICLOCK=12500000
-CONFIG_MMCSD_SDIO=y
-# CONFIG_SDIO_MUXBUS is not set
+# CONFIG_ARCH_HAVE_SDIO is not set
 # CONFIG_MTD is not set
 CONFIG_NETDEVICES=y
+
+#
+# General Ethernet MAC Driver Options
+#
+# CONFIG_NETDEV_MULTINIC 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_VNET is not set
+
+#
+# External Ethernet PHY Device Support
+#
+# CONFIG_ETH0_PHY_NONE is not set
+CONFIG_ETH0_PHY_KS8721=y
+# CONFIG_ETH0_PHY_KSZ8051 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_DM9161 is not set
 # CONFIG_PIPES is not set
 # CONFIG_PM is not set
 # CONFIG_POWER is not set
@@ -431,6 +578,11 @@ CONFIG_SERIAL=y
 # CONFIG_DEV_LOWCONSOLE is not set
 # CONFIG_16550_UART is not set
 CONFIG_ARCH_HAVE_USART3=y
+
+#
+# USART Configuration
+#
+CONFIG_USART3_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
 CONFIG_USART3_SERIAL_CONSOLE=y
@@ -445,6 +597,10 @@ CONFIG_USART3_BAUD=115200
 CONFIG_USART3_BITS=8
 CONFIG_USART3_PARITY=0
 CONFIG_USART3_2STOP=0
+# CONFIG_USART3_IFLOWCONTROL is not set
+# CONFIG_USART3_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
@@ -461,20 +617,22 @@ CONFIG_USART3_2STOP=0
 #
 # Networking Support
 #
-CONFIG_NET=y
+CONFIG_ARCH_HAVE_NET=y
 CONFIG_ARCH_HAVE_PHY=y
-CONFIG_ETH0_PHY_KS8721=y
-# CONFIG_ETH0_PHY_DP83848C is not set
-# CONFIG_ETH0_PHY_LAN8720 is not set
-# CONFIG_ETH0_PHY_DM9161 is not set
+CONFIG_NET=y
 # CONFIG_NET_NOINTS is not set
 CONFIG_NET_MULTIBUFFER=y
+# CONFIG_NET_PROMISCUOUS is not set
 # CONFIG_NET_IPv6 is not set
 CONFIG_NSOCKET_DESCRIPTORS=10
 CONFIG_NET_NACTIVESOCKETS=16
 CONFIG_NET_SOCKOPTS=y
 CONFIG_NET_BUFSIZE=562
 # CONFIG_NET_TCPURGDATA is not set
+
+#
+# TCP/IP Networking
+#
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
 CONFIG_NET_MAX_LISTENPORTS=40
@@ -482,10 +640,17 @@ CONFIG_NET_TCP_READAHEAD_BUFSIZE=562
 CONFIG_NET_NTCP_READAHEAD_BUFFERS=16
 CONFIG_NET_TCP_RECVDELAY=0
 CONFIG_NET_TCPBACKLOG=y
+# CONFIG_NET_TCP_SPLIT is not set
+# 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 is not set
+# CONFIG_NET_RXAVAIL is not set
 CONFIG_NET_ICMP=y
 CONFIG_NET_ICMP_PING=y
 # CONFIG_NET_PINGADDRCONF is not set
@@ -494,6 +659,7 @@ CONFIG_NET_STATISTICS=y
 CONFIG_NET_RECEIVE_WINDOW=562
 CONFIG_NET_ARPTAB_SIZE=16
 # CONFIG_NET_ARP_IPIN is not set
+# CONFIG_NET_ROUTE is not set
 
 #
 # File Systems
@@ -502,20 +668,26 @@ CONFIG_NET_ARPTAB_SIZE=16
 #
 # File system configuration
 #
+# CONFIG_DISABLE_MOUNTPOINT is not set
+CONFIG_FS_READABLE=y
+CONFIG_FS_WRITABLE=y
+# 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_DMAMEMORY is not set
-# CONFIG_FS_RAMMAP is not set
 # CONFIG_NFS is not set
 # CONFIG_FS_NXFFS is not set
 # CONFIG_FS_ROMFS is not set
+# CONFIG_FS_SMARTFS is not set
+# CONFIG_FS_PROCFS is not set
 
 #
 # System Logging
 #
+# CONFIG_SYSLOG_ENABLE is not set
 # CONFIG_SYSLOG is not set
 
 #
@@ -548,6 +720,7 @@ CONFIG_NX_KBD=y
 # Framed Window Borders
 #
 CONFIG_NXTK_BORDERWIDTH=4
+# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set
 CONFIG_NXTK_BORDERCOLOR1=0x5cb7
 CONFIG_NXTK_BORDERCOLOR2=0x21c9
 CONFIG_NXTK_BORDERCOLOR3=0xffdf
@@ -557,6 +730,7 @@ CONFIG_NXTK_BORDERCOLOR3=0xffdf
 # Font Selections
 #
 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
@@ -604,23 +778,34 @@ CONFIG_NX_MXCLIENTMSGS=16
 #
 # Memory Management
 #
+# CONFIG_MM_MULTIHEAP is not set
 # CONFIG_MM_SMALL is not set
 CONFIG_MM_REGIONS=1
 # CONFIG_GRAN is not set
 
 #
+# Audio Support
+#
+# CONFIG_AUDIO is not set
+
+#
 # 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 is not set
 # CONFIG_PIC is not set
 CONFIG_SYMTAB_ORDEREDBYNAME=y
 
 #
 # Library Routines
 #
+
+#
+# Standard C Library Options
+#
 CONFIG_STDIO_BUFFER_SIZE=64
 CONFIG_STDIO_LINEBUFFER=y
 CONFIG_NUNGET_CHARS=2
@@ -628,10 +813,14 @@ 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
@@ -640,6 +829,18 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
 
 #
+# Non-standard Library Support
+#
+CONFIG_SCHED_WORKQUEUE=y
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_WORKPRIORITY=192
+CONFIG_SCHED_WORKPERIOD=50000
+CONFIG_SCHED_WORKSTACKSIZE=2048
+# CONFIG_SCHED_LPWORK is not set
+# CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
+
+#
 # Basic CXX Support
 #
 # CONFIG_C99_BOOL8 is not set
@@ -657,17 +858,15 @@ CONFIG_HAVE_CXXINITIALIZE=y
 #
 
 #
-# Named Applications
+# Built-In Applications
 #
-# CONFIG_BUILTIN is not set
 
 #
 # Examples
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
-# CONFIG_SYSTEM_CDCACM is not set
-# CONFIG_SYSTEM_COMPOSITE is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
@@ -681,9 +880,10 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_IGMP is not set
 # CONFIG_EXAMPLES_LCDRW 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_NETTEST 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
@@ -698,11 +898,15 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_PASHELLO 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_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 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
@@ -711,15 +915,14 @@ CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_DISCOVER is not set
 # CONFIG_EXAMPLES_UIP 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_WGET is not set
-# CONFIG_EXAMPLES_WLAN is not set
 
 #
-# Interpreters
+# Graphics Support
 #
+# CONFIG_TIFF is not set
 
 #
 # Interpreters
@@ -755,11 +958,7 @@ CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_XMLRPC is not set
 
 #
-# ModBus
-#
-
-#
-# FreeModbus
+# FreeModBus
 #
 # CONFIG_MODBUS is not set
 
@@ -771,10 +970,13 @@ CONFIG_NSH_LIBRARY=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_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
@@ -810,13 +1012,24 @@ CONFIG_NSH_LIBRARY=y
 # 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_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
+CONFIG_NSH_MAXARGUMENTS=6
 CONFIG_NSH_NESTDEPTH=3
 # CONFIG_NSH_DISABLESCRIPT 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 is not set
 CONFIG_NSH_TELNET=y
@@ -842,14 +1055,15 @@ CONFIG_NXWIDGETS=y
 # NX Server/Device Configuration
 #
 CONFIG_NXWIDGETS_FLICKERFREE=y
+# CONFIG_NXWIDGETS_EXTERNINIT is not set
 CONFIG_NXWIDGETS_DEVNO=0
 CONFIG_NXWIDGETS_VPLANE=0
+CONFIG_NXWIDGET_SERVERINIT=y
 CONFIG_NXWIDGETS_SERVERPRIO=110
 CONFIG_NXWIDGETS_SERVERSTACK=2048
 CONFIG_NXWIDGETS_CLIENTPRIO=100
 CONFIG_NXWIDGETS_LISTENERPRIO=100
 CONFIG_NXWIDGETS_LISTENERSTACK=2048
-# CONFIG_NXWIDGETS_EXTERNINIT is not set
 # CONFIG_NXWIDGET_EVENTWAIT is not set
 
 #
@@ -886,7 +1100,7 @@ CONFIG_NXWIDGETS_CURSORCONTROL_SIZE=4
 CONFIG_NXWM=y
 
 #
-# General settings
+# NxWM General settings
 #
 # CONFIG_NXWM_SYSTEM_CUSTOM_FONTID is not set
 CONFIG_NXWM_UNITTEST=y
@@ -899,6 +1113,16 @@ CONFIG_NXWM_UNITTEST=y
 # CONFIG_NXWM_CUSTOM_TEXTCOLORS is not set
 
 #
+# Background Image
+#
+# CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
+CONFIG_NXWM_BACKGROUND_IMAGE=""
+
+#
+# NxWM Taskbar Configuration
+#
+
+#
 # Horizontal and vertical spacing of icons in the task bar
 #
 CONFIG_NXWM_TASKBAR_VSPACING=4
@@ -908,21 +1132,22 @@ CONFIG_NXWM_TASKBAR_HSPACING=2
 CONFIG_NXWM_TASKBAR_LEFT=y
 # CONFIG_NXWM_TASKBAR_RIGHT is not set
 # CONFIG_NXWM_CUSTOM_TASKBAR_WIDTH is not set
+# CONFIG_NXWM_TASKBAR_ICONSCALE is not set
 # CONFIG_NXWM_DISABLE_MINIMIZE is not set
+# CONFIG_NXWM_TASKBAR_NO_BORDER is not set
 
 #
-# Tool Bar Configuration
+# NxWM Toolbar Configuration
 #
 # CONFIG_NXWM_CUSTOM_TOOLBAR_HEIGHT is not set
 
 #
-# Background Image
+# NxWM Application Window Configuration
 #
-# CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
-CONFIG_NXWM_BACKGROUND_IMAGE=""
+# CONFIG_NXWM_CUSTOM_APPWINDOW_ICONS is not set
 
 #
-# Start Window Configuration
+# NxWM Start Window Configuration
 #
 
 #
@@ -945,6 +1170,10 @@ CONFIG_NXWM_NXCONSOLE_STACKSIZE=2048
 # CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set
 # CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID is not set
 # CONFIG_NXWM_CUSTOM_NXCONSOLE_ICON is not set
+
+#
+# NxWM Touchscreen Configuration
+#
 CONFIG_NXWM_TOUCHSCREEN=y
 
 #
@@ -955,6 +1184,10 @@ CONFIG_NXWM_TOUCHSCREEN_DEVPATH="/dev/input0"
 CONFIG_NXWM_TOUCHSCREEN_SIGNO=5
 CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=100
 CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1024
+
+#
+# NxWM Keyboard Configuration
+#
 CONFIG_NXWM_KEYBOARD=y
 
 #
@@ -967,27 +1200,44 @@ CONFIG_NXWM_KEYBOARD_LISTENERPRIO=100
 CONFIG_NXWM_KEYBOARD_LISTENERSTACK=2048
 
 #
-# Calibration display settings
+# NxWM Calibration display settings
 #
+CONFIG_NXWM_CALIBRATION_MARGIN=40
 # CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set
+# CONFIG_NXWM_CALIBRATION_MESSAGES is not set
+# CONFIG_NXWM_CALIBRATION_ANISOTROPIC is not set
 # CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set
 CONFIG_NXWM_CALIBRATION_SIGNO=5
 CONFIG_NXWM_CALIBRATION_LISTENERPRIO=100
 CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048
 
 #
-# Calibration display settings
+# NxWM Hex Calculator display settings
 #
 # CONFIG_NXWM_HEXCALCULATOR_CUSTOM_COLORS is not set
 # CONFIG_NXWM_CUSTOM_HEXCALCULATOR_ICON is not set
 CONFIG_NXWM_HEXCALCULATOR_CUSTOM_FONTID=y
 CONFIG_NXWM_HEXCALCULATOR_FONTID=5
+# CONFIG_NXWM_MEDIAPLAYER is not set
+
+#
+# Platform-specific Support
+#
+# CONFIG_PLATFORM_CONFIGDATA is not set
 
 #
 # System NSH Add-Ons
 #
 
 #
+# USB CDC/ACM Device Commands
+#
+
+#
+# USB Composite Device Commands
+#
+
+#
 # Custom Free Memory Command
 #
 # CONFIG_SYSTEM_FREE is not set
@@ -1003,6 +1253,20 @@ CONFIG_NXWM_HEXCALCULATOR_FONTID=5
 # 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
@@ -1027,3 +1291,20 @@ CONFIG_READLINE_ECHO=y
 # Sysinfo
 #
 # CONFIG_SYSTEM_SYSINFO is not set
+
+#
+# USB Monitor
+#
+
+#
+# Stack Monitor
+#
+
+#
+# USB Mass Storage Device Commands
+#
+
+#
+# Zmodem Commands
+#
+# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/nuttx/configs/stm3240g-eval/nxwm/defconfig b/nuttx/configs/stm3240g-eval/nxwm/defconfig
index 18135b31b..362d451fe 100644
--- a/nuttx/configs/stm3240g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3240g-eval/nxwm/defconfig
@@ -597,6 +597,7 @@ CONFIG_LCD_MAXCONTRAST=1
 CONFIG_NX_MOUSE=y
 CONFIG_NX_KBD=y
 #CONFIG_NXTK_BORDERWIDTH=4
+CONFIG_NXTK_DEFAULT_BORDERCOLORS=n
 CONFIG_NXTK_BORDERCOLOR1=0x5cb7
 CONFIG_NXTK_BORDERCOLOR2=0x21c9
 CONFIG_NXTK_BORDERCOLOR3=0xffdf
@@ -635,6 +636,7 @@ CONFIG_NX_MXCLIENTMSGS=16
 # 7. Use a larger font with the calculator
 #
 CONFIG_NXWIDGETS_BPP=16
+CONFIG_NXWIDGET_SERVERINIT=y
 CONFIG_NXWIDGETS_SERVERSTACK=2048
 CONFIG_NXWIDGETS_LISTENERSTACK=2048
 CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR=MKRGB(148,189,215)