diff --git a/configs/lpcxpresso-lpc54628/README.txt b/configs/lpcxpresso-lpc54628/README.txt
index a9a91f3c4ea..fa2534ee6dd 100644
--- a/configs/lpcxpresso-lpc54628/README.txt
+++ b/configs/lpcxpresso-lpc54628/README.txt
@@ -67,7 +67,15 @@ STATUS
   2017-12-18:  Added an option to the FT5x06 driver to support a timer-
     based poll instead of interrupts.  This is very inefficient in that it
     will introduce delays in touchscreen response and will consume more CPU
-    bandwidth.  The driver appears to be functional.
+    bandwidth.  The driver appears to be functional.  Added the nxwm
+    configuration to do some integrated testing.  It does not yet work and
+    I have not yet looked into the cause of the problem:
+
+      Initialize the NSH library
+      createTaskbar: Create CTaskbar instance
+      createTaskbar: Connect CTaskbar instance to the NX server
+      createTaskbar: ERROR: Failed to connect CTaskbar instance to the NX server
+      nxwm_main: ERROR: Failed to create the task bar
 
 Configurations
 ==============
@@ -302,3 +310,58 @@ Configurations
        consequence of the strong glitch filtering that is enbled in the pin
        configuration.  Snappier response my be obtainble with filtering off
        if desired.
+
+  nxwm:
+
+    This is a special configuration setup for the NxWM window manager
+    UnitTest.  The NxWM window manager can be found here:
+
+      nuttx-code/NxWidgets/nxwm
+
+    The NxWM unit test can be found at:
+
+      nuttx-code/NxWidgets/UnitTests/nxwm
+
+    Documentation for installing the NxWM unit test can be found here:
+
+      nuttx-code/NxWidgets/UnitTests/README.txt
+
+    Here is the quick summary of the build steps (Assuming that all of
+    the required packages are available in a directory ~/nuttx-code):
+
+    1. Install the nxwm configuration
+
+       $ cd ~/nuttx-code/nuttx
+       $ tools/configure.sh [OPTIONS] lpcxpresso-lpc54628/nxwm
+
+       Use the -l option with the configure.sh script if you are using a
+       Linux host; use the -c option if you are using Cygwin under Windows.
+       Use the -h option to see other selections.
+
+    2. Make the build context (only)
+
+       $ make context
+
+    3. Install the nxwm unit test
+
+       $ cd ~/nuttx-code/NxWidgets
+       $ tools/install.sh ~/nuttx-code/apps nxwm
+       Creating symbolic link
+        - To ~/nuttx-code/NxWidgets/UnitTests/nxwm
+        - At ~/nuttx-code/apps/external
+
+    4. Build the NxWidgets library
+
+       $ cd ~/nuttx-code/NxWidgets/libnxwidgets
+       $ make TOPDIR=~/nuttx-code/nuttx
+
+    5. Build the NxWM library
+
+       $ cd ~/nuttx-code/NxWidgets/nxwm
+       $ make TOPDIR=~/nuttx-code/nuttx
+
+    6. Built NuttX with the installed unit test as the application
+
+       $ cd ~/nuttx-code/nuttx
+       $ make
+
diff --git a/configs/lpcxpresso-lpc54628/fb/defconfig b/configs/lpcxpresso-lpc54628/fb/defconfig
index f24fb6216be..ba748c2da10 100644
--- a/configs/lpcxpresso-lpc54628/fb/defconfig
+++ b/configs/lpcxpresso-lpc54628/fb/defconfig
@@ -54,7 +54,7 @@ CONFIG_PDCURSES_FONT_6X9=y
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=4
-CONFIG_RAM_SIZE=32768
+CONFIG_RAM_SIZE=163840
 CONFIG_RAM_START=0x10000000
 CONFIG_RAW_BINARY=y
 CONFIG_RR_INTERVAL=200
diff --git a/configs/lpcxpresso-lpc54628/nsh/defconfig b/configs/lpcxpresso-lpc54628/nsh/defconfig
index d72a7d838d7..371b82d2b16 100644
--- a/configs/lpcxpresso-lpc54628/nsh/defconfig
+++ b/configs/lpcxpresso-lpc54628/nsh/defconfig
@@ -39,7 +39,7 @@ CONFIG_NSH_READLINE=y
 CONFIG_PREALLOC_MQ_MSGS=4
 CONFIG_PREALLOC_TIMERS=4
 CONFIG_PREALLOC_WDOGS=4
-CONFIG_RAM_SIZE=32768
+CONFIG_RAM_SIZE=163840
 CONFIG_RAM_START=0x10000000
 CONFIG_RAW_BINARY=y
 CONFIG_RR_INTERVAL=200
diff --git a/configs/lpcxpresso-lpc54628/nxwm/defconfig b/configs/lpcxpresso-lpc54628/nxwm/defconfig
new file mode 100644
index 00000000000..71cfde38e1d
--- /dev/null
+++ b/configs/lpcxpresso-lpc54628/nxwm/defconfig
@@ -0,0 +1,103 @@
+# CONFIG_ARCH_FPU is not set
+# CONFIG_NX_DISABLE_16BPP is not set
+# CONFIG_NXFONTS_DISABLE_16BPP is not set
+# CONFIG_NXTK_DEFAULT_BORDERCOLORS is not set
+CONFIG_ARCH_BOARD_LPCXPRESSO_LPC54628=y
+CONFIG_ARCH_BOARD="lpcxpresso-lpc54628"
+CONFIG_ARCH_CHIP_LPC54628=y
+CONFIG_ARCH_CHIP_LPC54XX=y
+CONFIG_ARCH_STACKDUMP=y
+CONFIG_ARCH_STDARG_H=y
+CONFIG_ARCH="arm"
+CONFIG_BOARD_LOOPSPERMSEC=18535
+CONFIG_BUILTIN=y
+CONFIG_FAT_LCNAMES=y
+CONFIG_FAT_LFN=y
+CONFIG_FS_FAT=y
+CONFIG_FS_PROCFS=y
+CONFIG_FT5X06_POLLMODE=y
+CONFIG_FT5X06_SINGLEPOINT=y
+CONFIG_FT5X06_SWAPXY=y
+CONFIG_HAVE_CXX=y
+CONFIG_HAVE_CXXINITIALIZE=y
+CONFIG_I2CTOOL_MAXBUS=9
+CONFIG_INPUT_FT5X06=y
+CONFIG_INPUT=y
+CONFIG_LIB_BOARDCTL=y
+CONFIG_LPC54_EMC_DYNAMIC_CS0_OFFSET=0x00080000
+CONFIG_LPC54_EMC_DYNAMIC_CS0_SIZE=0x00f80000
+CONFIG_LPC54_EMC_DYNAMIC_CS0=y
+CONFIG_LPC54_EMC=y
+CONFIG_LPC54_GPIOIRQ=y
+CONFIG_LPC54_I2C2_MASTER=y
+CONFIG_LPC54_LCD_BGR=y
+CONFIG_LPC54_LCD_BPP16_565=y
+CONFIG_LPC54_LCD_HBACKPORCH=43
+CONFIG_LPC54_LCD_HFRONTPORCH=8
+CONFIG_LPC54_LCD_VBACKPORCH=12
+CONFIG_LPC54_LCD_VFRONTPORCH=4
+CONFIG_LPC54_LCD_VPULSE=10
+CONFIG_LPC54_LCD_VRAMBASE=0xa0000000
+CONFIG_LPC54_LCD=y
+CONFIG_LPC54_USART0=y
+CONFIG_MAX_TASKS=16
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_MM_REGIONS=2
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NSH_BUILTIN_APPS=y
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_READLINE=y
+CONFIG_NX_BLOCKING=y
+CONFIG_NX_KBD=y
+CONFIG_NX_XYINPUT_TOUCHSCREEN=y
+CONFIG_NX=y
+CONFIG_NXFONT_SANS22X29B=y
+CONFIG_NXFONT_SANS23X27=y
+CONFIG_NXTERM_CACHESIZE=32
+CONFIG_NXTERM_CURSORCHAR=95
+CONFIG_NXTERM_MXCHARS=325
+CONFIG_NXTERM_NXKBDIN=y
+CONFIG_NXTERM=y
+CONFIG_NXTK_BORDERCOLOR1=0x5cb7
+CONFIG_NXTK_BORDERCOLOR2=0x21c9
+CONFIG_NXTK_BORDERCOLOR3=0xffdf
+CONFIG_NXWIDGETS_BPP=16
+CONFIG_NXWIDGETS_CUSTOM_EDGECOLORS=y
+CONFIG_NXWIDGETS_CUSTOM_FILLCOLORS=y
+CONFIG_NXWIDGETS_DEFAULT_BACKGROUNDCOLOR=0x9dfb
+CONFIG_NXWIDGETS_DEFAULT_HIGHLIGHTCOLOR=0xc618
+CONFIG_NXWIDGETS_DEFAULT_SELECTEDBACKGROUNDCOLOR=0xd73e
+CONFIG_NXWIDGETS_DEFAULT_SHADOWEDGECOLOR=0x21e9
+CONFIG_NXWIDGETS_DEFAULT_SHINEEDGECOLOR=0xffdf
+CONFIG_NXWIDGETS_SIZEOFCHAR=1
+CONFIG_NXWIDGETS=y
+CONFIG_NXWM_HEXCALCULATOR_CUSTOM_FONTID=y
+CONFIG_NXWM_HEXCALCULATOR_FONTID=5
+CONFIG_NXWM_KEYBOARD=y
+CONFIG_NXWM_TASKBAR_LEFT=y
+CONFIG_NXWM_TASKBAR_VSPACING=4
+CONFIG_NXWM_UNITTEST=y
+CONFIG_NXWM=y
+CONFIG_PREALLOC_MQ_MSGS=16
+CONFIG_PREALLOC_TIMERS=4
+CONFIG_PREALLOC_WDOGS=8
+CONFIG_RAM_SIZE=163840
+CONFIG_RAM_START=0x10000000
+CONFIG_RAW_BINARY=y
+CONFIG_RR_INTERVAL=200
+CONFIG_SCHED_HPWORK=y
+CONFIG_SCHED_ONEXIT=y
+CONFIG_SCHED_WAITPID=y
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_START_DAY=18
+CONFIG_START_MONTH=12
+CONFIG_SYMTAB_ORDEREDBYNAME=y
+CONFIG_SYSTEM_I2CTOOL=y
+CONFIG_SYSTEM_RAMTEST=y
+CONFIG_TASK_NAME_SIZE=0
+CONFIG_USART0_SERIAL_CONSOLE=y
+CONFIG_USER_ENTRYPOINT="nxwm_main"
+CONFIG_WDOG_INTRESERVE=0
diff --git a/drivers/input/ft5x06.c b/drivers/input/ft5x06.c
index 9ce827e1efd..ada42d0050d 100644
--- a/drivers/input/ft5x06.c
+++ b/drivers/input/ft5x06.c
@@ -1205,6 +1205,7 @@ int ft5x06_register(FAR struct i2c_master_s *i2c,
   if (priv->polltimer == NULL)
     {
       ierr("ERROR: Failed to allocate polltimer\n");
+      ret = -EBUSY;
       goto errout_with_priv;
     }
 #else
@@ -1241,7 +1242,7 @@ int ft5x06_register(FAR struct i2c_master_s *i2c,
    */
 
   ret = work_queue(HPWORK, &priv->work, ft5x06_data_worker, priv, 0);
-  if (ret != 0)
+  if (ret < 0)
     {
       ierr("ERROR: Failed to queue work: %d\n", ret);
       goto errout_with_timer;