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

1 files changed, 105 insertions, 307 deletions

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
 
 #