Patches from Petteri Aimonen (plus a few other things)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5448 42af7a65-404d-4744-a932-0658087f49c3

19 files changed, 1801 insertions, 1014 deletions

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index ed1cf39dc..c4a06af5e 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -3801,3 +3801,10 @@
 	  to find executables using a relative path.
 
 6.25 2013-xx-xx Gregory Nutt <gnutt@nuttx.org>
+
+	* graphics/: Adds 5x8 monospace font. This tiny font is useful for graph
+	  labels and for small bitmapped display.  Contributed by Petteri
+	  Aimonen.
+	* configs/stm3220g-eval/nxwm:  Converted to use the kconfig-fronteds
+	  configuration tool.
+
diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html
index 5d9d3af3b..f48994bab 100644
--- a/nuttx/Documentation/NuttX.html
+++ b/nuttx/Documentation/NuttX.html
@@ -373,7 +373,7 @@
   <td><br></td>
   <td>
     <p>
-      <li>May be built either as an open, flat embedded RTOS or as a separtely built, secure micro-kernel with a system call interface.</li>
+      <li>May be built either as an open, flat embedded RTOS or as a separately built, secure micro-kernel with a system call interface.</li>
     </p>
 </tr>
 
diff --git a/nuttx/TODO b/nuttx/TODO
index 6c28bfd43..6162431dc 100644
--- a/nuttx/TODO
+++ b/nuttx/TODO
@@ -1,4 +1,4 @@
-NuttX TODO List (Last updated November 25, 2012)
+NuttX TODO List (Last updated December 20, 2012)
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This file summarizes known NuttX bugs, limitations, inconsistencies with 
@@ -15,7 +15,7 @@ nuttx/
   (6)  Binary loaders (binfmt/)
  (17)  Network (net/, drivers/net)
   (4)  USB (drivers/usbdev, drivers/usbhost)
- (11)  Libraries (libc/, )
+ (12)  Libraries (libc/, )
   (9)  File system/Generic drivers (fs/, drivers/)
   (5)  Graphics subystem (graphics/)
   (1)  Pascal add-on (pcode/)
@@ -637,6 +637,15 @@ o USB (drivers/usbdev, drivers/usbhost)
 o Libraries (libc/)
   ^^^^^^^^^^^^^^^^^
 
+  Title:       SIGNED time_t
+  Description: The NuttX time_t is type uint32_t. I think this is consistent
+               with all standards and with normal usage of time_t.  However,
+               according to Wikipedia, time_t is usually implemented as a
+               signed 32-bit value.
+  Status:      Open
+  Priority:    Very low unless there is some compelling issue that I do not
+               know about.
+
   Title:       ENVIRON
   Description: The definition of environ in stdlib.h is bogus and will not
                work as it should.  This is because the underlying
diff --git a/nuttx/configs/shenzhou/nxwm/defconfig b/nuttx/configs/shenzhou/nxwm/defconfig
index 86d17c3ee..0f100ed5e 100644
--- a/nuttx/configs/shenzhou/nxwm/defconfig
+++ b/nuttx/configs/shenzhou/nxwm/defconfig
@@ -8,6 +8,14 @@ CONFIG_NUTTX_NEWCONFIG=y
 # Build Setup
 #
 # CONFIG_EXPERIMENTAL is not set
+# CONFIG_HOST_LINUX is not set
+# CONFIG_HOST_OSX is not set
+CONFIG_HOST_WINDOWS=y
+# CONFIG_HOST_OTHER is not set
+# CONFIG_WINDOWS_NATIVE is not set
+CONFIG_WINDOWS_CYGWIN=y
+# CONFIG_WINDOWS_MSYS is not set
+# CONFIG_WINDOWS_OTHER is not set
 
 #
 # Build Configuration
@@ -28,6 +36,7 @@ CONFIG_INTELHEX_BINARY=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
 
 #
@@ -51,6 +60,10 @@ CONFIG_ARCH_ARM=y
 # CONFIG_ARCH_Z16 is not set
 # CONFIG_ARCH_Z80 is not set
 CONFIG_ARCH="arm"
+
+#
+# ARM Options
+#
 # CONFIG_ARCH_CHIP_C5471 is not set
 # CONFIG_ARCH_CHIP_CALYPSO is not set
 # CONFIG_ARCH_CHIP_DM320 is not set
@@ -68,11 +81,23 @@ CONFIG_ARCH_CHIP_STM32=y
 CONFIG_ARCH_CORTEXM3=y
 CONFIG_ARCH_FAMILY="armv7-m"
 CONFIG_ARCH_CHIP="stm32"
+CONFIG_ARCH_HAVE_CMNVECTOR=y
+# CONFIG_ARMV7M_CMNVECTOR is not set
 CONFIG_ARCH_HAVE_MPU=y
 # CONFIG_ARMV7M_MPU is not set
-CONFIG_ARCH_IRQPRIO=y
 CONFIG_BOARD_LOOPSPERMSEC=5483
 # CONFIG_ARCH_CALIBRATION is not set
+
+#
+# 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_EABI is not set
+# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
 # CONFIG_SERIAL_TERMIOS is not set
 # CONFIG_NET_MULTICAST is not set
 
@@ -83,8 +108,14 @@ CONFIG_BOARD_LOOPSPERMSEC=5483
 # 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_STM32F103RET6 is not set
 # CONFIG_ARCH_CHIP_STM32F103VCT6 is not set
 # CONFIG_ARCH_CHIP_STM32F103VET6 is not set
@@ -103,13 +134,6 @@ CONFIG_ARCH_CHIP_STM32F107VC=y
 # CONFIG_ARCH_CHIP_STM32F407IG is not set
 CONFIG_STM32_STM32F10XX=y
 CONFIG_STM32_CONNECTIVITYLINE=y
-CONFIG_STM32_CODESOURCERYW=y
-# CONFIG_STM32_CODESOURCERYL is not set
-# CONFIG_STM32_ATOLLIC_LITE is not set
-# CONFIG_STM32_ATOLLIC_PRO is not set
-# CONFIG_STM32_DEVKITARM is not set
-# CONFIG_STM32_RAISONANCE is not set
-# CONFIG_STM32_BUILDROOT is not set
 # CONFIG_STM32_DFU is not set
 
 #
@@ -118,11 +142,11 @@ CONFIG_STM32_CODESOURCERYW=y
 # CONFIG_STM32_ADC1 is not set
 # CONFIG_STM32_ADC2 is not set
 # CONFIG_STM32_ADC3 is not set
+# CONFIG_STM32_BKP is not set
+# 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_BKP is not set
-# CONFIG_STM32_CAN1 is not set
 # CONFIG_STM32_DAC1 is not set
 # CONFIG_STM32_DAC2 is not set
 CONFIG_STM32_ETHMAC=y
@@ -153,9 +177,9 @@ CONFIG_STM32_SPI=y
 #
 # Alternate Pin Mapping
 #
-CONFIG_STM32_USART2_REMAP=y
-CONFIG_STM32_SPI3_REMAP=y
 CONFIG_STM32_ETH_REMAP=y
+CONFIG_STM32_SPI3_REMAP=y
+CONFIG_STM32_USART2_REMAP=y
 # CONFIG_STM32_JTAG_DISABLE is not set
 CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_STM32_JTAG_NOJNTRST_ENABLE is not set
@@ -164,6 +188,11 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # CONFIG_ARCH_BOARD_STM32_CUSTOM_CLOCKCONFIG is not set
 
 #
+# U[S]ART Configuration
+#
+# CONFIG_USART2_RS485 is not set
+
+#
 # SPI Configuration
 #
 # CONFIG_STM32_SPI_INTERRUPTS is not set
@@ -173,6 +202,7 @@ CONFIG_STM32_JTAG_FULL_ENABLE=y
 # Ethernet MAC configuration
 #
 CONFIG_STM32_PHYADDR=0
+# CONFIG_STM32_PHYINIT is not set
 # CONFIG_STM32_MII is not set
 CONFIG_STM32_AUTONEG=y
 CONFIG_STM32_PHYSR=17
@@ -196,7 +226,11 @@ CONFIG_STM32_RMII_MCO=y
 #
 # CONFIG_ARCH_NOINTC is not set
 # CONFIG_ARCH_DMA is not set
+CONFIG_ARCH_IRQPRIO=y
+# CONFIG_CUSTOM_STACK is not set
+# CONFIG_ADDRENV is not set
 CONFIG_ARCH_STACKDUMP=y
+# CONFIG_ENDIAN_BIG is not set
 
 #
 # Board Settings
@@ -218,6 +252,7 @@ CONFIG_BOOT_RUNFROMFLASH=y
 #
 # 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_CUSTOM is not set
@@ -309,7 +344,6 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # Stack and heap information
 #
-# CONFIG_CUSTOM_STACK is not set
 CONFIG_IDLETHREAD_STACKSIZE=1024
 CONFIG_USERMAIN_STACKSIZE=1024
 CONFIG_PTHREAD_STACK_MIN=256
@@ -351,6 +385,7 @@ CONFIG_LCD_MAXPOWER=1
 # CONFIG_LCD_P14201 is not set
 # CONFIG_LCD_NOKIA6100 is not set
 # CONFIG_LCD_UG9664HSWAG01 is not set
+# CONFIG_LCD_UG2864AMBAG01 is not set
 CONFIG_LCD_SSD1289=y
 CONFIG_SSD1289_PROFILE1=y
 # CONFIG_SSD1289_PROFILE2 is not set
@@ -545,12 +580,23 @@ CONFIG_MM_REGIONS=1
 # CONFIG_GRAN 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_PIC is not set
+# CONFIG_SYMTAB_ORDEREDBYNAME is not set
+
+#
 # Library Routines
 #
 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_EOL_IS_CR is not set
@@ -563,11 +609,21 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+
+#
+# Basic CXX Support
+#
+# CONFIG_C99_BOOL8 is not set
 CONFIG_HAVE_CXX=y
 CONFIG_HAVE_CXXINITIALIZE=y
 # CONFIG_CXX_NEWLONG is not set
 
 #
+# uClibc++ Standard C++ Library
+#
+# CONFIG_UCLIBCXX is not set
+
+#
 # Application Configuration
 #
 
@@ -579,261 +635,60 @@ CONFIG_NAMEDAPP=y
 #
 # Examples
 #
-
-#
-# ADC Example
-#
-# CONFIG_EXAMPLES_ADC is not set
-
-#
-# Buttons Example
-#
 # CONFIG_EXAMPLES_BUTTONS is not set
-
-#
-# CAN Example
-#
 # CONFIG_EXAMPLES_CAN is not set
-
-#
-# USB CDC/ACM Class Driver Example
-#
 # CONFIG_EXAMPLES_CDCACM is not set
-
-#
-# USB composite Class Driver Example
-#
 # CONFIG_EXAMPLES_COMPOSITE is not set
-
-#
-# DHCP Server Example
-#
+# CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
-
-#
-# FTP Client Example
-#
+# CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
-
-#
-# FTP Server Example
-#
 # CONFIG_EXAMPLES_FTPD is not set
-
-#
-# "Hello, World!" Example
-#
 # CONFIG_EXAMPLES_HELLO is not set
-
-#
-# "Hello, World!" C++ Example
-#
 # CONFIG_EXAMPLES_HELLOXX is not set
-
-#
-# USB HID Keyboard Example
-#
+# CONFIG_EXAMPLES_JSON is not set
 # CONFIG_EXAMPLES_HIDKBD is not set
-
-#
-# IGMP Example
-#
+# CONFIG_EXAMPLES_KEYPADTEST is not set
 # CONFIG_EXAMPLES_IGMP is not set
-
-#
-# LCD Read/Write Example
-#
 # CONFIG_EXAMPLES_LCDRW is not set
-
-#
-# Memory Management Example
-#
 # CONFIG_EXAMPLES_MM is not set
-
-#
-# File System Mount Example
-#
 # CONFIG_EXAMPLES_MOUNT is not set
-
-#
-# FreeModBus Example
-#
 # CONFIG_EXAMPLES_MODBUS is not set
-
-#
-# Network Test Example
-#
 # CONFIG_EXAMPLES_NETTEST is not set
-
-#
-# NuttShell (NSH) Example
-#
 # CONFIG_EXAMPLES_NSH is not set
-
-#
-# NULL Example
-#
 # CONFIG_EXAMPLES_NULL is not set
-
-#
-# NX Graphics Example
-#
 # CONFIG_EXAMPLES_NX is not set
-
-#
-# NxConsole Example
-#
 # CONFIG_EXAMPLES_NXCONSOLE is not set
-
-#
-# NXFFS File System Example
-#
 # CONFIG_EXAMPLES_NXFFS is not set
-
-#
-# NXFLAT Example
-#
 # CONFIG_EXAMPLES_NXFLAT is not set
-
-#
-# NX Graphics "Hello, World!" Example
-#
 # CONFIG_EXAMPLES_NXHELLO is not set
-
-#
-# NX Graphics image Example
-#
 # CONFIG_EXAMPLES_NXIMAGE is not set
-
-#
-# NX Graphics lines Example
-#
 # CONFIG_EXAMPLES_NXLINES is not set
-
-#
-# NX Graphics Text Example
-#
 # CONFIG_EXAMPLES_NXTEXT is not set
-
-#
-# OS Test Example
-#
 # CONFIG_EXAMPLES_OSTEST is not set
-
-#
-# Pascal "Hello, World!"example
-#
 # CONFIG_EXAMPLES_PASHELLO is not set
-
-#
-# Pipe Example
-#
 # CONFIG_EXAMPLES_PIPE is not set
-
-#
-# Poll Example
-#
 # CONFIG_EXAMPLES_POLL is not set
-
-#
-# Pulse Width Modulation (PWM) Example
-#
-
-#
-# Quadrature Encoder Example
-#
 # CONFIG_EXAMPLES_QENCODER is not set
-
-#
-# RGMP Example
-#
 # CONFIG_EXAMPLES_RGMP is not set
-
-#
-# ROMFS Example
-#
 # CONFIG_EXAMPLES_ROMFS is not set
-
-#
-# sendmail Example
-#
 # CONFIG_EXAMPLES_SENDMAIL is not set
-
-#
-# Serial Loopback Example
-#
 # CONFIG_EXAMPLES_SERLOOP is not set
-
-#
-# Telnet Daemon Example
-#
 # CONFIG_EXAMPLES_TELNETD is not set
-
-#
-# THTTPD Web Server Example
-#
 # CONFIG_EXAMPLES_THTTPD is not set
-
-#
-# TIFF Generation Example
-#
 # CONFIG_EXAMPLES_TIFF is not set
-
-#
-# Touchscreen Example
-#
 # CONFIG_EXAMPLES_TOUCHSCREEN is not set
-
-#
-# UDP Example
-#
 # CONFIG_EXAMPLES_UDP is not set
-
-#
-# UDP Discovery Daemon Example
-#
 # CONFIG_EXAMPLES_DISCOVER is not set
-
-#
-# uIP Web Server Example
-#
 # CONFIG_EXAMPLES_UIP is not set
-
-#
-# USB Serial Test Example
-#
 # CONFIG_EXAMPLES_USBSERIAL is not set
-
-#
-# USB Mass Storage Class Example
-#
 # CONFIG_EXAMPLES_USBMSC is not set
-
-#
-# USB Serial Terminal Example
-#
 # CONFIG_EXAMPLES_USBTERM is not set
-
-#
-# Watchdog timer Example
-#
 # CONFIG_EXAMPLES_WATCHDOG is not set
-
-#
-# wget Example
-#
 # CONFIG_EXAMPLES_WGET is not set
-
-#
-# WLAN Example
-#
 # CONFIG_EXAMPLES_WLAN is not set
 
 #
-# XML RPC Example
-#
-
-#
 # Interpreters
 #
 
@@ -850,76 +705,24 @@ CONFIG_NAMEDAPP=y
 #
 # Networking Utilities
 #
-
-#
-# DHCP client
-#
+# CONFIG_NETUTILS_CODECS is not set
 # CONFIG_NETUTILS_DHCPC is not set
-
-#
-# DHCP server
-#
 # CONFIG_NETUTILS_DHCPD is not set
-
-#
-# FTP client
-#
 # CONFIG_NETUTILS_FTPC is not set
-
-#
-# FTP server
-#
 # CONFIG_NETUTILS_FTPD is not set
-
-#
-# Name resolution
-#
+# CONFIG_NETUTILS_JSON is not set
 CONFIG_NETUTILS_RESOLV=y
 CONFIG_NET_RESOLV_ENTRIES=4
-
-#
-# SMTP
-#
+CONFIG_NET_RESOLV_MAXRESPONSE=96
 # CONFIG_NETUTILS_SMTP is not set
-
-#
-# TFTP client
-#
 CONFIG_NETUTILS_TELNETD=y
-
-#
-# TFTP client
-#
 CONFIG_NETUTILS_TFTPC=y
-
-#
-# THTTPD web server
-#
 # CONFIG_NETUTILS_THTTPD is not set
-
-#
-# uIP support library
-#
 CONFIG_NETUTILS_UIPLIB=y
-
-#
-# uIP web client
-#
 CONFIG_NETUTILS_WEBCLIENT=y
-
-#
-# uIP web server
-#
+CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
 # CONFIG_NETUTILS_WEBSERVER is not set
-
-#
-# UDP Discovery Utility
-#
 # CONFIG_NETUTILS_DISCOVER is not set
-
-#
-# XML-RPC library
-#
 # CONFIG_NETUTILS_XMLRPC is not set
 
 #
@@ -950,6 +753,7 @@ CONFIG_NSH_LIBRARY=y
 # 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
@@ -978,6 +782,7 @@ 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
+CONFIG_NSH_CODECS_BUFSIZE=128
 CONFIG_NSH_FILEIOSIZE=512
 CONFIG_NSH_LINELEN=64
 CONFIG_NSH_NESTDEPTH=3
@@ -993,10 +798,12 @@ CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=1596
 CONFIG_NSH_TELNETD_CLIENTPRIO=100
 CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=1596
 CONFIG_NSH_IOBUFFER_SIZE=512
+# CONFIG_NSH_TELNET_LOGIN is not set
 CONFIG_NSH_IPADDR=0x0a000002
 CONFIG_NSH_DRIPADDR=0x0a000001
 CONFIG_NSH_NETMASK=0xffffff00
 CONFIG_NSH_NOMAC=y
+CONFIG_NSH_MAX_ROUNDTRIP=20
 
 #
 # NxWidgets/NxWM
@@ -1006,6 +813,7 @@ CONFIG_NXWIDGETS=y
 #
 # NX Server/Device Configuration
 #
+CONFIG_NXWIDGETS_FLICKERFREE=y
 CONFIG_NXWIDGETS_DEVNO=0
 CONFIG_NXWIDGETS_VPLANE=0
 CONFIG_NXWIDGETS_SERVERPRIO=51
@@ -1025,19 +833,13 @@ CONFIG_NXWIDGETS_SIZEOFCHAR=1
 #
 # NXWidget Default Values
 #
-CONFIG_NXWIDGETS_DEFAULT_FONTID=
+# CONFIG_NXWIDGETS_SYSTEM_CUSTOM_FONTID is not set
 CONFIG_NXWIDGETS_TNXARRAY_INITIALSIZE=16
 CONFIG_NXWIDGETS_TNXARRAY_SIZEINCREMENT=8
-CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR=
-CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR=
-CONFIG_NXWIDGETS_DEFAULT_SHINEEDGECOLOR=
-CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR=
-CONFIG_NXWIDGETS_DEFAULT_HIGHLIGHTCOLOR=
-CONFIG_NXWIDGETS_DEFAULT_DISABLEDTEXTCOLOR=
-CONFIG_NXWIDGETS_DEFAULT_ENABLEDTEXTCOLOR=
-CONFIG_NXWIDGETS_DEFAULT_SELECTEDTEXTCOLOR=
-CONFIG_NXWIDGETS_DEFAULT_FONTCOLOR=
-CONFIG_NXWIDGETS_TRANSPARENT_COLOR=
+# CONFIG_NXWIDGETS_CUSTOM_FILLCOLORS is not set
+# CONFIG_NXWIDGETS_CUSTOM_EDGECOLORS is not set
+# CONFIG_NXWIDGETS_CUSTOM_TEXTCOLORS is not set
+CONFIG_NXWIDGETS_TRANSPARENT_COLOR=0x0
 
 #
 # Keypad behavior
@@ -1053,18 +855,15 @@ CONFIG_NXWM=y
 #
 # General settings
 #
-CONFIG_NXWM_DEFAULT_FONTID=
+# CONFIG_NXWM_SYSTEM_CUSTOM_FONTID is not set
 CONFIG_NXWM_UNITTEST=y
 
 #
 # Color configuration
 #
-CONFIG_NXWM_DEFAULT_BACKGROUNDCOLOR=
-CONFIG_NXWM_DEFAULT_SELECTEDBACKGROUNDCOLOR=
-CONFIG_NXWM_DEFAULT_SHINEEDGECOLOR=
-CONFIG_NXWM_DEFAULT_SHADOWEDGECOLOR=
-CONFIG_NXWM_DEFAULT_FONTCOLOR=
-CONFIG_NXWM_TRANSPARENT_COLOR=
+# CONFIG_NXWM_CUSTOM_FILLCOLORS is not set
+# CONFIG_NXWM_CUSTOM_EDGECOLORS is not set
+# CONFIG_NXWM_CUSTOM_TEXTCOLORS is not set
 
 #
 # Horizontal and vertical spacing of icons in the task bar
@@ -1075,16 +874,18 @@ CONFIG_NXWM_TASKBAR_HSPACING=2
 # CONFIG_NXWM_TASKBAR_BOTTOM is not set
 CONFIG_NXWM_TASKBAR_LEFT=y
 # CONFIG_NXWM_TASKBAR_RIGHT is not set
-CONFIG_NXWM_TASKBAR_WIDTH=
+# CONFIG_NXWM_CUSTOM_TASKBAR_WIDTH is not set
+# CONFIG_NXWM_DISABLE_MINIMIZE is not set
 
 #
 # Tool Bar Configuration
 #
-CONFIG_NXWM_TOOLBAR_HEIGHT=
+# CONFIG_NXWM_CUSTOM_TOOLBAR_HEIGHT is not set
 
 #
 # Background Image
 #
+# CONFIG_NXWM_DISABLE_BACKGROUND_IMAGE is not set
 CONFIG_NXWM_BACKGROUND_IMAGE=""
 
 #
@@ -1096,7 +897,7 @@ CONFIG_NXWM_BACKGROUND_IMAGE=""
 #
 CONFIG_NXWM_STARTWINDOW_VSPACING=4
 CONFIG_NXWM_STARTWINDOW_HSPACING=4
-CONFIG_NXWM_STARTWINDOW_ICON=""
+# CONFIG_NXWM_CUSTOM_STARTWINDOW_ICON is not set
 CONFIG_NXWM_STARTWINDOW_MQNAME="/dev/nxwm"
 CONFIG_NXWM_STARTWINDOW_MXMSGS=32
 CONFIG_NXWM_STARTWINDOW_MXMPRIO=42
@@ -1108,10 +909,9 @@ CONFIG_NXWM_STARTWINDOW_STACKSIZE=1596
 #
 CONFIG_NXWM_NXCONSOLE_PRIO=50
 CONFIG_NXWM_NXCONSOLE_STACKSIZE=1596
-CONFIG_NXWM_NXCONSOLE_WCOLOR=
-CONFIG_NXWM_NXCONSOLE_FONTCOLOR=
-CONFIG_NXWM_NXCONSOLE_FONTID=
-CONFIG_NXWM_NXCONSOLE_ICON=""
+# CONFIG_NXWM_NXCONSOLE_CUSTOM_COLORS is not set
+# CONFIG_NXWM_NXCONSOLE_CUSTOM_FONTID is not set
+# CONFIG_NXWM_CUSTOM_NXCONSOLE_ICON is not set
 CONFIG_NXWM_TOUCHSCREEN=y
 
 #
@@ -1136,20 +936,18 @@ CONFIG_NXWM_KEYBOARD_LISTENERSTACK=1024
 #
 # Calibration display settings
 #
-CONFIG_NXWM_CALIBRATION_BACKGROUNDCOLOR=
-CONFIG_NXWM_CALIBRATION_LINECOLOR=
-CONFIG_NXWM_CALIBRATION_CIRCLECOLOR=
-CONFIG_NXWM_CALIBRATION_TOUCHEDCOLOR=
-CONFIG_NXWM_CALIBRATION_ICON=""
+# CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set
+# CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set
 CONFIG_NXWM_CALIBRATION_SIGNO=5
 CONFIG_NXWM_CALIBRATION_LISTENERPRIO=50
 CONFIG_NXWM_CALIBRATION_LISTENERSTACK=1024
 
 #
-# Calibration display settings
+# Hex Calculator display settings
 #
-CONFIG_NXWM_HEXCALCULATOR_BACKGROUNDCOLOR=
-CONFIG_NXWM_HEXCALCULATOR_ICON=""
+# 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
 
 #
diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt
index 8695dbb89..e7bdd4de0 100644
--- a/nuttx/configs/stm3220g-eval/README.txt
+++ b/nuttx/configs/stm3220g-eval/README.txt
@@ -1077,6 +1077,21 @@ Where <subdir> is one of the following:
        $ cd ~/nuttx-code/nuttx
        $ make
 
+    NOTES:
+ 
+    1. This configuration uses the mconf-based configuration tool.  To
+       change this configuration using that tool, you should:
+
+       a. Build and install the mconf tool.  See nuttx/README.txt and
+          misc/tools/
+
+       b. Execute 'make menuconfig' in nuttx/ in order to start the
+          reconfiguration process.
+
+    2. This configuration is currently set up to build under Cygwin on
+       a Windows machine using the CodeSourcery Windows toolchain.
+       That configuration can be easy changed as described in Note 1.
+
   ostest:
   ------
     This configuration directory, performs a simple OS test using
diff --git a/nuttx/configs/stm3220g-eval/nxwm/appconfig b/nuttx/configs/stm3220g-eval/nxwm/appconfig
deleted file mode 100644
index 4ebd8137c..000000000
--- a/nuttx/configs/stm3220g-eval/nxwm/appconfig
+++ /dev/null
@@ -1,53 +0,0 @@
-############################################################################
-# configs/stm3220g-eval/nxwm/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.
-#
-############################################################################
-
-# The NSH Library -- NOTE:  The NxWM unit test must be installed at
-# apps/external in order to build this example.  See
-# NxWidgets/UnitTests/README.txt for additional information
-
-CONFIGURED_APPS += system/readline
-CONFIGURED_APPS += nshlib
-
-# Networking libraries.
-
-ifeq ($(CONFIG_NET),y)
-CONFIGURED_APPS += netutils/uiplib
-CONFIGURED_APPS += netutils/resolv
-CONFIGURED_APPS += netutils/webclient
-CONFIGURED_APPS += netutils/tftpc
-ifeq ($(CONFIG_NSH_TELNET),y)
-CONFIGURED_APPS += netutils/telnetd
-endif
-endif
diff --git a/nuttx/configs/stm3220g-eval/nxwm/defconfig b/nuttx/configs/stm3220g-eval/nxwm/defconfig
index 065fbb137..11e88f764 100644
--- a/nuttx/configs/stm3220g-eval/nxwm/defconfig
+++ b/nuttx/configs/stm3220g-eval/nxwm/defconfig
@@ -1,372 +1,339 @@
-############################################################################
-# configs/stm3220g-eval/nxwm/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_STM32F207IG=y
-CONFIG_ARCH_BOARD="stm3220g-eval"
-CONFIG_ARCH_BOARD_STM3220G_EVAL=y
-CONFIG_BOARD_LOOPSPERMSEC=10926
-CONFIG_DRAM_SIZE=196608
-CONFIG_DRAM_START=0x20000000
-CONFIG_ARCH_IRQPRIO=y
-CONFIG_ARCH_INTERRUPTSTACK=0
-CONFIG_ARCH_STACKDUMP=y
-CONFIG_ARCH_BOOTLOADER=n
-CONFIG_ARCH_LEDS=y
-CONFIG_ARCH_BUTTONS=n
-CONFIG_ARCH_CALIBRATION=n
-CONFIG_ARCH_DMA=n
+# Automatically generated file; DO NOT EDIT.
+# Nuttx/ Configuration
+#
+CONFIG_NUTTX_NEWCONFIG=y
 
 #
-# Identify toolchain and linker options
+# Build Setup
 #
-CONFIG_STM32_CODESOURCERYW=y
-CONFIG_STM32_CODESOURCERYL=n
-CONFIG_STM32_ATOLLIC_LITE=n
-CONFIG_STM32_ATOLLIC_PRO=n
-CONFIG_STM32_DEVKITARM=n
-CONFIG_STM32_RAISONANCE=n
-CONFIG_STM32_BUILDROOT=n
+# CONFIG_EXPERIMENTAL 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
+# CONFIG_APPS_DIR="../apps"
+# CONFIG_BUILD_2PASS is not set
 
 #
-# On-board FSMC SRAM configuration
+# Binary Output Formats
 #
-CONFIG_STM32_FSMC_SRAM=n
-CONFIG_HEAP2_BASE=0x64000000
-CONFIG_HEAP2_SIZE=2097152
-  
+# CONFIG_RRLOAD_BINARY is not set
+CONFIG_INTELHEX_BINARY=y
+# CONFIG_MOTOROLA_SREC is not set
+# CONFIG_RAW_BINARY is not set
+
 #
-# Individual subsystems can be enabled:
+# Customize Header Files
 #
-# AHB1:
-CONFIG_STM32_CRC=n
-CONFIG_STM32_BKPSRAM=n
-CONFIG_STM32_DMA1=n
-CONFIG_STM32_DMA2=n
+# 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
+
+#
+# Debug Options
+#
+# CONFIG_DEBUG is not set
+# CONFIG_DEBUG_SYMBOLS is not set
+
+#
+# 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"
+
+#
+# ARM Options
+#
+# 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_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_STM32=y
+# CONFIG_ARCH_CHIP_STR71X is not set
+CONFIG_ARCH_CORTEXM3=y
+CONFIG_ARCH_FAMILY="armv7-m"
+CONFIG_ARCH_CHIP="stm32"
+CONFIG_ARCH_HAVE_CMNVECTOR=y
+# CONFIG_ARMV7M_CMNVECTOR 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
+#
+# 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_EABI is not set
+# CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE is not set
+# CONFIG_SERIAL_TERMIOS is not set
+# CONFIG_NET_MULTICAST is not set
+
+#
+# STM32 Configuration Options
+#
+# 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_STM32F103RET6 is not set
+# CONFIG_ARCH_CHIP_STM32F103VCT6 is not set
+# CONFIG_ARCH_CHIP_STM32F103VET6 is not set
+# CONFIG_ARCH_CHIP_STM32F103ZET6 is not set
+# CONFIG_ARCH_CHIP_STM32F105VBT7 is not set
+# CONFIG_ARCH_CHIP_STM32F107VC is not set
+CONFIG_ARCH_CHIP_STM32F207IG=y
+# 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_STM32_STM32F20XX=y
+CONFIG_STM32_DFU=y
+
+#
+# STM32 Peripheral Support
+#
+# CONFIG_STM32_ADC1 is not set
+# CONFIG_STM32_ADC2 is not set
+# CONFIG_STM32_ADC3 is not set
+# CONFIG_STM32_BKPSRAM is not set
+# CONFIG_STM32_CAN1 is not set
+# CONFIG_STM32_CAN2 is not set
+# CONFIG_STM32_CRC is not set
+# CONFIG_STM32_CRYP is not set
+# CONFIG_STM32_DMA1 is not set
+# CONFIG_STM32_DMA2 is not set
+# CONFIG_STM32_DAC1 is not set
+# CONFIG_STM32_DAC2 is not set
+# CONFIG_STM32_DCMI is not set
 CONFIG_STM32_ETHMAC=y
-CONFIG_STM32_OTGHS=n
-# AHB2:
-CONFIG_STM32_DCMI=n
-CONFIG_STM32_CRYP=n
-CONFIG_STM32_HASH=n
-CONFIG_STM32_RNG=n
-CONFIG_STM32_OTGFS=n
-# AHB3:
 CONFIG_STM32_FSMC=y
-# 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_TIM12=n
-CONFIG_STM32_TIM13=n
-CONFIG_STM32_TIM14=n
-CONFIG_STM32_WWDG=n
-CONFIG_STM32_IWDG=n
-CONFIG_STM32_SPI2=n
-CONFIG_STM32_SPI3=n
-CONFIG_STM32_USART2=n
-CONFIG_STM32_USART3=y
-CONFIG_STM32_UART4=n
-CONFIG_STM32_UART5=n
+# CONFIG_STM32_HASH is not set
 CONFIG_STM32_I2C1=y
-CONFIG_STM32_I2C2=n
-CONFIG_STM32_I2C3=n
-CONFIG_STM32_CAN1=n
-CONFIG_STM32_CAN2=n
-CONFIG_STM32_DAC=n
+# 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
-# APB2:
-CONFIG_STM32_TIM1=n
-CONFIG_STM32_TIM8=n
-CONFIG_STM32_USART1=n
-CONFIG_STM32_USART6=n
-CONFIG_STM32_ADC1=n
-CONFIG_STM32_ADC2=n
-CONFIG_STM32_ADC3=n
-CONFIG_STM32_SDIO=n
-CONFIG_STM32_SPI1=n
+# CONFIG_STM32_RNG is not set
+# CONFIG_STM32_SDIO is not set
+# CONFIG_STM32_SPI1 is not set
+# CONFIG_STM32_SPI2 is not set
+# CONFIG_STM32_SPI3 is not set
 CONFIG_STM32_SYSCFG=y
-CONFIG_STM32_TIM9=n
-CONFIG_STM32_TIM10=n
-CONFIG_STM32_TIM11=n
+# CONFIG_STM32_TIM1 is not set
+# CONFIG_STM32_TIM2 is not set
+# CONFIG_STM32_TIM3 is not set
+# CONFIG_STM32_TIM4 is not set
+# CONFIG_STM32_TIM5 is not set
+# CONFIG_STM32_TIM6 is not set
+# CONFIG_STM32_TIM7 is not set
+# CONFIG_STM32_TIM8 is not set
+# CONFIG_STM32_TIM9 is not set
+# CONFIG_STM32_TIM10 is not set
+# CONFIG_STM32_TIM11 is not set
+# CONFIG_STM32_TIM12 is not set
+# CONFIG_STM32_TIM13 is not set
+# CONFIG_STM32_TIM14 is not set
+# CONFIG_STM32_USART1 is not set
+# CONFIG_STM32_USART2 is not set
+CONFIG_STM32_USART3=y
+# CONFIG_STM32_UART4 is not set
+# CONFIG_STM32_UART5 is not set
+# CONFIG_STM32_USART6 is not set
+# CONFIG_STM32_WWDG is not set
+CONFIG_STM32_I2C=y
 
 #
-# STM32F20xxx specific serial device driver settings
+# Alternate Pin Mapping
 #
-CONFIG_USART1_SERIAL_CONSOLE=n
-CONFIG_USART2_SERIAL_CONSOLE=n
-CONFIG_USART3_SERIAL_CONSOLE=y
-CONFIG_UART4_SERIAL_CONSOLE=n
-CONFIG_UART5_SERIAL_CONSOLE=n
-
-CONFIG_USART1_TXBUFSIZE=128
-CONFIG_USART2_TXBUFSIZE=128
-CONFIG_USART3_TXBUFSIZE=128
-CONFIG_UART4_TXBUFSIZE=128
-CONFIG_UART5_TXBUFSIZE=128
-
-CONFIG_USART1_RXBUFSIZE=128
-CONFIG_USART2_RXBUFSIZE=128
-CONFIG_USART3_RXBUFSIZE=128
-CONFIG_UART4_RXBUFSIZE=128
-CONFIG_UART5_RXBUFSIZE=128
-
-CONFIG_USART1_BAUD=115200
-CONFIG_USART2_BAUD=115200
-CONFIG_USART3_BAUD=115200
-CONFIG_UART4_BAUD=115200
-CONFIG_UART5_BAUD=115200
-
-CONFIG_USART1_BITS=8
-CONFIG_USART2_BITS=8
-CONFIG_USART3_BITS=8
-CONFIG_UART4_BITS=8
-CONFIG_UART5_BITS=8
-
-CONFIG_USART1_PARITY=0
-CONFIG_USART2_PARITY=0
-CONFIG_USART3_PARITY=0
-CONFIG_UART4_PARITY=0
-CONFIG_UART5_PARITY=0
+# CONFIG_STM32_FLASH_PREFETCH 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_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_USART1_2STOP=0
-CONFIG_USART2_2STOP=0
-CONFIG_USART3_2STOP=0
-CONFIG_UART4_2STOP=0
-CONFIG_UART5_2STOP=0
+#
+# U[S]ART Configuration
+#
+# CONFIG_USART3_RS485 is not set
 
 #
-# STM32F20xxx specific CAN device driver settings
+# I2C Configuration
 #
-CONFIG_CAN=n
-CONFIG_CAN_EXTID=n
-#CONFIG_CAN_FIFOSIZE
-#CONFIG_CAN_NPENDINGRTR
-CONFIG_CAN_LOOPBACK=n
-CONFIG_CAN1_BAUD=700000
-CONFIG_CAN2_BAUD=700000
+# CONFIG_STM32_I2C_DYNTIMEO is not set
+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
 
 #
-# STM32F20xxx Ethernet device driver settings
+# Ethernet MAC configuration
 #
 CONFIG_STM32_PHYADDR=1
+# CONFIG_STM32_PHYINIT is not set
 CONFIG_STM32_MII=y
 CONFIG_STM32_MII_MCO1=y
-CONFIG_STM32_MII_MCO2=n
-CONFIG_STM32_RMII=n
+# CONFIG_STM32_MII_MCO2 is not set
+# CONFIG_STM32_MII_EXTCLK is not set
 CONFIG_STM32_AUTONEG=y
-#CONFIG_STM32_ETHFD
-#CONFIG_STM32_ETH100MBPS
 CONFIG_STM32_PHYSR=16
+# CONFIG_STM32_PHYSR_ALTCONFIG is not set
 CONFIG_STM32_PHYSR_SPEED=0x0002
 CONFIG_STM32_PHYSR_100MBPS=0x0000
 CONFIG_STM32_PHYSR_MODE=0x0004
 CONFIG_STM32_PHYSR_FULLDUPLEX=0x0004
-CONFIG_STM32_ETH_PTP=n
-CONFIG_STM32_ETHMAC_REGDEBUG=n
+# CONFIG_STM32_ETH_PTP is not set
 
 #
-# I2C configuration
+# USB Host Configuration
 #
-CONFIG_I2C=y
-CONFIG_I2C_POLLED=y
-CONFIG_I2C_TRANSFER=y
-CONFIG_I2C_TRACE=n
 
 #
-# ADC configuration
+# Architecture Options
 #
-# Enable ADC driver support.  The STM3220G-EVAL has a 10 Kohm potentiometer
-# RV1 connected to PF9 of STM32F207IGH6 on the board: TIM14_CH1/ SMC_CD/ADC3_IN7
+# CONFIG_ARCH_NOINTC is not set
+# CONFIG_ARCH_DMA is not set
+CONFIG_ARCH_IRQPRIO=y
+# CONFIG_CUSTOM_STACK is not set
+# CONFIG_ADDRENV is not set
+CONFIG_ARCH_STACKDUMP=y
+# CONFIG_ENDIAN_BIG is not set
+
 #
-CONFIG_ADC=n
-#CONFIG_STM32_TIM1_ADC=y
-CONFIG_STM32_TIM1_ADC3=y
-CONFIG_STM32_ADC3_SAMPLE_FREQUENCY=100
+# Board Settings
+#
+CONFIG_DRAM_START=0x20000000
+CONFIG_DRAM_SIZE=196608
+CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
+CONFIG_ARCH_INTERRUPTSTACK=0
 
 #
-# PWM configuration
+# Boot options
+#
+# CONFIG_BOOT_RUNFROMEXTSRAM is not set
+CONFIG_BOOT_RUNFROMFLASH=y
+# CONFIG_BOOT_RUNFROMISRAM is not set
+# CONFIG_BOOT_RUNFROMSDRAM is not set
+# CONFIG_BOOT_COPYTORAM is not set
+
 #
-# The STM3220G-Eval has no real on-board PWM devices, but the board can be configured to output
-# a pulse train using several options (see board.h).  Here the default setup is for TIM8, CH4.
-# Don't forget to enable CONFIG_PWM and CONFIG_STM32_TIM8.
+# Board Selection
 #
-CONFIG_PWM=n
-CONFIG_PWM_PULSECOUNT=y
-CONFIG_STM32_TIM8_PWM=y
-CONFIG_STM32_TIM8_CHANNEL=4
+CONFIG_ARCH_BOARD_STM3220G_EVAL=y
+# CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD="stm3220g-eval"
 
 #
-# General build options
+# Common Board Options
 #
-CONFIG_RRLOAD_BINARY=n
-CONFIG_INTELHEX_BINARY=y
-CONFIG_MOTOROLA_SREC=n
-CONFIG_RAW_BINARY=n
+CONFIG_ARCH_HAVE_LEDS=y
+CONFIG_ARCH_LEDS=y
+CONFIG_ARCH_HAVE_BUTTONS=y
+# CONFIG_ARCH_BUTTONS is not set
+CONFIG_ARCH_HAVE_IRQBUTTONS=y
+CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSLOTNO=0
 
 #
-# General OS setup
+# Board-Specific Options
 #
-CONFIG_USER_ENTRYPOINT="nxwm_main"
-CONFIG_DEBUG=n
-CONFIG_DEBUG_VERBOSE=n
-CONFIG_DEBUG_SYMBOLS=n
-CONFIG_DEBUG_FS=n
-CONFIG_DEBUG_GRAPHICS=n
-CONFIG_DEBUG_LCD=n
-CONFIG_DEBUG_USB=n
-CONFIG_DEBUG_NET=n
-CONFIG_DEBUG_RTC=n
-CONFIG_DEBUG_ANALOG=n
-CONFIG_DEBUG_PWM=n
-CONFIG_DEBUG_CAN=n
-CONFIG_DEBUG_I2C=n
-CONFIG_DEBUG_INPUT=n
-CONFIG_DEBUG_DMA=n
+CONFIG_LCD_RDSHIFT=5
+CONFIG_STM3220G_LCD=y
+# CONFIG_CONFIG_STM32_ILI9320_DISABLE is not set
+# CONFIG_CONFIG_STM32_ILI9325_DISABLE is not set
 
-CONFIG_HAVE_CXX=y
-CONFIG_HAVE_CXXINITIALIZE=y
-CONFIG_MM_REGIONS=1
-CONFIG_ARCH_LOWPUTC=y
+#
+# RTOS Features
+#
+CONFIG_MSEC_PER_TICK=10
 CONFIG_RR_INTERVAL=200
-CONFIG_SCHED_INSTRUMENTATION=n
+# CONFIG_SCHED_INSTRUMENTATION is not set
 CONFIG_TASK_NAME_SIZE=0
+# CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2012
 CONFIG_START_MONTH=5
 CONFIG_START_DAY=28
-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_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_WORKQUEUE=y
 CONFIG_SCHED_WORKPRIORITY=192
 CONFIG_SCHED_WORKPERIOD=50000
 CONFIG_SCHED_WORKSTACKSIZE=2048
 CONFIG_SIG_SIGWORK=4
+# CONFIG_SCHED_LPWORK is not set
 CONFIG_SCHED_WAITPID=y
-CONFIG_SCHED_ATEXIT=n
+# CONFIG_SCHED_ATEXIT is not set
 CONFIG_SCHED_ONEXIT=y
-
-#
-# System Logging
-#
-
-CONFIG_SYSLOG=n
-CONFIG_RAMLOG=n
-CONFIG_RAMLOG_CONSOLE=n
-CONFIG_RAMLOG_SYSLOG=n
-#CONFIG_RAMLOG_NPOLLWAITERS
-#CONFIG_RAMLOG_CONSOLE_BUFSIZE
-
-#
-# Settings for NXFLAT
-#
-CONFIG_NXFLAT=n
-CONFIG_NXFLAT_DUMPBUFFER=n
-CONFIG_SYMTAB_ORDEREDBYNAME=y
-
-#
-# 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.
-#
-# There are certain dependency relationships in these
-# features.
-#
-# 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.
-#
-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_SCHED_ONEXIT_MAX=1
+CONFIG_USER_ENTRYPOINT="nxwm_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_MOUNTPOINT is not set
+# CONFIG_DISABLE_ENVIRON is not set
 CONFIG_DISABLE_POLL=y
 
 #
-# Misc libc settings
-#
-CONFIG_NOPRINTF_FIELDWIDTH=n
-
-#
-# Allow for architecture optimized implementations
-#
-# The architecture can provide optimized versions of the
-# following to improve system performance
-#
-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
-
-#
 # Sizes of configurable things (0 disables)
 #
 CONFIG_MAX_TASKS=16
@@ -375,9 +342,6 @@ CONFIG_NPTHREAD_KEYS=4
 CONFIG_NFILE_DESCRIPTORS=12
 CONFIG_NFILE_STREAMS=12
 CONFIG_NAME_MAX=32
-CONFIG_STDIO_BUFFER_SIZE=64
-CONFIG_STDIO_LINEBUFFER=y
-CONFIG_NUNGET_CHARS=2
 CONFIG_PREALLOC_MQ_MSGS=32
 CONFIG_MQ_MAXMSGSIZE=48
 CONFIG_MAX_WDOGPARMS=2
@@ -385,505 +349,681 @@ CONFIG_PREALLOC_WDOGS=8
 CONFIG_PREALLOC_TIMERS=4
 
 #
-# Framebuffer driver options
-#
-CONFIG_FB_CMAP=n
-CONFIG_FB_HWCURSOR=n
-CONFIG_FB_HWCURSORIMAGE=n
-#CONFIG_FB_HWCURSORSIZE
-#CONFIG_FB_TRANSPARENCY
-
-#
-# Filesystem configuration
+# Stack and heap information
 #
-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_IDLETHREAD_STACKSIZE=1024
+CONFIG_USERMAIN_STACKSIZE=2048
+CONFIG_PTHREAD_STACK_MIN=256
+CONFIG_PTHREAD_STACK_DEFAULT=2048
 
 #
-# Maintain legacy build behavior (revisit)
+# Device Drivers
 #
-
+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_PWM is not set
+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_RTC=y
+CONFIG_RTC_DATETIME=y
+# CONFIG_RTC_ALARM is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_ANALOG is not set
+# CONFIG_BCH is not set
+CONFIG_INPUT=y
+# CONFIG_INPUT_TSC2007 is not set
+# CONFIG_INPUT_ADS7843E is not set
+CONFIG_INPUT_STMPE811=y
+# CONFIG_STMPE811_SPI is not set
+CONFIG_STMPE811_I2C=y
+CONFIG_STMPE811_ACTIVELOW=y
+CONFIG_STMPE811_EDGE=y
+CONFIG_STMPE811_MULTIPLE=y
+# CONFIG_STMPE811_TSC_DISABLE is not set
+# CONFIG_STMPE811_SWAPXY is not set
+CONFIG_STMPE811_THRESHX=39
+CONFIG_STMPE811_THRESHY=51
+CONFIG_STMPE811_ADC_DISABLE=y
+CONFIG_STMPE811_GPIO_DISABLE=y
+CONFIG_STMPE811_TEMP_DISABLE=y
+CONFIG_LCD=y
+CONFIG_LCD_NOGETRUN=y
+CONFIG_LCD_MAXCONTRAST=1
+CONFIG_LCD_MAXPOWER=1
+# CONFIG_LCD_P14201 is not set
+# CONFIG_LCD_NOKIA6100 is not set
+# CONFIG_LCD_UG9664HSWAG01 is not set
+# CONFIG_LCD_UG2864AMBAG01 is not set
+# CONFIG_LCD_SSD1289 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
 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_MTD is not set
+# CONFIG_NETDEVICES is not set
+# CONFIG_NET_SLIP is not set
+# CONFIG_PIPES is not set
+# CONFIG_PM is not set
+# CONFIG_POWER is not set
+# CONFIG_SENSORS is not set
+# CONFIG_SERCOMM_CONSOLE is not set
+CONFIG_SERIAL=y
+# CONFIG_DEV_LOWCONSOLE is not set
+# CONFIG_16550_UART is not set
+CONFIG_ARCH_HAVE_USART3=y
+CONFIG_MCU_SERIAL=y
+CONFIG_STANDARD_SERIAL=y
+CONFIG_USART3_SERIAL_CONSOLE=y
+# CONFIG_NO_SERIAL_CONSOLE is not set
 
 #
-# SPI-based MMC/SD driver
+# USART3 Configuration
 #
-CONFIG_MMCSD_NSLOTS=1
-CONFIG_MMCSD_READONLY=n
-CONFIG_MMCSD_SPICLOCK=12500000
+CONFIG_USART3_RXBUFSIZE=128
+CONFIG_USART3_TXBUFSIZE=128
+CONFIG_USART3_BAUD=115200
+CONFIG_USART3_BITS=8
+CONFIG_USART3_PARITY=0
+CONFIG_USART3_2STOP=0
+# CONFIG_USBDEV is not set
+# CONFIG_USBHOST is not set
+# CONFIG_WIRELESS is not set
 
 #
-# Block driver buffering
+# System Logging Device Options
 #
-CONFIG_FS_READAHEAD=n
-CONFIG_FS_WRITEBUFFER=n
 
 #
-# STM32 SDIO-based MMC/SD driver
+# System Logging
 #
-CONFIG_SDIO_DMA=n
-#CONFIG_SDIO_PRI=128
-#CONFIG_SDIO_DMAPRIO
-#CONFIG_SDIO_WIDTH_D1_ONLY
-CONFIG_MMCSD_MULTIBLOCK_DISABLE=y
-CONFIG_MMCSD_MMCSUPPORT=n
-CONFIG_MMCSD_HAVECARDDETECT=n
+# CONFIG_RAMLOG is not set
 
 #
-# TCP/IP and UDP support via uIP
+# Networking Support
 #
 CONFIG_NET=y
-CONFIG_NET_NOINTS=n
+CONFIG_ARCH_HAVE_PHY=y
+CONFIG_PHY_KS8721=y
+# CONFIG_PHY_DP83848C is not set
+# CONFIG_PHY_LAN8720 is not set
+# CONFIG_PHY_DM9161 is not set
+# CONFIG_NET_NOINTS is not set
 CONFIG_NET_MULTIBUFFER=y
-CONFIG_NET_IPv6=n
+# 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
 CONFIG_NET_TCP=y
 CONFIG_NET_TCP_CONNS=40
-#CONFIG_NET_TCP_READAHEAD_BUFSIZE
+CONFIG_NET_MAX_LISTENPORTS=40
+CONFIG_NET_TCP_READAHEAD_BUFSIZE=562
 CONFIG_NET_NTCP_READAHEAD_BUFFERS=16
+CONFIG_NET_TCP_RECVDELAY=0
 CONFIG_NET_TCPBACKLOG=y
-CONFIG_NET_MAX_LISTENPORTS=40
 CONFIG_NET_UDP=y
 CONFIG_NET_UDP_CHECKSUMS=y
-#CONFIG_NET_UDP_CONNS=10
+CONFIG_NET_UDP_CONNS=8
+# CONFIG_NET_BROADCAST is not set
 CONFIG_NET_ICMP=y
 CONFIG_NET_ICMP_PING=y
-#CONFIG_NET_PINGADDRCONF=0
+# CONFIG_NET_PINGADDRCONF is not set
+# CONFIG_NET_IGMP is not set
 CONFIG_NET_STATISTICS=y
-#CONFIG_NET_RECEIVE_WINDOW=
-CONFIG_NET_BROADCAST=n
-#CONFIG_NET_ARPTAB_SIZE=8
-CONFIG_NET_ARP_IPIN=n
-CONFIG_NET_MULTICAST=n
+CONFIG_NET_RECEIVE_WINDOW=562
+CONFIG_NET_ARPTAB_SIZE=16
+# CONFIG_NET_ARP_IPIN is not set
 
 #
-# UIP Network Utilities
+# File Systems
 #
-CONFIG_NET_DHCP_LIGHT=n
-CONFIG_NET_RESOLV_ENTRIES=4
 
 #
-# FTP Server
+# File system configuration
 #
-CONFIG_FTPD_CMDBUFFERSIZE=2048
+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
 
 #
-# RTC Configuration
+# System Logging
 #
-CONFIG_RTC=y
-CONFIG_RTC_DATETIME=y
-CONFIG_RTC_HIRES=n
-CONFIG_RTC_FREQUENCY=1
-CONFIG_RTC_ALARM=n
+# CONFIG_SYSLOG is not set
 
 #
-# Input device configuration
+# Graphics Support
 #
-CONFIG_INPUT=y
-CONFIG_INPUT_TSC2007=n
+CONFIG_NX=y
+CONFIG_NX_LCDDRIVER=y
+CONFIG_NX_NPLANES=1
+CONFIG_NX_WRITEONLY=y
 
 #
-# STMPE811 input device configuration
-#
-# Prerequisites:  CONFIG_INPUT=y
-# Other settings that effect the driver: CONFIG_DISABLE_POLL
+# Supported Pixel Depths
 #
-CONFIG_INPUT_STMPE811=y
-CONFIG_STMPE811_SPI=n
-CONFIG_STMPE811_I2C=y
-CONFIG_STMPE811_MULTIPLE=y
-CONFIG_STMPE811_ACTIVELOW=y
-CONFIG_STMPE811_EDGE=y
-#CONFIG_STMPE811_NPOLLWAITERS
-CONFIG_STMPE811_TSC_DISABLE=n
-CONFIG_STMPE811_ADC_DISABLE=y
-CONFIG_STMPE811_GPIO_DISABLE=y
-CONFIG_STMPE811_GPIOINT_DISABLE=y
-CONFIG_STMPE811_SWAPXY=n
-CONFIG_STMPE811_TEMP_DISABLE=y
-CONFIG_STMPE811_REGDEBUG=n
-CONFIG_STMPE811_THRESHX=39
-CONFIG_STMPE811_THRESHY=51
+CONFIG_NX_DISABLE_1BPP=y
+CONFIG_NX_DISABLE_2BPP=y
+CONFIG_NX_DISABLE_4BPP=y
+CONFIG_NX_DISABLE_8BPP=y
+# CONFIG_NX_DISABLE_16BPP is not set
+CONFIG_NX_DISABLE_24BPP=y
+CONFIG_NX_DISABLE_32BPP=y
+# CONFIG_NX_PACKEDMSFIRST is not set
 
 #
-# STM32 USB OTG FS Device Configuration
+# Input Devices
 #
-CONFIG_USBDEV=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
+CONFIG_NX_MOUSE=y
+CONFIG_NX_KBD=y
 
 #
-# STM32 USB OTG FS Host Configuration
+# Framed Window Borders
 #
-CONFIG_USBHOST=n
-#CONFIG_STM32_OTGFS_RXFIFO_SIZE
-#CONFIG_STM32_OTGFS_NPTXFIFO_SIZE
-#CONFIG_STM32_OTGFS_PTXFIFO_SIZE
-#CONFIG_STM32_OTGFS_DESCSIZE
-CONFIG_STM32_OTGFS_SOFINTR=n
-CONFIG_STM32_USBHOST_REGDEBUG=n
-CONFIG_STM32_USBHOST_PKTDUMP=n
+CONFIG_NXTK_BORDERWIDTH=4
+CONFIG_NXTK_BORDERCOLOR1=0x5cb7
+CONFIG_NXTK_BORDERCOLOR2=0x21c9
+CONFIG_NXTK_BORDERCOLOR3=0xffdf
+# CONFIG_NXTK_AUTORAISE is not set
 
 #
-# USB Serial Device Configuration
+# Font Selections
 #
-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
+CONFIG_NXFONTS_CHARBITS=7
+# 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=y
+# CONFIG_NXFONT_SANS28X37B is not set
+# 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=y
 
 #
-# USB Storage Device Configuration
+# NxConsole Output Text/Graphics Options
 #
-CONFIG_USBMSC=n
-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
+CONFIG_NXCONSOLE_BPP=16
+CONFIG_NXCONSOLE_CURSORCHAR=137
+CONFIG_NXCONSOLE_MXCHARS=325
+CONFIG_NXCONSOLE_CACHESIZE=32
+CONFIG_NXCONSOLE_LINESEPARATION=0
+# CONFIG_NXCONSOLE_NOWRAP is not set
 
 #
-# Watchdog timer configuration
+# NxConsole Input options
 #
-CONFIG_WATCHDOG=n
+CONFIG_NXCONSOLE_NXKBDIN=y
+CONFIG_NXCONSOLE_KBDBUFSIZE=16
+CONFIG_NXCONSOLE_NPOLLWAITERS=4
 
 #
-# Graphics related configuration settings
+# NX Multi-user only options
 #
-CONFIG_NX=y
 CONFIG_NX_MULTIUSER=y
-CONFIG_NX_NPLANES=1
-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_24BPP=y
-CONFIG_NX_DISABLE_32BPP=y
-CONFIG_NX_PACKEDMSFIRST=n
-CONFIG_NX_LCDDRIVER=y
-CONFIG_LCD_MAXPOWER=1
-CONFIG_LCD_MAXCONTRAST=1
-CONFIG_NX_MOUSE=y
-CONFIG_NX_KBD=y
-#CONFIG_NXTK_BORDERWIDTH=4
-CONFIG_NXTK_BORDERCOLOR1=0x5cb7
-CONFIG_NXTK_BORDERCOLOR2=0x21c9
-CONFIG_NXTK_BORDERCOLOR3=0xffdf
-CONFIG_NXTK_AUTORAISE=n
-CONFIG_NXFONT_SANS17X22=n
-CONFIG_NXFONT_SANS20X26=n
-CONFIG_NXFONT_SANS22X29=n
-CONFIG_NXFONT_SANS23X27=y
-CONFIG_NXFONT_SANS28X37=n
-CONFIG_NXFONT_SANS17X23B=n
-CONFIG_NXFONT_SANS20X27B=n
-CONFIG_NXFONT_SANS22X29B=y
-CONFIG_NXFONT_SANS28X37B=n
-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
 
 #
-# NxWidgets / NxWM
+# Memory Management
 #
-# Use all defaults except
-# 1. 16 bits-per-pixel
-# 2. Make the NxWidgets background color match the NxWM back color
-# 3. Build in support for keyboard input in NxConsole
-# 4. Taskbar on the left
-# 5. We do have a touchscreen
-# 6. We do want the NxWM keybard listener
-# 7. Use a larger font with the calculator
-#
-CONFIG_NXWIDGETS_BPP=16
-CONFIG_NXWIDGETS_SERVERSTACK=2048
-CONFIG_NXWIDGETS_LISTENERSTACK=2048
-CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR=MKRGB(148,189,215)
-CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR=MKRGB(206,227,241)
-CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR=MKRGB(35,58,73)
+# CONFIG_MM_SMALL is not set
+CONFIG_MM_REGIONS=1
+# CONFIG_GRAN is not set
 
-CONFIG_NXCONSOLE_NXKBDIN=y
+#
+# 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_PIC is not set
+CONFIG_SYMTAB_ORDEREDBYNAME=y
 
-CONFIG_NXWM_TASKBAR_LEFT=y
-CONFIG_NXWM_NXCONSOLE_STACKSIZE=2048
-CONFIG_NXWM_TASKBAR_VSPACING=4
-CONFIG_NXWM_UNITTEST=y
-CONFIG_NXWM_TOUCHSCREEN=y
-CONFIG_NXWM_KEYBOARD=y
-CONFIG_NXWM_HEXCALCULATOR_FONTID=5
+#
+# Library Routines
+#
+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_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_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
 
 #
-# NxConsole Configuration Settings:
+# Basic CXX Support
 #
-CONFIG_NXCONSOLE=y
-CONFIG_NXCONSOLE_BPP=16
-CONFIG_NXCONSOLE_MXCHARS=325
-CONFIG_NXCONSOLE_CACHESIZE=32
+# CONFIG_C99_BOOL8 is not set
+CONFIG_HAVE_CXX=y
+CONFIG_HAVE_CXXINITIALIZE=y
+# CONFIG_CXX_NEWLONG is not set
+
+#
+# uClibc++ Standard C++ Library
 #
+# CONFIG_UCLIBCXX is not set
 
 #
-# STM3220G-EVAL LCD Hardware Configuration
+# Application Configuration
 #
-CONFIG_LCD_NOGETRUN=y
-CONFIG_LCD_LANDSCAPE=y
-CONFIG_LCD_RLANDSCAPE=n
-CONFIG_LCD_PORTRAIT=n
-CONFIG_LCD_RPORTRAIT=n
 
 #
-# STM3220G-EVAL specific LCD settings
+# Named Applications
 #
-CONFIG_STM32_ILI9320_DISABLE=n
-CONFIG_STM32_ILI9325_DISABLE=n
+# CONFIG_NAMEDAPP is not set
 
 #
-# Settings for examples/uip
+# Examples
 #
-CONFIG_EXAMPLES_UIP_IPADDR=0x0a000002
-CONFIG_EXAMPLES_UIP_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_UIP_NETMASK=0xffffff00
-CONFIG_EXAMPLES_UIP_DHCPC=n
+# CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CDCACM is not set
+# CONFIG_EXAMPLES_COMPOSITE is not set
+# CONFIG_EXAMPLES_CXXTEST is not set
+# CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FTPC is not set
+# CONFIG_EXAMPLES_FTPD is not set
+# CONFIG_EXAMPLES_HELLO is not set
+# CONFIG_EXAMPLES_HELLOXX is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_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_MOUNT is not set
+# CONFIG_EXAMPLES_MODBUS is not set
+# CONFIG_EXAMPLES_NETTEST is not set
+# CONFIG_EXAMPLES_NSH is not set
+# CONFIG_EXAMPLES_NULL is not set
+# CONFIG_EXAMPLES_NX is not set
+# CONFIG_EXAMPLES_NXCONSOLE is not set
+# CONFIG_EXAMPLES_NXFFS is not set
+# CONFIG_EXAMPLES_NXFLAT is not set
+# CONFIG_EXAMPLES_NXHELLO is not set
+# CONFIG_EXAMPLES_NXIMAGE is not set
+# CONFIG_EXAMPLES_NXLINES is not set
+# CONFIG_EXAMPLES_NXTEXT is not set
+# CONFIG_EXAMPLES_OSTEST is not set
+# CONFIG_EXAMPLES_PASHELLO is not set
+# CONFIG_EXAMPLES_PIPE is not set
+# CONFIG_EXAMPLES_POLL 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_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_DISCOVER is not set
+# CONFIG_EXAMPLES_UIP is not set
+# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_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
 
 #
-# Settings for examples/nettest
-CONFIG_EXAMPLES_NETTEST_SERVER=n
-CONFIG_EXAMPLES_NETTEST_PERFORMANCE=n
-CONFIG_EXAMPLES_NETTEST_NOMAC=y
-CONFIG_EXAMPLES_NETTEST_IPADDR=0x0a000002
-CONFIG_EXAMPLES_NETTEST_DRIPADDR=0x0a000001
-CONFIG_EXAMPLES_NETTEST_NETMASK=0xffffff00
-CONFIG_EXAMPLES_NETTEST_CLIENTIP=0x0a000001
+# Interpreters
+#
 
 #
-# Settings for examples/ostest
+# Interpreters
 #
-CONFIG_EXAMPLES_OSTEST_LOOPS=1
-CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
-CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
+# CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_PCODE is not set
 
 #
-# Settings for apps/nshlib
+# Network Utilities
 #
-CONFIG_NSH_BUILTIN_APPS=n
 
+#
+# Networking Utilities
+#
+# CONFIG_NETUTILS_CODECS is not set
+# CONFIG_NETUTILS_DHCPC 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_RESOLV=y
+CONFIG_NET_RESOLV_ENTRIES=4
+CONFIG_NET_RESOLV_MAXRESPONSE=96
+# CONFIG_NETUTILS_SMTP is not set
+CONFIG_NETUTILS_TELNETD=y
+CONFIG_NETUTILS_TFTPC=y
+# CONFIG_NETUTILS_THTTPD is not set
+CONFIG_NETUTILS_UIPLIB=y
+CONFIG_NETUTILS_WEBCLIENT=y
+CONFIG_NSH_WGET_USERAGENT="NuttX/6.xx.x (; http://www.nuttx.org/)"
+# CONFIG_NETUTILS_WEBSERVER is not set
+# CONFIG_NETUTILS_DISCOVER is not set
+# CONFIG_NETUTILS_XMLRPC is not set
+
+#
+# ModBus
+#
+
+#
+# FreeModbus
+#
+# CONFIG_MODBUS is not set
+
+#
+# NSH Library
+#
+CONFIG_NSH_LIBRARY=y
+
+#
+# Disable Individual commands
+#
+# CONFIG_NSH_DISABLE_CAT is not set
+# CONFIG_NSH_DISABLE_CD is not set
+# CONFIG_NSH_DISABLE_CP is not set
+# CONFIG_NSH_DISABLE_DD 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_MKFATFS is not set
+# CONFIG_NSH_DISABLE_MKFIFO is not set
+# CONFIG_NSH_DISABLE_MKRD is not set
+# CONFIG_NSH_DISABLE_MH is not set
+# CONFIG_NSH_DISABLE_MOUNT is not set
+# CONFIG_NSH_DISABLE_MW is not set
+# CONFIG_NSH_DISABLE_NSFMOUNT is not set
+# CONFIG_NSH_DISABLE_PS is not set
+# CONFIG_NSH_DISABLE_PING is not set
+# CONFIG_NSH_DISABLE_PUT is not set
+# CONFIG_NSH_DISABLE_PWD is not set
+# CONFIG_NSH_DISABLE_RM is not set
+# CONFIG_NSH_DISABLE_RMDIR is not set
+# CONFIG_NSH_DISABLE_SET is not set
+# CONFIG_NSH_DISABLE_SH is not set
+# CONFIG_NSH_DISABLE_SLEEP is not set
+# CONFIG_NSH_DISABLE_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
+CONFIG_NSH_CODECS_BUFSIZE=128
 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_DISABLESCRIPT is not set
+# CONFIG_NSH_DISABLEBG is not set
 CONFIG_NSH_CONSOLE=y
-#CONFIG_NSH_CONDEV="/dev/ttyS1"
+# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ARCHINIT is not set
 CONFIG_NSH_TELNET=y
-CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_TELNETD_PORT=23
+CONFIG_NSH_TELNETD_DAEMONPRIO=100
+CONFIG_NSH_TELNETD_DAEMONSTACKSIZE=2048
+CONFIG_NSH_TELNETD_CLIENTPRIO=100
+CONFIG_NSH_TELNETD_CLIENTSTACKSIZE=2048
 CONFIG_NSH_IOBUFFER_SIZE=512
-CONFIG_NSH_DHCPC=n
-CONFIG_NSH_NOMAC=y
+# CONFIG_NSH_TELNET_LOGIN is not set
 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"
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_MAX_ROUNDTRIP=20
 
 #
-# Architecture-specific NSH options
+# NxWidgets/NxWM
 #
-CONFIG_NSH_MMCSDSPIPORTNO=0
-CONFIG_NSH_MMCSDSLOTNO=0
-CONFIG_NSH_MMCSDMINOR=0
+CONFIG_NXWIDGETS=y
 
 #
-# I2C tool settings
+# NX Server/Device Configuration
 #
-CONFIG_I2CTOOL_BUILTIN=y
-CONFIG_I2CTOOL_MINBUS=1
-CONFIG_I2CTOOL_MAXBUS=3
-#CONFIG_I2CTOOL_MINADDR
-#CONFIG_I2CTOOL_MAXADDR
-#CONFIG_I2CTOOL_MAXREGADDR
-CONFIG_I2CTOOL_DEFFREQ=100000
+CONFIG_NXWIDGETS_FLICKERFREE=y
+CONFIG_NXWIDGETS_DEVNO=0
+CONFIG_NXWIDGETS_VPLANE=0
+CONFIG_NXWIDGETS_SERVERPRIO=51
+CONFIG_NXWIDGETS_SERVERSTACK=2048
+CONFIG_NXWIDGETS_CLIENTPRIO=50
+CONFIG_NXWIDGETS_LISTENERPRIO=50
+CONFIG_NXWIDGETS_LISTENERSTACK=2048
+# CONFIG_NXWIDGETS_EXTERNINIT is not set
+# CONFIG_NXWIDGET_EVENTWAIT is not set
 
 #
-# Settings for examples/usbserial
+# NXWidget Configuration
 #
-CONFIG_EXAMPLES_USBSERIAL_INONLY=n
-CONFIG_EXAMPLES_USBSERIAL_OUTONLY=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYSMALL=n
-CONFIG_EXAMPLES_USBSERIAL_ONLYBIG=n
+CONFIG_NXWIDGETS_BPP=16
+CONFIG_NXWIDGETS_SIZEOFCHAR=1
 
-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
+#
+# NXWidget Default Values
+#
+# CONFIG_NXWIDGETS_SYSTEM_CUSTOM_FONTID is not set
+CONFIG_NXWIDGETS_TNXARRAY_INITIALSIZE=16
+CONFIG_NXWIDGETS_TNXARRAY_SIZEINCREMENT=8
+CONFIG_NXWIDGETS_CUSTOM_FILLCOLORS=y
+CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR=0x9dfb
+CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR=0xd73e
+CONFIG_NXWIDGETS_DEFAULT_HIGHLIGHTCOLOR=0xc618
+CONFIG_NXWIDGETS_CUSTOM_EDGECOLORS=y
+CONFIG_NXWIDGETS_DEFAULT_SHINEEDGECOLOR=0xffdf
+CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR=0x21e9
+# CONFIG_NXWIDGETS_CUSTOM_TEXTCOLORS is not set
+CONFIG_NXWIDGETS_TRANSPARENT_COLOR=0x0
 
 #
-# Settings for examples/adc
+# Keypad behavior
 #
+CONFIG_NXWIDGETS_FIRST_REPEAT_TIME=500
+CONFIG_NXWIDGETS_CONTINUE_REPEAT_TIME=200
+CONFIG_NXWIDGETS_DOUBLECLICK_TIME=350
+CONFIG_NXWIDGETS_KBDBUFFER_SIZE=16
+CONFIG_NXWIDGETS_CURSORCONTROL_SIZE=4
+# CONFIG_NXWIDGET_MEMMONITOR is not set
+CONFIG_NXWM=y
 
 #
-# Settings for examples/can
+# General settings
 #
+# CONFIG_NXWM_SYSTEM_CUSTOM_FONTID is not set
+CONFIG_NXWM_UNITTEST=y
 
 #
-# Settings for examples/nx
+# Color configuration
 #
-CONFIG_EXAMPLES_NX_BUILTIN=y
-CONFIG_EXAMPLES_NX_VPLANE=0
-CONFIG_EXAMPLES_NX_DEVNO=0
-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_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_NXWM_CUSTOM_FILLCOLORS is not set
+# CONFIG_NXWM_CUSTOM_EDGECOLORS is not set
+# CONFIG_NXWM_CUSTOM_TEXTCOLORS is not set
 
 #
-# Settings for examples/nxhello
+# Horizontal and vertical spacing of icons in the task bar
 #
-CONFIG_EXAMPLES_NXHELLO_BUILTIN=y
-CONFIG_EXAMPLES_NXHELLO_VPLANE=0
-CONFIG_EXAMPLES_NXHELLO_DEVNO=0
-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
+CONFIG_NXWM_TASKBAR_VSPACING=4
+CONFIG_NXWM_TASKBAR_HSPACING=2
+# CONFIG_NXWM_TASKBAR_TOP is not set
+# CONFIG_NXWM_TASKBAR_BOTTOM is not set
+CONFIG_NXWM_TASKBAR_LEFT=y
+# CONFIG_NXWM_TASKBAR_RIGHT is not set
+# CONFIG_NXWM_CUSTOM_TASKBAR_WIDTH is not set
+# CONFIG_NXWM_DISABLE_MINIMIZE is not set
 
 #
-# Settings for examples/nximage
+# Tool Bar Configuration
 #
-CONFIG_EXAMPLES_NXIMAGE_BUILTIN=y
-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_NXWM_CUSTOM_TOOLBAR_HEIGHT is not set
 
 #
-# Settings for examples/nxlines
+# Background Image
 #
-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_NXWM_DISABLE_BACKGROUND_IMAGE is not set
+CONFIG_NXWM_BACKGROUND_IMAGE=""
 
 #
-# Settings for examples/touchscreen
+# Start Window Configuration
 #
-CONFIG_EXAMPLES_TOUCHSCREEN_BUILTIN=n
-CONFIG_EXAMPLES_TOUCHSCREEN_MINOR=0
-CONFIG_EXAMPLES_TOUCHSCREEN_DEVPATH="/dev/input0"
-CONFIG_EXAMPLES_TOUCHSCREEN_NSAMPLES=25
 
 #
-# Settings for examples/usbstorage
+# Horizontal and vertical spacing of icons in the task bar
 #
-CONFIG_EXAMPLES_USBMSC_BUILTIN=y
-CONFIG_EXAMPLES_USBMSC_NLUNS=1
-CONFIG_EXAMPLES_USBMSC_DEVMINOR1=0
-CONFIG_EXAMPLES_USBMSC_DEVPATH1="/dev/mmcsd0"
-CONFIG_EXAMPLES_USBMSC_DEBUGMM=n
-CONFIG_EXAMPLES_USBMSC_TRACEINIT=n
-CONFIG_EXAMPLES_USBMSC_TRACECLASS=n
-CONFIG_EXAMPLES_USBMSC_TRACETRANSFERS=n
-CONFIG_EXAMPLES_USBMSC_TRACECONTROLLER=n
-CONFIG_EXAMPLES_USBMSC_TRACEINTERRUPTS=n
+CONFIG_NXWM_STARTWINDOW_VSPACING=4
+CONFIG_NXWM_STARTWINDOW_HSPACING=4
+# CONFIG_NXWM_CUSTOM_STARTWINDOW_ICON is not set
+CONFIG_NXWM_STARTWINDOW_MQNAME="/dev/nxwm"
+CONFIG_NXWM_STARTWINDOW_MXMSGS=32
+CONFIG_NXWM_STARTWINDOW_MXMPRIO=42
+CONFIG_NXWM_STARTWINDOW_PRIO=50
+CONFIG_NXWM_STARTWINDOW_STACKSIZE=2048
 
 #
-# Settings for examples/watchdog
+# NxConsole Window Configuration
+#
+CONFIG_NXWM_NXCONSOLE_PRIO=50
+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
+CONFIG_NXWM_TOUCHSCREEN=y
+
+#
+# Touchscreen device settings
+#
+CONFIG_NXWM_TOUCHSCREEN_DEVNO=0
+CONFIG_NXWM_TOUCHSCREEN_DEVPATH="/dev/input0"
+CONFIG_NXWM_TOUCHSCREEN_SIGNO=5
+CONFIG_NXWM_TOUCHSCREEN_LISTENERPRIO=50
+CONFIG_NXWM_TOUCHSCREEN_LISTENERSTACK=1024
+CONFIG_NXWM_KEYBOARD=y
+
 #
-# This test depends on these specific Watchdog/NSH configurations settings (your
-# specific watchdog hardware settings might require additional settings).
+# Keyboard device settings
 #
+CONFIG_NXWM_KEYBOARD_DEVPATH="/dev/console"
+CONFIG_NXWM_KEYBOARD_SIGNO=6
+CONFIG_NXWM_KEYBOARD_BUFSIZE=16
+CONFIG_NXWM_KEYBOARD_LISTENERPRIO=50
+CONFIG_NXWM_KEYBOARD_LISTENERSTACK=2048
 
 #
-# Settings for examples/pwm
+# Calibration display settings
 #
+# CONFIG_NXWM_CALIBRATION_CUSTOM_COLORS is not set
+# CONFIG_NXWM_CUSTOM_CALIBRATION_ICON is not set
+CONFIG_NXWM_CALIBRATION_SIGNO=5
+CONFIG_NXWM_CALIBRATION_LISTENERPRIO=50
+CONFIG_NXWM_CALIBRATION_LISTENERSTACK=2048
 
 #
-# Settings for examples/ftpd
+# Calibration 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
 
 #
-# Settings for examples/watchdog
+# System NSH Add-Ons
 #
-# This test depends on these specific Watchdog/NSH configurations settings (your
-# specific watchdog hardware settings might require additional settings).
+
 #
+# Custom Free Memory Command
+#
+# CONFIG_SYSTEM_FREE is not set
 
 #
-# Stack and heap information
+# I2C tool
 #
-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_HEAP_BASE=
-CONFIG_HEAP_SIZE=
+# CONFIG_SYSTEM_I2CTOOL is not set
+
+#
+# FLASH Program Installation
+#
+# CONFIG_SYSTEM_INSTALL 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
diff --git a/nuttx/configs/stm3220g-eval/nxwm/setenv.sh b/nuttx/configs/stm3220g-eval/nxwm/setenv.sh
index 858531391..7326fad47 100755
--- a/nuttx/configs/stm3220g-eval/nxwm/setenv.sh
+++ b/nuttx/configs/stm3220g-eval/nxwm/setenv.sh
@@ -67,7 +67,7 @@ export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++
 
 # This is the Cygwin path to the location where I build the buildroot
 # toolchain.
-export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
+#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm_nofpu/staging_dir/bin"
 
 # Add the path to the toolchain to the PATH variable
 export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
diff --git a/nuttx/drivers/input/Kconfig b/nuttx/drivers/input/Kconfig
index 1f345ee14..6da3a9f39 100644
--- a/nuttx/drivers/input/Kconfig
+++ b/nuttx/drivers/input/Kconfig
@@ -123,6 +123,25 @@ config STMPE811_I2C
 
 endchoice
 
+config STMPE811_ACTIVELOW
+	bool "Active Low Interrupt"
+	default n
+	---help---
+		The STMPE811 interrupt is provided by a discrete input (usually a
+		GPIO interrupt on most MCU architectures).  This setting determines
+		whether the interrupt is active high (or rising edge triggered) or
+		active low (or falling edge triggered).  Default:  Active
+		high/rising edge.
+
+config STMPE811_EDGE
+	bool "Edge triggered Interrupt"
+	default n
+	---help---
+		The STMPE811 interrupt is provided by a discrete input (usually a
+		GPIO interrupt on most MCU architectures).  This setting determines
+		whether the interrupt is edge or level triggered.  Default: Level
+		triggered.
+
 config STMPE811_MULTIPLE
 	bool "Multiple STMPE811 Devices"
 	default n
diff --git a/nuttx/graphics/Makefile b/nuttx/graphics/Makefile
index 238e14df4..aa402bfa4 100644
--- a/nuttx/graphics/Makefile
+++ b/nuttx/graphics/Makefile
@@ -124,6 +124,9 @@ gen32bppsources:
 	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_BITSPERPIXEL=32 EXTRADEFINES=$(EXTRADEFINES)
 
 genfontsources:
+ifeq ($(CONFIG_NXFONT_MONO5X8),y)
+	@$(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=18 EXTRADEFINES=$(EXTRADEFINES)
+endif
 ifeq ($(CONFIG_NXFONT_SANS23X27),y)
 	$(Q) $(MAKE) -C nxfonts -f Makefile.sources TOPDIR=$(TOPDIR) NXFONTS_FONTID=1 EXTRADEFINES=$(EXTRADEFINES)
 endif
diff --git a/nuttx/graphics/nxfonts/Make.defs b/nuttx/graphics/nxfonts/Make.defs
index bc65d7ad7..def092825 100644
--- a/nuttx/graphics/nxfonts/Make.defs
+++ b/nuttx/graphics/nxfonts/Make.defs
@@ -42,6 +42,12 @@ NXFCONV_CSRCS	= nxfonts_convert_1bpp.c nxfonts_convert_2bpp.c \
 NXFSET_ASRCS	=
 NXFSET_CSRCS	=
 
+# Monospace fonts
+
+ifeq ($(CONFIG_NXFONT_MONO5X8),y)
+NXFSET_CSRCS    += nxfonts_bitmaps_mono5x8.c
+endif
+
 # Sans serif fonts
 
 ifeq ($(CONFIG_NXFONT_SANS17X22),y)
diff --git a/nuttx/graphics/nxfonts/Makefile.sources b/nuttx/graphics/nxfonts/Makefile.sources
index 76a099dcb..2e41fc704 100644
--- a/nuttx/graphics/nxfonts/Makefile.sources
+++ b/nuttx/graphics/nxfonts/Makefile.sources
@@ -72,6 +72,13 @@ endif
 
 ifdef NXFONTS_FONTID
 
+# MONO
+
+ifeq ($(NXFONTS_FONTID),18)
+NXFONTS_PREFIX	:= g_mono5x8_
+GEN_CSRC	= nxfonts_bitmaps_mono5x8.c
+endif
+
 # SANS
 
 ifeq ($(NXFONTS_FONTID),14)
diff --git a/nuttx/graphics/nxfonts/nxfonts_bitmaps.c b/nuttx/graphics/nxfonts/nxfonts_bitmaps.c
index 2efc34b87..b089ec038 100644
--- a/nuttx/graphics/nxfonts/nxfonts_bitmaps.c
+++ b/nuttx/graphics/nxfonts/nxfonts_bitmaps.c
@@ -80,6 +80,8 @@
 #  include "nxfonts_sans17x23b.h"
 #elif NXFONTS_FONTID == 17
 #  include "nxfonts_sans20x27b.h"
+#elif NXFONTS_FONTID == 18
+#  include "nxfonts_mono5x8.h"
 #else
 #  error "No font ID specified"
 #endif
diff --git a/nuttx/graphics/nxfonts/nxfonts_getfont.c b/nuttx/graphics/nxfonts/nxfonts_getfont.c
index 23e5c4474..c2af977f2 100644
--- a/nuttx/graphics/nxfonts/nxfonts_getfont.c
+++ b/nuttx/graphics/nxfonts/nxfonts_getfont.c
@@ -60,6 +60,12 @@
  * Private Data
  ****************************************************************************/
 
+/* MONO */
+
+#ifdef CONFIG_NXFONT_MONO5X8
+extern const struct nx_fontpackage_s g_mono5x8_package;
+#endif
+
 /* SANS */
 
 #ifdef CONFIG_NXFONT_SANS17X22
@@ -139,6 +145,12 @@ extern const struct nx_fontpackage_s g_serif38x49b_package;
 static FAR const struct nx_fontpackage_s *g_fontpackages[] =
 {
 
+/* MONO */
+
+#ifdef CONFIG_NXFONT_MONO5X8
+  &g_mono5x8_package,
+#endif
+  
 /* SANS */
 
 #ifdef CONFIG_NXFONT_SANS17X22
diff --git a/nuttx/graphics/nxfonts/nxfonts_mono5x8.h b/nuttx/graphics/nxfonts/nxfonts_mono5x8.h
new file mode 100644
index 000000000..739437e62
--- /dev/null
+++ b/nuttx/graphics/nxfonts/nxfonts_mono5x8.h
@@ -0,0 +1,815 @@
+/****************************************************************************
+ * graphics/nxfonts/nxfonts_mono5x8.h
+ *
+ *   Copyright (C) 2011-2012 NX Engineering, S.A., All rights reserved.
+ *   Author: Petteri Aimonen <jpa@nx.mail.kapsi.fi>
+ * 
+ * Based on 5x8.pcf.gz from xfonts-base. The file is marked as
+ * COPYRIGHT "Public domain font.  Share and enjoy."
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT}
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING}
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __GRAPHICS_NXFONTS_NXFONTS_MONO5X8_H
+#define __GRAPHICS_NXFONTS_NXFONTS_MONO5X8_H
+
+#define NXFONT_ID         FONTID_MONO5X8
+
+#define NXFONT_MIN7BIT 33
+#define NXFONT_MAX7BIT 126
+
+#define NXFONT_MIN8BIT 161
+#define NXFONT_MAX8BIT 255
+
+/* Maximum height and width of any glyph in the set */
+
+#define NXFONT_MAXHEIGHT  8
+#define NXFONT_MAXWIDTH   5
+
+/* The width of a space */
+
+#define NXFONT_SPACEWIDTH 5
+
+/* exclam (33) */
+#define NXFONT_METRICS_33 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_33 {0x0, 0x20, 0x20, 0x20, 0x20, 0x0, 0x20, 0x0}
+
+/* quotedbl (34) */
+#define NXFONT_METRICS_34 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_34 {0x0, 0x50, 0x50, 0x50, 0x0, 0x0, 0x0, 0x0}
+
+/* numbersign (35) */
+#define NXFONT_METRICS_35 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_35 {0x50, 0x50, 0xf8, 0x50, 0xf8, 0x50, 0x50, 0x0}
+
+/* dollar (36) */
+#define NXFONT_METRICS_36 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_36 {0x20, 0x70, 0xa0, 0x70, 0x28, 0x70, 0x20, 0x0}
+
+/* percent (37) */
+#define NXFONT_METRICS_37 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_37 {0x0, 0x40, 0x50, 0x20, 0x50, 0x10, 0x0, 0x0}
+
+/* ampersand (38) */
+#define NXFONT_METRICS_38 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_38 {0x40, 0xa0, 0xa0, 0x40, 0xa0, 0xa0, 0x50, 0x0}
+
+/* quotesingle (39) */
+#define NXFONT_METRICS_39 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_39 {0x0, 0x20, 0x20, 0x20, 0x0, 0x0, 0x0, 0x0}
+
+/* parenleft (40) */
+#define NXFONT_METRICS_40 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_40 {0x0, 0x20, 0x40, 0x40, 0x40, 0x40, 0x20, 0x0}
+
+/* parenright (41) */
+#define NXFONT_METRICS_41 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_41 {0x0, 0x40, 0x20, 0x20, 0x20, 0x20, 0x40, 0x0}
+
+/* asterisk (42) */
+#define NXFONT_METRICS_42 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_42 {0x0, 0x0, 0x90, 0x60, 0xf0, 0x60, 0x90, 0x0}
+
+/* plus (43) */
+#define NXFONT_METRICS_43 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_43 {0x0, 0x0, 0x20, 0x20, 0xf8, 0x20, 0x20, 0x0}
+
+/* comma (44) */
+#define NXFONT_METRICS_44 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_44 {0x0, 0x0, 0x0, 0x0, 0x0, 0x30, 0x20, 0x40}
+
+/* hyphen (45) */
+#define NXFONT_METRICS_45 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_45 {0x0, 0x0, 0x0, 0x0, 0xf0, 0x0, 0x0, 0x0}
+
+/* period (46) */
+#define NXFONT_METRICS_46 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_46 {0x0, 0x0, 0x0, 0x0, 0x0, 0x20, 0x70, 0x20}
+
+/* slash (47) */
+#define NXFONT_METRICS_47 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_47 {0x0, 0x10, 0x10, 0x20, 0x40, 0x80, 0x80, 0x0}
+
+/* zero (48) */
+#define NXFONT_METRICS_48 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_48 {0x0, 0x20, 0x50, 0x50, 0x50, 0x50, 0x20, 0x0}
+
+/* one (49) */
+#define NXFONT_METRICS_49 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_49 {0x0, 0x20, 0x60, 0x20, 0x20, 0x20, 0x70, 0x0}
+
+/* two (50) */
+#define NXFONT_METRICS_50 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_50 {0x0, 0x60, 0x90, 0x10, 0x60, 0x80, 0xf0, 0x0}
+
+/* three (51) */
+#define NXFONT_METRICS_51 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_51 {0x0, 0xf0, 0x20, 0x60, 0x10, 0x90, 0x60, 0x0}
+
+/* four (52) */
+#define NXFONT_METRICS_52 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_52 {0x0, 0x20, 0x60, 0xa0, 0xf0, 0x20, 0x20, 0x0}
+
+/* five (53) */
+#define NXFONT_METRICS_53 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_53 {0x0, 0xf0, 0x80, 0xe0, 0x10, 0x90, 0x60, 0x0}
+
+/* six (54) */
+#define NXFONT_METRICS_54 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_54 {0x0, 0x60, 0x80, 0xe0, 0x90, 0x90, 0x60, 0x0}
+
+/* seven (55) */
+#define NXFONT_METRICS_55 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_55 {0x0, 0xf0, 0x10, 0x20, 0x20, 0x40, 0x40, 0x0}
+
+/* eight (56) */
+#define NXFONT_METRICS_56 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_56 {0x0, 0x60, 0x90, 0x60, 0x90, 0x90, 0x60, 0x0}
+
+/* nine (57) */
+#define NXFONT_METRICS_57 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_57 {0x0, 0x60, 0x90, 0x90, 0x70, 0x10, 0x60, 0x0}
+
+/* colon (58) */
+#define NXFONT_METRICS_58 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_58 {0x0, 0x0, 0x60, 0x60, 0x0, 0x60, 0x60, 0x0}
+
+/* semicolon (59) */
+#define NXFONT_METRICS_59 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_59 {0x0, 0x0, 0x30, 0x30, 0x0, 0x30, 0x20, 0x40}
+
+/* less (60) */
+#define NXFONT_METRICS_60 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_60 {0x0, 0x10, 0x20, 0x40, 0x40, 0x20, 0x10, 0x0}
+
+/* equal (61) */
+#define NXFONT_METRICS_61 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_61 {0x0, 0x0, 0x0, 0xf0, 0x0, 0xf0, 0x0, 0x0}
+
+/* greater (62) */
+#define NXFONT_METRICS_62 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_62 {0x0, 0x40, 0x20, 0x10, 0x10, 0x20, 0x40, 0x0}
+
+/* question (63) */
+#define NXFONT_METRICS_63 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_63 {0x0, 0x20, 0x50, 0x10, 0x20, 0x0, 0x20, 0x0}
+
+/* at (64) */
+#define NXFONT_METRICS_64 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_64 {0x30, 0x48, 0x98, 0xa8, 0xa8, 0x90, 0x40, 0x30}
+
+/* A (65) */
+#define NXFONT_METRICS_65 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_65 {0x0, 0x60, 0x90, 0x90, 0xf0, 0x90, 0x90, 0x0}
+
+/* B (66) */
+#define NXFONT_METRICS_66 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_66 {0x0, 0xe0, 0x90, 0xe0, 0x90, 0x90, 0xe0, 0x0}
+
+/* C (67) */
+#define NXFONT_METRICS_67 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_67 {0x0, 0x60, 0x90, 0x80, 0x80, 0x90, 0x60, 0x0}
+
+/* D (68) */
+#define NXFONT_METRICS_68 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_68 {0x0, 0xe0, 0x90, 0x90, 0x90, 0x90, 0xe0, 0x0}
+
+/* E (69) */
+#define NXFONT_METRICS_69 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_69 {0x0, 0xf0, 0x80, 0xe0, 0x80, 0x80, 0xf0, 0x0}
+
+/* F (70) */
+#define NXFONT_METRICS_70 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_70 {0x0, 0xf0, 0x80, 0xe0, 0x80, 0x80, 0x80, 0x0}
+
+/* G (71) */
+#define NXFONT_METRICS_71 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_71 {0x0, 0x60, 0x90, 0x80, 0xb0, 0x90, 0x60, 0x0}
+
+/* H (72) */
+#define NXFONT_METRICS_72 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_72 {0x0, 0x90, 0x90, 0xf0, 0x90, 0x90, 0x90, 0x0}
+
+/* I (73) */
+#define NXFONT_METRICS_73 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_73 {0x0, 0x70, 0x20, 0x20, 0x20, 0x20, 0x70, 0x0}
+
+/* J (74) */
+#define NXFONT_METRICS_74 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_74 {0x0, 0x70, 0x20, 0x20, 0x20, 0xa0, 0x40, 0x0}
+
+/* K (75) */
+#define NXFONT_METRICS_75 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_75 {0x0, 0x90, 0xa0, 0xc0, 0xa0, 0xa0, 0x90, 0x0}
+
+/* L (76) */
+#define NXFONT_METRICS_76 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_76 {0x0, 0x80, 0x80, 0x80, 0x80, 0x80, 0xf0, 0x0}
+
+/* M (77) */
+#define NXFONT_METRICS_77 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_77 {0x0, 0x90, 0xf0, 0xf0, 0x90, 0x90, 0x90, 0x0}
+
+/* N (78) */
+#define NXFONT_METRICS_78 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_78 {0x0, 0x90, 0xd0, 0xf0, 0xb0, 0xb0, 0x90, 0x0}
+
+/* O (79) */
+#define NXFONT_METRICS_79 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_79 {0x0, 0x60, 0x90, 0x90, 0x90, 0x90, 0x60, 0x0}
+
+/* P (80) */
+#define NXFONT_METRICS_80 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_80 {0x0, 0xe0, 0x90, 0x90, 0xe0, 0x80, 0x80, 0x0}
+
+/* Q (81) */
+#define NXFONT_METRICS_81 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_81 {0x0, 0x60, 0x90, 0x90, 0xd0, 0xb0, 0x60, 0x10}
+
+/* R (82) */
+#define NXFONT_METRICS_82 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_82 {0x0, 0xe0, 0x90, 0x90, 0xe0, 0x90, 0x90, 0x0}
+
+/* S (83) */
+#define NXFONT_METRICS_83 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_83 {0x0, 0x60, 0x90, 0x40, 0x20, 0x90, 0x60, 0x0}
+
+/* T (84) */
+#define NXFONT_METRICS_84 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_84 {0x0, 0x70, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0}
+
+/* U (85) */
+#define NXFONT_METRICS_85 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_85 {0x0, 0x90, 0x90, 0x90, 0x90, 0x90, 0x60, 0x0}
+
+/* V (86) */
+#define NXFONT_METRICS_86 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_86 {0x0, 0x90, 0x90, 0x90, 0x90, 0x60, 0x60, 0x0}
+
+/* W (87) */
+#define NXFONT_METRICS_87 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_87 {0x0, 0x90, 0x90, 0x90, 0xf0, 0xf0, 0x90, 0x0}
+
+/* X (88) */
+#define NXFONT_METRICS_88 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_88 {0x0, 0x90, 0x90, 0x60, 0x60, 0x90, 0x90, 0x0}
+
+/* Y (89) */
+#define NXFONT_METRICS_89 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_89 {0x0, 0x88, 0x88, 0x50, 0x20, 0x20, 0x20, 0x0}
+
+/* Z (90) */
+#define NXFONT_METRICS_90 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_90 {0x0, 0xf0, 0x10, 0x20, 0x40, 0x80, 0xf0, 0x0}
+
+/* bracketleft (91) */
+#define NXFONT_METRICS_91 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_91 {0x0, 0x70, 0x40, 0x40, 0x40, 0x40, 0x70, 0x0}
+
+/* backslash (92) */
+#define NXFONT_METRICS_92 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_92 {0x0, 0x80, 0x80, 0x40, 0x20, 0x10, 0x10, 0x0}
+
+/* bracketright (93) */
+#define NXFONT_METRICS_93 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_93 {0x0, 0x70, 0x10, 0x10, 0x10, 0x10, 0x70, 0x0}
+
+/* asciicircum (94) */
+#define NXFONT_METRICS_94 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_94 {0x0, 0x20, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0}
+
+/* underscore (95) */
+#define NXFONT_METRICS_95 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_95 {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xf0}
+
+/* grave (96) */
+#define NXFONT_METRICS_96 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_96 {0x0, 0x40, 0x20, 0x0, 0x0, 0x0, 0x0, 0x0}
+
+/* a (97) */
+#define NXFONT_METRICS_97 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_97 {0x0, 0x0, 0x0, 0x70, 0x90, 0x90, 0x70, 0x0}
+
+/* b (98) */
+#define NXFONT_METRICS_98 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_98 {0x0, 0x80, 0x80, 0xe0, 0x90, 0x90, 0xe0, 0x0}
+
+/* c (99) */
+#define NXFONT_METRICS_99 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_99 {0x0, 0x0, 0x0, 0x30, 0x40, 0x40, 0x30, 0x0}
+
+/* d (100) */
+#define NXFONT_METRICS_100 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_100 {0x0, 0x10, 0x10, 0x70, 0x90, 0x90, 0x70, 0x0}
+
+/* e (101) */
+#define NXFONT_METRICS_101 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_101 {0x0, 0x0, 0x0, 0x60, 0xb0, 0xc0, 0x60, 0x0}
+
+/* f (102) */
+#define NXFONT_METRICS_102 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_102 {0x0, 0x20, 0x50, 0x40, 0xe0, 0x40, 0x40, 0x0}
+
+/* g (103) */
+#define NXFONT_METRICS_103 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_103 {0x0, 0x0, 0x0, 0x60, 0x90, 0x70, 0x10, 0x60}
+
+/* h (104) */
+#define NXFONT_METRICS_104 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_104 {0x0, 0x80, 0x80, 0xe0, 0x90, 0x90, 0x90, 0x0}
+
+/* i (105) */
+#define NXFONT_METRICS_105 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_105 {0x0, 0x20, 0x0, 0x60, 0x20, 0x20, 0x70, 0x0}
+
+/* j (106) */
+#define NXFONT_METRICS_106 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_106 {0x0, 0x10, 0x0, 0x10, 0x10, 0x10, 0x50, 0x20}
+
+/* k (107) */
+#define NXFONT_METRICS_107 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_107 {0x0, 0x80, 0x80, 0x90, 0xe0, 0x90, 0x90, 0x0}
+
+/* l (108) */
+#define NXFONT_METRICS_108 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_108 {0x0, 0x60, 0x20, 0x20, 0x20, 0x20, 0x70, 0x0}
+
+/* m (109) */
+#define NXFONT_METRICS_109 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_109 {0x0, 0x0, 0x0, 0xd0, 0xa8, 0xa8, 0xa8, 0x0}
+
+/* n (110) */
+#define NXFONT_METRICS_110 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_110 {0x0, 0x0, 0x0, 0xe0, 0x90, 0x90, 0x90, 0x0}
+
+/* o (111) */
+#define NXFONT_METRICS_111 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_111 {0x0, 0x0, 0x0, 0x60, 0x90, 0x90, 0x60, 0x0}
+
+/* p (112) */
+#define NXFONT_METRICS_112 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_112 {0x0, 0x0, 0x0, 0xe0, 0x90, 0xe0, 0x80, 0x80}
+
+/* q (113) */
+#define NXFONT_METRICS_113 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_113 {0x0, 0x0, 0x0, 0x70, 0x90, 0x70, 0x10, 0x10}
+
+/* r (114) */
+#define NXFONT_METRICS_114 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_114 {0x0, 0x0, 0x0, 0xa0, 0xd0, 0x80, 0x80, 0x0}
+
+/* s (115) */
+#define NXFONT_METRICS_115 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_115 {0x0, 0x0, 0x0, 0x30, 0x60, 0x10, 0x60, 0x0}
+
+/* t (116) */
+#define NXFONT_METRICS_116 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_116 {0x0, 0x40, 0x40, 0xe0, 0x40, 0x50, 0x20, 0x0}
+
+/* u (117) */
+#define NXFONT_METRICS_117 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_117 {0x0, 0x0, 0x0, 0x90, 0x90, 0x90, 0x70, 0x0}
+
+/* v (118) */
+#define NXFONT_METRICS_118 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_118 {0x0, 0x0, 0x0, 0x50, 0x50, 0x50, 0x20, 0x0}
+
+/* w (119) */
+#define NXFONT_METRICS_119 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_119 {0x0, 0x0, 0x0, 0x88, 0xa8, 0xa8, 0x50, 0x0}
+
+/* x (120) */
+#define NXFONT_METRICS_120 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_120 {0x0, 0x0, 0x0, 0x90, 0x60, 0x60, 0x90, 0x0}
+
+/* y (121) */
+#define NXFONT_METRICS_121 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_121 {0x0, 0x0, 0x0, 0x90, 0x90, 0x70, 0x90, 0x60}
+
+/* z (122) */
+#define NXFONT_METRICS_122 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_122 {0x0, 0x0, 0x0, 0xf0, 0x20, 0x40, 0xf0, 0x0}
+
+/* braceleft (123) */
+#define NXFONT_METRICS_123 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_123 {0x30, 0x40, 0x20, 0xc0, 0x20, 0x40, 0x30, 0x0}
+
+/* bar (124) */
+#define NXFONT_METRICS_124 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_124 {0x0, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x0}
+
+/* braceright (125) */
+#define NXFONT_METRICS_125 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_125 {0xc0, 0x20, 0x40, 0x30, 0x40, 0x20, 0xc0, 0x0}
+
+/* asciitilde (126) */
+#define NXFONT_METRICS_126 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_126 {0x0, 0x50, 0xa0, 0x0, 0x0, 0x0, 0x0, 0x0}
+
+/* exclamdown (161) */
+#define NXFONT_METRICS_161 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_161 {0x0, 0x20, 0x0, 0x20, 0x20, 0x20, 0x20, 0x0}
+
+/* cent (162) */
+#define NXFONT_METRICS_162 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_162 {0x0, 0x0, 0x20, 0x70, 0xa0, 0xa0, 0x70, 0x20}
+
+/* sterling (163) */
+#define NXFONT_METRICS_163 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_163 {0x0, 0x20, 0x50, 0xe0, 0x40, 0x50, 0xa0, 0x0}
+
+/* currency (164) */
+#define NXFONT_METRICS_164 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_164 {0x0, 0x0, 0x88, 0x70, 0x50, 0x70, 0x88, 0x0}
+
+/* yen (165) */
+#define NXFONT_METRICS_165 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_165 {0x0, 0x88, 0x50, 0xf8, 0x20, 0xf8, 0x20, 0x0}
+
+/* brokenbar (166) */
+#define NXFONT_METRICS_166 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_166 {0x20, 0x20, 0x20, 0x0, 0x20, 0x20, 0x20, 0x0}
+
+/* section (167) */
+#define NXFONT_METRICS_167 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_167 {0x70, 0x80, 0xe0, 0x90, 0x70, 0x10, 0xe0, 0x0}
+
+/* dieresis (168) */
+#define NXFONT_METRICS_168 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_168 {0x0, 0x50, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}
+
+/* copyright (169) */
+#define NXFONT_METRICS_169 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_169 {0x0, 0x70, 0xa8, 0xc8, 0xc8, 0xa8, 0x70, 0x0}
+
+/* ordfeminine (170) */
+#define NXFONT_METRICS_170 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_170 {0x30, 0x50, 0x30, 0x0, 0x70, 0x0, 0x0, 0x0}
+
+/* guillemotleft (171) */
+#define NXFONT_METRICS_171 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_171 {0x0, 0x0, 0x0, 0x50, 0xa0, 0x50, 0x0, 0x0}
+
+/* logicalnot (172) */
+#define NXFONT_METRICS_172 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_172 {0x0, 0x0, 0x0, 0x0, 0x70, 0x10, 0x10, 0x0}
+
+/* hyphen (173) */
+#define NXFONT_METRICS_173 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_173 {0x0, 0x0, 0x0, 0x0, 0x70, 0x0, 0x0, 0x0}
+
+/* registered (174) */
+#define NXFONT_METRICS_174 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_174 {0x0, 0x70, 0xe8, 0xd8, 0xe8, 0xd8, 0x70, 0x0}
+
+/* macron (175) */
+#define NXFONT_METRICS_175 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_175 {0x0, 0x70, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0}
+
+/* degree (176) */
+#define NXFONT_METRICS_176 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_176 {0x0, 0x20, 0x50, 0x20, 0x0, 0x0, 0x0, 0x0}
+
+/* plusminus (177) */
+#define NXFONT_METRICS_177 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_177 {0x0, 0x0, 0x20, 0x70, 0x20, 0x0, 0x70, 0x0}
+
+/* twosuperior (178) */
+#define NXFONT_METRICS_178 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_178 {0x20, 0x50, 0x10, 0x20, 0x70, 0x0, 0x0, 0x0}
+
+/* threesuperior (179) */
+#define NXFONT_METRICS_179 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_179 {0x60, 0x10, 0x60, 0x10, 0x60, 0x0, 0x0, 0x0}
+
+/* acute (180) */
+#define NXFONT_METRICS_180 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_180 {0x0, 0x20, 0x40, 0x0, 0x0, 0x0, 0x0, 0x0}
+
+/* mu (181) */
+#define NXFONT_METRICS_181 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_181 {0x0, 0x0, 0x0, 0x90, 0x90, 0x90, 0xe0, 0x80}
+
+/* paragraph (182) */
+#define NXFONT_METRICS_182 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_182 {0x0, 0x78, 0xe8, 0xe8, 0x68, 0x28, 0x28, 0x0}
+
+/* periodcentered (183) */
+#define NXFONT_METRICS_183 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_183 {0x0, 0x0, 0x0, 0x0, 0x20, 0x0, 0x0, 0x0}
+
+/* cedilla (184) */
+#define NXFONT_METRICS_184 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_184 {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x20, 0x40}
+
+/* onesuperior (185) */
+#define NXFONT_METRICS_185 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_185 {0x20, 0x60, 0x20, 0x20, 0x70, 0x0, 0x0, 0x0}
+
+/* ordmasculine (186) */
+#define NXFONT_METRICS_186 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_186 {0x20, 0x50, 0x20, 0x0, 0x70, 0x0, 0x0, 0x0}
+
+/* guillemotright (187) */
+#define NXFONT_METRICS_187 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_187 {0x0, 0x0, 0x0, 0xa0, 0x50, 0xa0, 0x0, 0x0}
+
+/* onequarter (188) */
+#define NXFONT_METRICS_188 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_188 {0x80, 0x80, 0x80, 0xa0, 0x60, 0xf0, 0x20, 0x0}
+
+/* onehalf (189) */
+#define NXFONT_METRICS_189 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_189 {0x80, 0x80, 0xa0, 0xd0, 0x10, 0x20, 0x70, 0x0}
+
+/* threequarters (190) */
+#define NXFONT_METRICS_190 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_190 {0x80, 0x40, 0x80, 0x60, 0xa0, 0xf0, 0x20, 0x0}
+
+/* questiondown (191) */
+#define NXFONT_METRICS_191 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_191 {0x0, 0x20, 0x0, 0x20, 0x40, 0x50, 0x20, 0x0}
+
+/* Agrave (192) */
+#define NXFONT_METRICS_192 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_192 {0x40, 0x20, 0x60, 0x90, 0xf0, 0x90, 0x90, 0x0}
+
+/* Aacute (193) */
+#define NXFONT_METRICS_193 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_193 {0x20, 0x40, 0x60, 0x90, 0xf0, 0x90, 0x90, 0x0}
+
+/* Acircumflex (194) */
+#define NXFONT_METRICS_194 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_194 {0x60, 0x90, 0x60, 0x90, 0xf0, 0x90, 0x90, 0x0}
+
+/* Atilde (195) */
+#define NXFONT_METRICS_195 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_195 {0x50, 0xa0, 0x60, 0x90, 0xf0, 0x90, 0x90, 0x0}
+
+/* Adieresis (196) */
+#define NXFONT_METRICS_196 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_196 {0x90, 0x0, 0x60, 0x90, 0xf0, 0x90, 0x90, 0x0}
+
+/* Aring (197) */
+#define NXFONT_METRICS_197 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_197 {0x60, 0x90, 0x60, 0x90, 0xf0, 0x90, 0x90, 0x0}
+
+/* AE (198) */
+#define NXFONT_METRICS_198 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_198 {0x0, 0x70, 0xa0, 0xa0, 0xf0, 0xa0, 0xb0, 0x0}
+
+/* Ccedilla (199) */
+#define NXFONT_METRICS_199 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_199 {0x0, 0x60, 0x90, 0x80, 0x80, 0x90, 0x60, 0x40}
+
+/* Egrave (200) */
+#define NXFONT_METRICS_200 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_200 {0x40, 0x20, 0xf0, 0x80, 0xe0, 0x80, 0xf0, 0x0}
+
+/* Eacute (201) */
+#define NXFONT_METRICS_201 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_201 {0x20, 0x40, 0xf0, 0x80, 0xe0, 0x80, 0xf0, 0x0}
+
+/* Ecircumflex (202) */
+#define NXFONT_METRICS_202 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_202 {0x60, 0x90, 0xf0, 0x80, 0xe0, 0x80, 0xf0, 0x0}
+
+/* Edieresis (203) */
+#define NXFONT_METRICS_203 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_203 {0x90, 0x0, 0xf0, 0x80, 0xe0, 0x80, 0xf0, 0x0}
+
+/* Igrave (204) */
+#define NXFONT_METRICS_204 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_204 {0x40, 0x20, 0x70, 0x20, 0x20, 0x20, 0x70, 0x0}
+
+/* Iacute (205) */
+#define NXFONT_METRICS_205 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_205 {0x10, 0x20, 0x70, 0x20, 0x20, 0x20, 0x70, 0x0}
+
+/* Icircumflex (206) */
+#define NXFONT_METRICS_206 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_206 {0x20, 0x50, 0x70, 0x20, 0x20, 0x20, 0x70, 0x0}
+
+/* Idieresis (207) */
+#define NXFONT_METRICS_207 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_207 {0x50, 0x0, 0x70, 0x20, 0x20, 0x20, 0x70, 0x0}
+
+/* Eth (208) */
+#define NXFONT_METRICS_208 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_208 {0x0, 0x70, 0x48, 0xe8, 0x48, 0x48, 0x70, 0x0}
+
+/* Ntilde (209) */
+#define NXFONT_METRICS_209 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_209 {0x50, 0xa0, 0x90, 0xd0, 0xb0, 0x90, 0x90, 0x0}
+
+/* Ograve (210) */
+#define NXFONT_METRICS_210 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_210 {0x40, 0x20, 0x60, 0x90, 0x90, 0x90, 0x60, 0x0}
+
+/* Oacute (211) */
+#define NXFONT_METRICS_211 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_211 {0x20, 0x40, 0x60, 0x90, 0x90, 0x90, 0x60, 0x0}
+
+/* Ocircumflex (212) */
+#define NXFONT_METRICS_212 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_212 {0x60, 0x90, 0x60, 0x90, 0x90, 0x90, 0x60, 0x0}
+
+/* Otilde (213) */
+#define NXFONT_METRICS_213 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_213 {0x50, 0xa0, 0x60, 0x90, 0x90, 0x90, 0x60, 0x0}
+
+/* Odieresis (214) */
+#define NXFONT_METRICS_214 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_214 {0x90, 0x0, 0x60, 0x90, 0x90, 0x90, 0x60, 0x0}
+
+/* multiply (215) */
+#define NXFONT_METRICS_215 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_215 {0x0, 0x0, 0x0, 0x0, 0x50, 0x20, 0x50, 0x0}
+
+/* Oslash (216) */
+#define NXFONT_METRICS_216 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_216 {0x0, 0x70, 0xb0, 0xb0, 0xd0, 0xd0, 0xe0, 0x0}
+
+/* Ugrave (217) */
+#define NXFONT_METRICS_217 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_217 {0x40, 0x20, 0x90, 0x90, 0x90, 0x90, 0x60, 0x0}
+
+/* Uacute (218) */
+#define NXFONT_METRICS_218 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_218 {0x20, 0x40, 0x90, 0x90, 0x90, 0x90, 0x60, 0x0}
+
+/* Ucircumflex (219) */
+#define NXFONT_METRICS_219 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_219 {0x60, 0x90, 0x90, 0x90, 0x90, 0x90, 0x60, 0x0}
+
+/* Udieresis (220) */
+#define NXFONT_METRICS_220 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_220 {0x90, 0x0, 0x90, 0x90, 0x90, 0x90, 0x60, 0x0}
+
+/* Yacute (221) */
+#define NXFONT_METRICS_221 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_221 {0x10, 0x20, 0x88, 0x50, 0x20, 0x20, 0x20, 0x0}
+
+/* Thorn (222) */
+#define NXFONT_METRICS_222 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_222 {0x0, 0x80, 0xe0, 0x90, 0x90, 0xe0, 0x80, 0x0}
+
+/* germandbls (223) */
+#define NXFONT_METRICS_223 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_223 {0x0, 0x60, 0x90, 0xa0, 0xa0, 0x90, 0xa0, 0x0}
+
+/* agrave (224) */
+#define NXFONT_METRICS_224 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_224 {0x40, 0x20, 0x0, 0x70, 0x90, 0x90, 0x70, 0x0}
+
+/* aacute (225) */
+#define NXFONT_METRICS_225 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_225 {0x20, 0x40, 0x0, 0x70, 0x90, 0x90, 0x70, 0x0}
+
+/* acircumflex (226) */
+#define NXFONT_METRICS_226 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_226 {0x20, 0x50, 0x0, 0x70, 0x90, 0x90, 0x70, 0x0}
+
+/* atilde (227) */
+#define NXFONT_METRICS_227 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_227 {0x50, 0xa0, 0x0, 0x70, 0x90, 0x90, 0x70, 0x0}
+
+/* adieresis (228) */
+#define NXFONT_METRICS_228 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_228 {0x0, 0x50, 0x0, 0x70, 0x90, 0x90, 0x70, 0x0}
+
+/* aring (229) */
+#define NXFONT_METRICS_229 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_229 {0x60, 0x90, 0x60, 0x70, 0x90, 0x90, 0x70, 0x0}
+
+/* ae (230) */
+#define NXFONT_METRICS_230 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_230 {0x0, 0x0, 0x0, 0xf0, 0x68, 0xb0, 0x78, 0x0}
+
+/* ccedilla (231) */
+#define NXFONT_METRICS_231 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_231 {0x0, 0x0, 0x0, 0x30, 0x40, 0x40, 0x30, 0x20}
+
+/* egrave (232) */
+#define NXFONT_METRICS_232 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_232 {0x40, 0x20, 0x0, 0x60, 0xb0, 0xc0, 0x60, 0x0}
+
+/* eacute (233) */
+#define NXFONT_METRICS_233 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_233 {0x20, 0x40, 0x0, 0x60, 0xb0, 0xc0, 0x60, 0x0}
+
+/* ecircumflex (234) */
+#define NXFONT_METRICS_234 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_234 {0x60, 0x90, 0x0, 0x60, 0xb0, 0xc0, 0x60, 0x0}
+
+/* edieresis (235) */
+#define NXFONT_METRICS_235 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_235 {0x0, 0x50, 0x0, 0x60, 0xb0, 0xc0, 0x60, 0x0}
+
+/* igrave (236) */
+#define NXFONT_METRICS_236 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_236 {0x40, 0x20, 0x0, 0x60, 0x20, 0x20, 0x70, 0x0}
+
+/* iacute (237) */
+#define NXFONT_METRICS_237 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_237 {0x10, 0x20, 0x0, 0x60, 0x20, 0x20, 0x70, 0x0}
+
+/* icircumflex (238) */
+#define NXFONT_METRICS_238 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_238 {0x20, 0x50, 0x0, 0x60, 0x20, 0x20, 0x70, 0x0}
+
+/* idieresis (239) */
+#define NXFONT_METRICS_239 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_239 {0x0, 0x50, 0x0, 0x60, 0x20, 0x20, 0x70, 0x0}
+
+/* eth (240) */
+#define NXFONT_METRICS_240 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_240 {0xa0, 0x40, 0xa0, 0x10, 0x70, 0x90, 0x60, 0x0}
+
+/* ntilde (241) */
+#define NXFONT_METRICS_241 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_241 {0x50, 0xa0, 0x0, 0xe0, 0x90, 0x90, 0x90, 0x0}
+
+/* ograve (242) */
+#define NXFONT_METRICS_242 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_242 {0x40, 0x20, 0x0, 0x60, 0x90, 0x90, 0x60, 0x0}
+
+/* oacute (243) */
+#define NXFONT_METRICS_243 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_243 {0x20, 0x40, 0x0, 0x60, 0x90, 0x90, 0x60, 0x0}
+
+/* ocircumflex (244) */
+#define NXFONT_METRICS_244 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_244 {0x60, 0x90, 0x0, 0x60, 0x90, 0x90, 0x60, 0x0}
+
+/* otilde (245) */
+#define NXFONT_METRICS_245 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_245 {0x50, 0xa0, 0x0, 0x60, 0x90, 0x90, 0x60, 0x0}
+
+/* odieresis (246) */
+#define NXFONT_METRICS_246 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_246 {0x0, 0x90, 0x0, 0x60, 0x90, 0x90, 0x60, 0x0}
+
+/* divide (247) */
+#define NXFONT_METRICS_247 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_247 {0x0, 0x0, 0x20, 0x0, 0x70, 0x0, 0x20, 0x0}
+
+/* oslash (248) */
+#define NXFONT_METRICS_248 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_248 {0x0, 0x0, 0x0, 0x70, 0xb0, 0xd0, 0xe0, 0x0}
+
+/* ugrave (249) */
+#define NXFONT_METRICS_249 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_249 {0x40, 0x20, 0x0, 0x90, 0x90, 0x90, 0x70, 0x0}
+
+/* uacute (250) */
+#define NXFONT_METRICS_250 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_250 {0x20, 0x40, 0x0, 0x90, 0x90, 0x90, 0x70, 0x0}
+
+/* ucircumflex (251) */
+#define NXFONT_METRICS_251 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_251 {0x60, 0x90, 0x0, 0x90, 0x90, 0x90, 0x70, 0x0}
+
+/* udieresis (252) */
+#define NXFONT_METRICS_252 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_252 {0x0, 0x90, 0x0, 0x90, 0x90, 0x90, 0x70, 0x0}
+
+/* yacute (253) */
+#define NXFONT_METRICS_253 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_253 {0x20, 0x40, 0x0, 0x90, 0x90, 0x70, 0x90, 0x60}
+
+/* thorn (254) */
+#define NXFONT_METRICS_254 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_254 {0x0, 0x80, 0x80, 0xe0, 0x90, 0xe0, 0x80, 0x80}
+
+/* ydieresis (255) */
+#define NXFONT_METRICS_255 {1, 5, 8, 0, 0, 0}
+#define NXFONT_BITMAP_255 {0x0, 0x90, 0x0, 0x90, 0x90, 0x70, 0x90, 0x60}
+
+#endif
diff --git a/nuttx/include/nuttx/nx/nxfonts.h b/nuttx/include/nuttx/nx/nxfonts.h
index f1aecb9e5..8e7289b2a 100644
--- a/nuttx/include/nuttx/nx/nxfonts.h
+++ b/nuttx/include/nuttx/nx/nxfonts.h
@@ -125,6 +125,12 @@ enum nx_fontid_e
 {
   FONTID_DEFAULT     = 0         /* The default font */
 
+/* Monospace fonts */
+
+#ifdef CONFIG_NXFONT_MONO5X8
+  , FONTID_MONO5X8 = 18          /* The 5x8 monospace font */
+#endif
+  
 /* Sans Serif fonts */
 
 #ifdef CONFIG_NXFONT_SANS17X22
diff --git a/nuttx/include/pthread.h b/nuttx/include/pthread.h
index 5a08f13b6..5066275b4 100644
--- a/nuttx/include/pthread.h
+++ b/nuttx/include/pthread.h
@@ -41,15 +41,15 @@
  ********************************************************************************/
 
 #include <nuttx/config.h>   /* Default settings */
-#include <nuttx/compiler.h> /* Compiler settings */
+#include <nuttx/compiler.h> /* Compiler settings, noreturn_function */
 
 #include <sys/types.h>      /* Needed for general types */
 #include <stdint.h>         /* C99 fixed width integer types */
 #include <stdbool.h>        /* C99 boolean types */
+#include <unistd.h>         /* For getpid */
 #include <semaphore.h>      /* Needed for sem_t */
 #include <signal.h>         /* Needed for sigset_t */
 #include <time.h>           /* Needed for struct timespec */
-#include <nuttx/compiler.h> /* For noreturn_function */
 
 /********************************************************************************
  * Compilation Switches
diff --git a/nuttx/include/stdbool.h b/nuttx/include/stdbool.h
index 9c16aee29..6c3302549 100644
--- a/nuttx/include/stdbool.h
+++ b/nuttx/include/stdbool.h
@@ -90,8 +90,8 @@
 #  define bool _Bool8
 #endif
 
-#define true  1
-#define false 0
+#define true  (bool)1
+#define false (bool)0
 
 #define __bool_true_false_are_defined 1
 
diff --git a/nuttx/tools/bdf-converter.c b/nuttx/tools/bdf-converter.c
index b32209fcf..a03faa93e 100644
--- a/nuttx/tools/bdf-converter.c
+++ b/nuttx/tools/bdf-converter.c
@@ -43,6 +43,7 @@
  * Included Files
  ****************************************************************************/
 
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdbool.h>