Add Z16F NSH configuration

16 files changed, 1487 insertions, 42 deletions

diff --git a/apps/examples/ostest/sighand.c b/apps/examples/ostest/sighand.c
index 32b182c21..ea9775e01 100644
--- a/apps/examples/ostest/sighand.c
+++ b/apps/examples/ostest/sighand.c
@@ -59,7 +59,7 @@ static void death_of_child(int signo, siginfo_t *info, void *ucontext)
 {
   /* Use of printf in a signal handler is NOT safe! It can cause deadlocks!
    * Also, signals are not queued by NuttX.  As a consequence, some
-   * notifications will get lost (or the info data can be overwrittedn)! 
+   * notifications will get lost (or the info data can be overwrittedn)!
    * Because POSIX  does not require signals to be queued, I do not think
    * that this is a bug (the overwriting is a bug, however).
    */
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 895be7f60..afa205f88 100644
--- a/nuttx/ChangeLog
+++ b/nuttx/ChangeLog
@@ -6354,4 +6354,6 @@
 	  well (2013-12-30).
 	* configs/sim/mount/defconfig:  Converted to use kconfig-frontends
 	  tools (2013-21-31).
+	* configs/z16f2800100zcog/nsh:  Add a Z16F NSH configuration.  Does not
+	  yet work (2014-1-1).
 
diff --git a/nuttx/arch/z16/src/z16f/z16f_lowuart.S b/nuttx/arch/z16/src/z16f/z16f_lowuart.S
index 1aa11a557..62d42b6e9 100755
--- a/nuttx/arch/z16/src/z16f/z16f_lowuart.S
+++ b/nuttx/arch/z16/src/z16f/z16f_lowuart.S
@@ -89,7 +89,7 @@ _z16f_lowuartinit:
 #endif
 	ld	r0, r3			/* r0 = baud */
 	sll	r0, #3			/* r0 = baud * 8 */
-	add	r0, #_SYS_CLK_FREQ	/* r3 = freq + baud * 8*/
+	add	r0, #_SYS_CLK_FREQ	/* r3 = freq + baud * 8 */
 	sll	r3, #4			/* r3 = baud * 16 */
 	udiv	r0, r3			/* BRG = (freq + baud * 8)/(baud * 16) */
 
@@ -143,7 +143,7 @@ _z16f_lowuartinit:
 _up_lowputc:
 	/* Check if the character to output is a linefeed */
 
-	ext.ub	r0, r1			/* r0=Character masked to 8-bits */ 
+	ext.ub	r0, r1			/* r0=Character masked to 8-bits */
 	cp	r0, #10			/* Is it a linefeed ('\n') */
 	jp	ne, _z16f_xmitc		/* No? Jump to _z16f_xmitc with character in r1 */
 
diff --git a/nuttx/arch/z16/src/z16f/z16f_serial.c b/nuttx/arch/z16/src/z16f/z16f_serial.c
index 28c3f94b7..1845fece8 100644
--- a/nuttx/arch/z16/src/z16f/z16f_serial.c
+++ b/nuttx/arch/z16/src/z16f/z16f_serial.c
@@ -78,16 +78,14 @@ extern _Erom unsigned long SYS_CLK_FREQ;
 
 struct z16f_uart_s
 {
-  uint32_t     uartbase;	/* Base address of UART
-							 * registers */
-  uint32_t     baud;		/* Configured baud */
-  bool         rxenabled;	/* RX interrupt enabled */
-  bool         txenabled;	/* TX interrupt enabled */
-  uint8_t      rxirq;		/* RX IRQ associated with this UART */
-  uint8_t      txirq;		/* RX IRQ associated with this UART */
-  uint8_t      parity;		/* 0=none, 1=odd, 2=even */
-  bool         stopbits2;	/* true: Configure with 2
-							 * stop bits instead of 1 */
+  uint32_t     uartbase;    /* Base address of UART registers */
+  uint32_t     baud;        /* Configured baud */
+  bool         rxenabled;   /* RX interrupt enabled */
+  bool         txenabled;   /* TX interrupt enabled */
+  uint8_t      rxirq;       /* RX IRQ associated with this UART */
+  uint8_t      txirq;       /* RX IRQ associated with this UART */
+  uint8_t      parity;      /* 0=none, 1=odd, 2=even */
+  bool         stopbits2;   /* true: Configure with 2 stop bits instead of 1 */
 };
 
 /****************************************************************************
@@ -291,6 +289,7 @@ static void z16f_consoleput(uint8_t ch)
           break;
         }
     }
+
   putreg8(ch,  priv->uartbase + Z16F_UART_TXD);
 }
 
@@ -320,7 +319,9 @@ static int z16f_setup(struct uart_dev_s *dev)
 
   /* Configure STOP bits */
 
-  ctl0 = ctl1 = 0;
+  ctl0 = 0;
+  ctl1 = 0;
+
   if (priv->stopbits2)
     {
       ctl0 |= Z16F_UARTCTL0_STOP;
@@ -345,6 +346,7 @@ static int z16f_setup(struct uart_dev_s *dev)
   ctl0 |= (Z16F_UARTCTL0_TEN|Z16F_UARTCTL0_REN);
   putreg8(ctl0, priv->uartbase + Z16F_UART_CTL0);
 #endif
+
   return OK;
 }
 
@@ -352,8 +354,7 @@ static int z16f_setup(struct uart_dev_s *dev)
  * Name: z16f_shutdown
  *
  * Description:
- *   Disable the UART.  This method is called when the serial
- *   port is closed
+ *   Disable the UART.  This method is called when the serial port is closed
  *
  ****************************************************************************/
 
@@ -664,14 +665,16 @@ static bool z16f_txempty(struct uart_dev_s *dev)
  * Name: up_earlyserialinit
  *
  * Description:
- *   Performs the low level UART initialization early in 
- *   debug so that the serial console will be available
- *   during bootup.  This must be called before z16f_serialinit.
+ *   Performs the low level UART initialization early in debug so that the
+ *   serial console will be available during bootup.  This must be called
+ *   before z16f_serialinit.
  *
  ****************************************************************************/
 
 void up_earlyserialinit(void)
 {
+  /* REVISIT:  UART GPIO AFL register is not initialized */
+
   (void)z16f_disableuartirq(&TTYS0_DEV);
   (void)z16f_disableuartirq(&TTYS1_DEV);
 
@@ -683,8 +686,8 @@ void up_earlyserialinit(void)
  * Name: up_serialinit
  *
  * Description:
- *   Register serial console and serial ports.  This assumes
- *   that up_earlyserialinit was called previously.
+ *   Register serial console and serial ports.  This assumes that
+ *   up_earlyserialinit was called previously.
  *
  ****************************************************************************/
 
@@ -699,8 +702,7 @@ void up_serialinit(void)
  * Name: up_putc
  *
  * Description:
- *   Provide priority, low-level access to support OS debug
- *   writes
+ *   Provide priority, low-level access to support OS debug writes
  *
  ****************************************************************************/
 
@@ -709,7 +711,7 @@ int up_putc(int ch)
   uint8_t  state;
 
   /* Keep interrupts disabled so that we do not interfere with normal
-   * driver operation 
+   * driver operation
    */
 
   state = z16f_disableuartirq(&CONSOLE_DEV);
diff --git a/nuttx/configs/z16f2800100zcog/README.txt b/nuttx/configs/z16f2800100zcog/README.txt
index 4d61a41da..da0436c00 100644
--- a/nuttx/configs/z16f2800100zcog/README.txt
+++ b/nuttx/configs/z16f2800100zcog/README.txt
@@ -44,7 +44,7 @@ Version 5.0.1
   to modify the versioning in Make.defs and setenv.sh; if you want to build
   on a different platform, you will need to change the path in the ZDS binaries
   in those same files.
-  
+
 Other Versions
 
   If you use any version of ZDS-II other than 5.0.1 or if you install ZDS-II
@@ -62,7 +62,7 @@ mentioned here because it causes a failure to compile Nuttx:
 
   Description: The file drivers/mmcsd/mmcsd_sdio.c generates an internal compiler
                error like:
- 
+
                mmcsd\mmcsd_sdio.c
                Internal Error(0503) On line 2524 of "MMCSD\MMCSD_SDIO.C"
                    File <c3>, Args(562,46)
@@ -94,11 +94,55 @@ Where <sub-directory> is the specific board configuration that you
 wish to build.  The following board-specific configurations are
 available:
 
+nsh
+---
+  nsh:
+    This configuration directory will built the NuttShell (NSH).  See
+    the NSH user manual in the documents directory (or online at nuttx.org).
+    See also the README.txt file in the ostest sub-directory for information
+    about using ZDS-II.
+
+    NOTES:
+
+    1. This configuration uses the mconf-based configuration tool.  To
+       change this configuration using that tool, you should:
+
+       a. Build and install the kconfig-mconf tool.  See nuttx/README.txt
+          and misc/tools/
+
+       b. Execute 'make menuconfig' in nuttx/ in order to start the
+          reconfiguration process.
+
+    2. By default, this configuration assumes that you are using the
+       Cygwin environment on Windows.  An option is to use the native
+       CMD.exe window build as described in the top-level README.txt
+       file.  To set up that configuration:
+
+       -CONFIG_WINDOWS_CYGWIN=y
+       +CONFIG_WINDOWS_NATIVE=y
+
+       And after configuring, make sure that CONFIG_APPS_DIR uses
+       the back slash character.  For example:
+
+        CONFIG_APPS_DIR="..\apps"
+
+      NOTES:
+
+      a. If you need to change the toolchain path used in Make.defs, you
+         will need to use the short 8.3 filenames to avoid spaces.  On my
+         PC, C:\PROGRA~1\ is is C:\Program Files\ and C:\PROGRA~2\ is
+         C:\Program Files (x86)\
+      b. I have not tried to use this configuration with the native
+         Windows build, but I would expect the same issues as is listed
+         for the ostest configuration..
+
 ostest
 ------
 
     This builds the examples/ostest application for execution from FLASH.
-    See examples/README.txt for information about ostest.
+    See the README.txt file in the ostest sub-directory for information
+    about using ZDS-II.  See also apps/examples/README.txt for information
+    about ostest.
 
     NOTES:
 
@@ -125,7 +169,7 @@ ostest
         CONFIG_APPS_DIR="..\apps"
 
       NOTES:
-      
+
       a. If you need to change the toolchain path used in Make.defs, you
          will need to use the short 8.3 filenames to avoid spaces.  On my
          PC, C:\PROGRA~1\ is is C:\Program Files\ and C:\PROGRA~2\ is
@@ -139,9 +183,6 @@ ostest
          the end of the lines after a line continuation (\ ^M).  If these
          trailing bad characters are manually eliminated, then the build
          will succeed on the next try.
-      d. Hmmm... when last tested, there some missing .obj files in arch/z16/src.
-         A little additional TLC might be needed to get a reliable Windows
-         native build.
 
 pashello
 --------
diff --git a/nuttx/configs/z16f2800100zcog/nsh/.gitignore b/nuttx/configs/z16f2800100zcog/nsh/.gitignore
new file mode 100644
index 000000000..fb6579652
--- /dev/null
+++ b/nuttx/configs/z16f2800100zcog/nsh/.gitignore
@@ -0,0 +1,5 @@
+nsh.hex
+nsh.map
+nsh.lod
+nsh.wsp
+
diff --git a/nuttx/configs/z16f2800100zcog/nsh/Make.defs b/nuttx/configs/z16f2800100zcog/nsh/Make.defs
new file mode 100644
index 000000000..94098d68d
--- /dev/null
+++ b/nuttx/configs/z16f2800100zcog/nsh/Make.defs
@@ -0,0 +1,264 @@
+############################################################################
+# configs/z16f2800100zcog/nsh/Make.defs
+#
+#   Copyright (C) 2014 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.
+#
+############################################################################
+
+include $(TOPDIR)/.config
+include $(TOPDIR)/tools/Config.mk
+
+# These are the directories where the ZDS-II toolchain is installed.  NOTE
+# that short 8.3 path names are used in order to avoid spaces.  On my machine
+# I have:
+#
+# C:\PROGRA~1\ = C:\Profram Files\
+# C:\PROGRA~2\ = C:\Program Files (x86)\
+#
+# Your PC may be configured differently.
+
+ZDSVERSION = 5.0.1
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+  ZDSINSTALLDIR = C:/PROGRA~2/ZiLOG/ZDSII_ZNEO_$(ZDSVERSION)
+  INSTALLDIR = ${shell echo $(ZDSINSTALLDIR)| sed -e "s/\//\\/g"}
+  ZDSBINDIR = $(INSTALLDIR)\bin
+  ZDSSTDINCDIR = $(INSTALLDIR)\include\std
+  ZDSZILOGINCDIR = $(INSTALLDIR)\include\zilog
+  ZDSSTDLIBDIR = $(INSTALLDIR)\lib\std
+  ZDSZILOGLIBDIR = $(INSTALLDIR)\lib\zilog
+
+  # CFLAGs
+
+  ARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
+  EARCHASMINCLUDES = -include:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
+  ARCHSTDINCLUDES = -stdinc:$(TOPDIR)\include;$(ZDSSTDINCDIR);$(ZDSZILOGINCDIR)
+  ARCHUSRINCLUDES = -usrinc:.
+else
+  WINTOOL = y
+  ZDSINSTALLDIR = C:/PROGRA~2/ZiLOG/ZDSII_ZNEO_$(ZDSVERSION)
+  INSTALLDIR = ${shell cygpath -u "$(ZDSINSTALLDIR)"}
+  ZDSBINDIR = $(INSTALLDIR)/bin
+  ZDSSTDINCDIR = $(INSTALLDIR)/include/std
+  ZDSZILOGINCDIR = $(INSTALLDIR)/include/zilog
+  ZDSSTDLIBDIR = $(INSTALLDIR)/lib/std
+  ZDSZILOGLIBDIR = $(INSTALLDIR)/lib/zilog
+
+  # These are the same directories but with the directory separator
+  # character swapped as needed by the ZDS-II compiler
+
+  WTOPDIR = ${shell cygpath -w "$(TOPDIR)"}
+  WZDSSTDINCDIR = ${shell cygpath -w "$(ZDSSTDINCDIR)"}
+  WZDSZILOGINCDIR = ${shell cygpath -w "$(ZDSZILOGINCDIR)"}
+  WZDSSTDLIBDIR = ${shell cygpath -w "$(ZDSSTDLIBDIR)"}
+  WZDSZILOGLIBDIR = ${shell cygpath -w "$(ZDSZILOGLIBDIR)"}
+
+  # Escaped versions
+
+  ETOPDIR = ${shell echo "$(WTOPDIR)" | sed -e "s/ /%20/g"}
+  EZDSSTDINCDIR = ${shell echo "$(WZDSSTDINCDIR)" | sed -e "s/ /%20/g"}
+  EZDSZILOGINCDIR = ${shell echo "$(WZDSZILOGINCDIR)" | sed -e "s/ /%20/g"}
+
+  # CFLAGs
+
+  ARCHASMINCLUDES = -include:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
+  EARCHASMINCLUDES = -include:'$(ETOPDIR)\include;$(EZDSSTDINCDIR);$(EZDSZILOGINCDIR)'
+  ARCHSTDINCLUDES = -stdinc:'$(WTOPDIR)\include;$(WZDSSTDINCDIR);$(WZDSZILOGINCDIR)'
+  ARCHUSRINCLUDES = -usrinc:'.'
+endif
+
+# Assembler definitions
+
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  ARCHASMOPTIMIZATION = -debug
+else
+  ARCHASMOPTIMIZATION = -nodebug
+endif
+
+ARCHASMCPUFLAGS = -cpu:Z16F2811AL -NOigcase
+ARCHASMLIST = -NOlistmac -name -pagelen:56 -pagewidth:80 -quiet
+ARCHASMWARNINGS = -warn
+ARCHASMDEFINES = -define:_Z16F2811AL=1 -define:_Z16K_SERIES=1 -define:_Z16F_SERIES=1 -define:__ASSEMBLY__
+AFLAGS = $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMLIST) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)
+
+# Compiler definitions
+
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+  ARCHOPTIMIZATION = -debug
+else
+  ARCHOPTIMIZATION = -nodebug
+endif
+
+ifeq ($(CONFIG_DEBUG_NOOPT),y)
+  ARCHOPTIMIZATION += -NOregvar -reduceopt
+else
+  ARCHOPTIMIZATION += -regvar
+endif
+
+ARCHCPUFLAGS = -chartype:S -model:L -NOmodsect -cpu:Z16F2811AL -NOgenprint \
+               -asmsw:" $(ARCHASMCPUFLAGS) $(ARCHASMINCLUDES) $(ARCHASMWARNINGS) $(ARCHASMOPTIMIZATION)"
+ARCHLIST = -keeplst -NOlist -NOlistinc -NOkeepasm
+ARCHPICFLAGS =
+ARCHWARNINGS = -warn
+ARCHDEFINES = -define:_Z16F2811AL -define:_Z16K_SERIES -define:_Z16F_SERIES
+ARCHINCLUDES = $(ARCHSTDINCLUDES) $(ARCHUSRINCLUDES)
+CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHLIST) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
+
+CPPDEFINES = -D_Z16F2811AL -D_Z16K_SERIES -D_Z16F_SERIES -D__ASSEMBLY__
+CPPINCLUDES = -I$(TOPDIR)$(DELIM)include
+CPPFLAGS = $(CPPDEFINES) $(CPPINCLUDES)
+
+# Librarian definitions
+
+ARFLAGS = -quiet -warn
+
+# Linker definitions
+
+LINKCMDTEMPLATE = $(TOPDIR)$(DELIM)configs$(DELIM)z16f2800100zcog$(DELIM)nsh$(DELIM)nsh.linkcmd
+
+# Tool names/pathes
+
+CROSSDEV =
+CC = zneocc.exe
+CPP = gcc -E
+LD = zneolink.exe
+AS = zneoasm.exe
+AR = zneolib.exe
+
+# File extensions
+
+ASMEXT = .asm
+OBJEXT = .obj
+LIBEXT = .lib
+EXEEXT = .hex
+
+# These are the macros that will be used in the NuttX make system
+# to compile and assembly source files and to insert the resulting
+# object files into an archive
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+
+define PREPROCESS
+	@echo CPP: $1->$2
+	$(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
+endef
+
+define COMPILE
+	$(Q) "$(CC)" $(CFLAGS)  ${shell echo $1 | sed -e "s/\//\\/g"}
+endef
+
+define ASSEMBLE
+	$(Q) "$(AS)" $(AFLAGS) ${shell echo $1 | sed -e "s/\//\\/g"}
+endef
+
+define MOVEOBJ
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
+	@#$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+endef
+
+define ARCHIVE
+	@echo AR: $2
+	$(Q) for %%G in ($(2)) do ( "$(AR)" $(ARFLAGS) $1=-+%%G )
+endef
+
+define CLEAN
+	$(Q) if exist *.obj (del /f /q *.obj)
+	$(Q) if exist *.src (del /f /q *.src)
+	$(Q) if exist *.lib (del /f /q *.lib)
+	$(Q) if exist *.hex (del /f /q *.hex)
+	$(Q) if exist *.lod (del /f /q *.lod)
+	$(Q) if exist *.lst (del /f /q *.lst)
+endef
+
+else
+
+define PREPROCESS
+	@echo "CPP: $1->$2"
+	$(Q) "$(CPP)" $(CPPFLAGS) $1 -o $2
+endef
+
+define COMPILE
+	$(Q) (wfile=`cygpath -w "$1"`; "$(CC)" $(CFLAGS) $$wfile)
+endef
+
+define ASSEMBLE
+	$(Q) (wfile=`cygpath -w "$1"`; "$(AS)" $(AFLAGS) $$wfile)
+endef
+
+define MOVEOBJ
+	$(call MOVEFILE, "$1.obj", "$2$(DELIM)$1.obj")
+	$(call MOVEFILE, "$1.lst", "$2$(DELIM)$1.lst")
+	@#$(call MOVEFILE, "$1.src", "$2$(DELIM)$1.src")
+endef
+
+define ARCHIVE
+	$(Q) for __obj in $(2) ; do \
+		echo "AR: $$__obj"; \
+		"$(AR)" $(ARFLAGS) $1=-+$$__obj || { echo "$(AR) $1=-+$$__obj FAILED!" ; exit 1 ; } \
+	done
+endef
+
+define CLEAN
+	$(Q) rm -f *.obj *.src *.lib *.hex *.lod *.lst
+endef
+endif
+
+# Windows native host tool definitions
+
+ifeq ($(CONFIG_WINDOWS_NATIVE),y)
+  HOSTCC = mingw32-gcc.exe
+  HOSTINCLUDES = -I.
+  HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe
+  HOSTLDFLAGS =
+  HOSTEXEEXT = .exe
+
+  # Windows-native host tools
+
+  MKDEP = $(TOPDIR)\tools\mkdeps.exe --winnative
+else
+
+# Linux/Cygwin host tool definitions
+
+  HOSTCC = gcc
+  HOSTINCLUDES = -I.
+  HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe
+  HOSTLDFLAGS =
+
+  # This is the tool to use for dependencies (i.e., none)
+
+  MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mknulldeps.sh
+
+  # ZDS-II cannot follow Cygwin soft links, so we will have to use directory copies
+
+  DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
+  DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
+endif
diff --git a/nuttx/configs/z16f2800100zcog/nsh/README.txt b/nuttx/configs/z16f2800100zcog/nsh/README.txt
new file mode 100644
index 000000000..8280f9801
--- /dev/null
+++ b/nuttx/configs/z16f2800100zcog/nsh/README.txt
@@ -0,0 +1,49 @@
+README.txt
+==========
+
+Contents
+--------
+
+  o NSH Project
+  o Loading and Executing Code
+  o Console Output
+  o STATUS
+
+NSH Project
+-----------
+
+nsh.zfpproj is a simple ZDS II - ZNEO 5.0.1 project that will allow you
+  to use the ZDS-II debugger.  Before using, copy the following files from
+  the toplevel directory:
+
+    nuttx.hex, nuttx.map, nuttx.lod
+
+  to this directory as:
+
+    nsh.hex, nsh.map, nsh.lod
+
+Loading and Executing Code
+--------------------------
+
+1. Copy the files to this directory as described above
+2. Connect the ZiLOG XTools USB debugger.
+3. Install the USB driver from the ZDS-II device_drivers directory
+4. Start ZDS-II and load the nsh.zfpproj project
+5. In the debug tab, connect to the debugger
+6. In the debug tab, load code, reset, and go
+
+Console Output
+--------------
+
+Interaction with NSH is via the serial console at 57600 8N1 baud.
+
+STATUS
+------
+1. This configuration does not run correctly.  There is a problem with the
+   serial driver.  When started, some garbled characters appear on the
+   console.  I suspect (a) the UART is not being configured correctly, and
+   (2) UART interrupts are not be set up correctly.
+
+2. I bet that this code, like ostest, will not run if started by a hardware
+   reset.  It may only run when started via the debugger.
+
diff --git a/nuttx/configs/z16f2800100zcog/nsh/defconfig b/nuttx/configs/z16f2800100zcog/nsh/defconfig
new file mode 100644
index 000000000..d743c613b
--- /dev/null
+++ b/nuttx/configs/z16f2800100zcog/nsh/defconfig
@@ -0,0 +1,683 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Nuttx/ Configuration
+#
+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
+#
+# CONFIG_APPS_DIR="../apps"
+# CONFIG_BUILD_2PASS is not set
+
+#
+# Binary Output Formats
+#
+# CONFIG_RRLOAD_BINARY is not set
+# CONFIG_INTELHEX_BINARY is not set
+# CONFIG_MOTOROLA_SREC is not set
+# CONFIG_RAW_BINARY is not set
+
+#
+# Customize Header Files
+#
+# 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=y
+# CONFIG_ARCH_HAVE_STACKCHECK is not set
+# CONFIG_ARCH_HAVE_HEAPCHECK is not set
+# CONFIG_DEBUG_VERBOSE is not set
+
+#
+# Subsystem Debug Options
+#
+# CONFIG_DEBUG_MM is not set
+# CONFIG_DEBUG_SCHED is not set
+# CONFIG_DEBUG_FS is not set
+# CONFIG_DEBUG_LIB is not set
+# CONFIG_DEBUG_BINFMT is not set
+# CONFIG_DEBUG_GRAPHICS is not set
+# CONFIG_DEBUG_IRQ is not set
+
+#
+# Driver Debug Options
+#
+# CONFIG_DEBUG_LEDS is not set
+# CONFIG_DEBUG_ANALOG is not set
+# CONFIG_DEBUG_GPIO is not set
+# CONFIG_DEBUG_AUDIO is not set
+# CONFIG_DEBUG_SYMBOLS is not set
+# CONFIG_DEBUG_NOOPT is not set
+
+#
+# System Type
+#
+# CONFIG_ARCH_8051 is not set
+# CONFIG_ARCH_ARM is not set
+# 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=y
+# CONFIG_ARCH_Z80 is not set
+CONFIG_ARCH="z16"
+CONFIG_ARCH_CHIP="z16f"
+
+#
+# Z16 Configuration Options
+#
+# CONFIG_ARCH_CHIP_Z16F2810 is not set
+CONFIG_ARCH_CHIP_Z16F2811=y
+# CONFIG_ARCH_CHIP_Z16F3211 is not set
+# CONFIG_ARCH_CHIP_Z16F6411 is not set
+CONFIG_ARCH_CHIP_Z16F=y
+
+#
+# Common Configuration Options
+#
+
+#
+# Z16F Configuration Options
+#
+CONFIG_Z16F_UART0=y
+CONFIG_Z16F_UART1=y
+
+#
+# Architecture Options
+#
+# CONFIG_ARCH_NOINTC is not set
+# CONFIG_ARCH_VECNOTIRQ is not set
+# CONFIG_ARCH_DMA is not set
+CONFIG_ARCH_HAVE_IRQPRIO=y
+# CONFIG_CUSTOM_STACK is not set
+# CONFIG_ADDRENV is not set
+# CONFIG_ARCH_HAVE_VFORK is not set
+CONFIG_ARCH_IRQPRIO=y
+# CONFIG_ARCH_STACKDUMP is not set
+CONFIG_ENDIAN_BIG=y
+# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+# CONFIG_ARCH_HAVE_RAMVECTORS is not set
+
+#
+# Board Settings
+#
+CONFIG_BOARD_LOOPSPERMSEC=1250
+# CONFIG_ARCH_CALIBRATION is not set
+
+#
+# Interrupt options
+#
+# CONFIG_ARCH_HAVE_INTERRUPTSTACK is not set
+# CONFIG_ARCH_HAVE_HIPRI_INTERRUPT is not set
+
+#
+# Boot options
+#
+# CONFIG_BOOT_RUNFROMEXTSRAM is not set
+CONFIG_BOOT_RUNFROMFLASH=y
+# CONFIG_BOOT_RUNFROMISRAM is not set
+# CONFIG_BOOT_RUNFROMSDRAM is not set
+# CONFIG_BOOT_COPYTORAM is not set
+
+#
+# Boot Memory Configuration
+#
+CONFIG_RAM_START=0x0
+CONFIG_RAM_SIZE=65536
+
+#
+# Board Selection
+#
+CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y
+# CONFIG_ARCH_BOARD_CUSTOM is not set
+CONFIG_ARCH_BOARD="z16f2800100zcog"
+
+#
+# Common Board Options
+#
+CONFIG_ARCH_HAVE_LEDS=y
+CONFIG_ARCH_LEDS=y
+CONFIG_NSH_MMCSDMINOR=0
+
+#
+# Board-Specific Options
+#
+
+#
+# RTOS Features
+#
+# CONFIG_BOARD_INITIALIZE is not set
+CONFIG_MSEC_PER_TICK=10
+# CONFIG_SYSTEM_TIME64 is not set
+CONFIG_RR_INTERVAL=200
+# CONFIG_SCHED_INSTRUMENTATION is not set
+CONFIG_TASK_NAME_SIZE=0
+# CONFIG_SCHED_HAVE_PARENT is not set
+# CONFIG_JULIAN_TIME is not set
+CONFIG_START_YEAR=2014
+CONFIG_START_MONTH=1
+CONFIG_START_DAY=1
+CONFIG_DEV_CONSOLE=y
+# CONFIG_MUTEX_TYPES is not set
+# CONFIG_PRIORITY_INHERITANCE is not set
+# CONFIG_FDCLONE_DISABLE is not set
+# CONFIG_FDCLONE_STDIO is not set
+CONFIG_SDCLONE_DISABLE=y
+CONFIG_SCHED_WAITPID=y
+# CONFIG_SCHED_STARTHOOK is not set
+# CONFIG_SCHED_ATEXIT is not set
+# CONFIG_SCHED_ONEXIT is not set
+CONFIG_USER_ENTRYPOINT="nsh_main"
+CONFIG_DISABLE_OS_API=y
+# CONFIG_DISABLE_CLOCK is not set
+# CONFIG_DISABLE_POSIX_TIMERS is not set
+# CONFIG_DISABLE_PTHREAD is not set
+# CONFIG_DISABLE_SIGNALS is not set
+# CONFIG_DISABLE_MQUEUE is not set
+# CONFIG_DISABLE_ENVIRON is not set
+
+#
+# Signal Numbers
+#
+CONFIG_SIG_SIGUSR1=1
+CONFIG_SIG_SIGUSR2=2
+CONFIG_SIG_SIGALARM=3
+CONFIG_SIG_SIGCONDTIMEDOUT=16
+
+#
+# Sizes of configurable things (0 disables)
+#
+CONFIG_MAX_TASKS=16
+CONFIG_MAX_TASK_ARGS=4
+CONFIG_NPTHREAD_KEYS=4
+CONFIG_NFILE_DESCRIPTORS=8
+CONFIG_NFILE_STREAMS=8
+CONFIG_NAME_MAX=32
+CONFIG_PREALLOC_MQ_MSGS=4
+CONFIG_MQ_MAXMSGSIZE=32
+CONFIG_MAX_WDOGPARMS=2
+CONFIG_PREALLOC_WDOGS=4
+CONFIG_PREALLOC_TIMERS=4
+
+#
+# Stack and heap information
+#
+CONFIG_IDLETHREAD_STACKSIZE=4096
+CONFIG_USERMAIN_STACKSIZE=4096
+CONFIG_PTHREAD_STACK_MIN=256
+CONFIG_PTHREAD_STACK_DEFAULT=4096
+
+#
+# Device Drivers
+#
+CONFIG_DISABLE_POLL=y
+CONFIG_DEV_NULL=y
+# CONFIG_DEV_ZERO is not set
+# CONFIG_LOOP is not set
+# CONFIG_RAMDISK is not set
+# CONFIG_CAN is not set
+# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
+# CONFIG_PWM is not set
+# CONFIG_ARCH_HAVE_I2CRESET is not set
+# CONFIG_I2C is not set
+# CONFIG_SPI is not set
+# CONFIG_I2S is not set
+# CONFIG_RTC is not set
+# CONFIG_WATCHDOG is not set
+# CONFIG_ANALOG is not set
+# CONFIG_AUDIO_DEVICES is not set
+# CONFIG_VIDEO_DEVICES is not set
+# CONFIG_BCH is not set
+# CONFIG_INPUT is not set
+# CONFIG_LCD is not set
+# CONFIG_MMCSD is not set
+# CONFIG_MTD 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_UART0=y
+CONFIG_ARCH_HAVE_UART1=y
+
+#
+# USART Configuration
+#
+CONFIG_MCU_SERIAL=y
+CONFIG_STANDARD_SERIAL=y
+# CONFIG_SERIAL_TIOCSERGSTRUCT is not set
+CONFIG_UART0_SERIAL_CONSOLE=y
+# CONFIG_UART1_SERIAL_CONSOLE is not set
+# CONFIG_NO_SERIAL_CONSOLE is not set
+
+#
+# UART0 Configuration
+#
+CONFIG_UART0_RXBUFSIZE=256
+CONFIG_UART0_TXBUFSIZE=256
+CONFIG_UART0_BAUD=57600
+CONFIG_UART0_BITS=8
+CONFIG_UART0_PARITY=0
+CONFIG_UART0_2STOP=0
+# CONFIG_UART0_IFLOWCONTROL is not set
+# CONFIG_UART0_OFLOWCONTROL is not set
+
+#
+# UART1 Configuration
+#
+CONFIG_UART1_RXBUFSIZE=256
+CONFIG_UART1_TXBUFSIZE=256
+CONFIG_UART1_BAUD=57600
+CONFIG_UART1_BITS=8
+CONFIG_UART1_PARITY=0
+CONFIG_UART1_2STOP=0
+# CONFIG_UART1_IFLOWCONTROL is not set
+# CONFIG_UART1_OFLOWCONTROL is not set
+# CONFIG_SERIAL_IFLOWCONTROL is not set
+# CONFIG_SERIAL_OFLOWCONTROL is not set
+# CONFIG_USBDEV is not set
+# CONFIG_USBHOST is not set
+# CONFIG_WIRELESS is not set
+
+#
+# System Logging Device Options
+#
+
+#
+# System Logging
+#
+# CONFIG_RAMLOG is not set
+
+#
+# Networking Support
+#
+# CONFIG_ARCH_HAVE_NET is not set
+# CONFIG_ARCH_HAVE_PHY is not set
+# CONFIG_NET is not set
+
+#
+# File Systems
+#
+
+#
+# File system configuration
+#
+# CONFIG_DISABLE_MOUNTPOINT is not set
+# CONFIG_FS_READABLE is not set
+# CONFIG_FS_WRITABLE is not set
+# CONFIG_FS_RAMMAP is not set
+# CONFIG_FS_FAT is not set
+# CONFIG_FS_NXFFS is not set
+# CONFIG_FS_ROMFS is not set
+# CONFIG_FS_SMARTFS is not set
+# CONFIG_FS_BINFS is not set
+# CONFIG_FS_PROCFS is not set
+
+#
+# System Logging
+#
+# CONFIG_SYSLOG_ENABLE is not set
+# CONFIG_SYSLOG is not set
+
+#
+# Graphics Support
+#
+# CONFIG_NX is not set
+
+#
+# Memory Management
+#
+# CONFIG_MM_MULTIHEAP is not set
+# CONFIG_MM_SMALL is not set
+CONFIG_MM_REGIONS=1
+CONFIG_ARCH_HAVE_HEAP2=y
+CONFIG_HEAP2_BASE=0x00000000
+CONFIG_HEAP2_SIZE=0
+# CONFIG_GRAN is not set
+
+#
+# Audio Support
+#
+# CONFIG_AUDIO is not set
+
+#
+# Binary Formats
+#
+# CONFIG_BINFMT_DISABLE is not set
+# CONFIG_BINFMT_EXEPATH is not set
+# CONFIG_NXFLAT is not set
+# CONFIG_ELF is not set
+CONFIG_BUILTIN=y
+# CONFIG_PIC is not set
+# CONFIG_SYMTAB_ORDEREDBYNAME is not set
+
+#
+# Library Routines
+#
+
+#
+# Standard C Library Options
+#
+CONFIG_STDIO_BUFFER_SIZE=64
+CONFIG_STDIO_LINEBUFFER=y
+CONFIG_NUNGET_CHARS=2
+CONFIG_LIB_HOMEDIR="/"
+# CONFIG_LIBM is not set
+CONFIG_NOPRINTF_FIELDWIDTH=y
+# CONFIG_LIBC_FLOATINGPOINT is not set
+CONFIG_LIB_RAND_ORDER=1
+# CONFIG_EOL_IS_CR is not set
+# CONFIG_EOL_IS_LF is not set
+# CONFIG_EOL_IS_BOTH_CRLF is not set
+CONFIG_EOL_IS_EITHER_CRLF=y
+# CONFIG_LIBC_EXECFUNCS is not set
+CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
+CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
+# CONFIG_LIBC_STRERROR is not set
+# CONFIG_LIBC_PERROR_STDOUT is not set
+CONFIG_ARCH_LOWPUTC=y
+CONFIG_LIB_SENDFILE_BUFSIZE=512
+# CONFIG_ARCH_ROMGETC is not set
+# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+
+#
+# Non-standard Library Support
+#
+# CONFIG_SCHED_WORKQUEUE is not set
+# CONFIG_LIB_KBDCODEC is not set
+# CONFIG_LIB_SLCDCODEC is not set
+
+#
+# Basic CXX Support
+#
+# CONFIG_C99_BOOL8 is not set
+# CONFIG_HAVE_CXX is not set
+
+#
+# Application Configuration
+#
+
+#
+# Built-In Applications
+#
+CONFIG_BUILTIN_PROXY_STACKSIZE=1024
+
+#
+# Examples
+#
+# CONFIG_EXAMPLES_BUTTONS is not set
+# CONFIG_EXAMPLES_CAN is not set
+# CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_DHCPD is not set
+# CONFIG_EXAMPLES_ELF is not set
+# CONFIG_EXAMPLES_FTPC is not set
+# CONFIG_EXAMPLES_FTPD is not set
+# CONFIG_EXAMPLES_HELLO is not set
+# CONFIG_EXAMPLES_HELLOXX is not set
+# CONFIG_EXAMPLES_JSON is not set
+# CONFIG_EXAMPLES_HIDKBD is not set
+# CONFIG_EXAMPLES_KEYPADTEST is not set
+# CONFIG_EXAMPLES_IGMP is not set
+# CONFIG_EXAMPLES_LCDRW is not set
+# CONFIG_EXAMPLES_MM is not set
+# CONFIG_EXAMPLES_MODBUS is not set
+# CONFIG_EXAMPLES_MOUNT is not set
+# CONFIG_EXAMPLES_NRF24L01TERM is not set
+CONFIG_EXAMPLES_NSH=y
+# CONFIG_EXAMPLES_NULL is not set
+# CONFIG_EXAMPLES_NX 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_POSIXSPAWN is not set
+# CONFIG_EXAMPLES_QENCODER is not set
+# CONFIG_EXAMPLES_RGMP is not set
+# CONFIG_EXAMPLES_ROMFS is not set
+# CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERLOOP is not set
+# CONFIG_EXAMPLES_SLCD is not set
+# CONFIG_EXAMPLES_SMART_TEST is not set
+# CONFIG_EXAMPLES_SMART is not set
+# CONFIG_EXAMPLES_TCPECHO is not set
+# CONFIG_EXAMPLES_TELNETD is not set
+# CONFIG_EXAMPLES_THTTPD is not set
+# CONFIG_EXAMPLES_TIFF is not set
+# CONFIG_EXAMPLES_TOUCHSCREEN is not set
+# CONFIG_EXAMPLES_UDP is not set
+# CONFIG_EXAMPLES_UIP is not set
+# CONFIG_EXAMPLES_USBSERIAL is not set
+# CONFIG_EXAMPLES_USBTERM is not set
+# CONFIG_EXAMPLES_WATCHDOG is not set
+
+#
+# Graphics Support
+#
+# CONFIG_TIFF is not set
+
+#
+# Interpreters
+#
+# CONFIG_INTERPRETERS_FICL is not set
+# CONFIG_INTERPRETERS_PCODE is not set
+
+#
+# Network Utilities
+#
+
+#
+# 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 is not set
+# CONFIG_NETUTILS_SMTP is not set
+# CONFIG_NETUTILS_TELNETD is not set
+# CONFIG_NETUTILS_TFTPC is not set
+# CONFIG_NETUTILS_THTTPD is not set
+# CONFIG_NETUTILS_UIPLIB is not set
+# CONFIG_NETUTILS_WEBCLIENT is not set
+
+#
+# FreeModBus
+#
+# CONFIG_MODBUS is not set
+
+#
+# NSH Library
+#
+CONFIG_NSH_LIBRARY=y
+CONFIG_NSH_BUILTIN_APPS=y
+
+#
+# Disable Individual commands
+#
+# CONFIG_NSH_DISABLE_ADDROUTE is not set
+# CONFIG_NSH_DISABLE_CAT is not set
+# CONFIG_NSH_DISABLE_CD is not set
+# CONFIG_NSH_DISABLE_CP is not set
+# CONFIG_NSH_DISABLE_CMP is not set
+# CONFIG_NSH_DISABLE_DD is not set
+# CONFIG_NSH_DISABLE_DELROUTE is not set
+# CONFIG_NSH_DISABLE_ECHO is not set
+# CONFIG_NSH_DISABLE_EXEC is not set
+# CONFIG_NSH_DISABLE_EXIT is not set
+# CONFIG_NSH_DISABLE_FREE is not set
+# CONFIG_NSH_DISABLE_GET is not set
+# CONFIG_NSH_DISABLE_HELP is not set
+# CONFIG_NSH_DISABLE_HEXDUMP is not set
+# CONFIG_NSH_DISABLE_IFCONFIG is not set
+# CONFIG_NSH_DISABLE_KILL is not set
+# CONFIG_NSH_DISABLE_LOSETUP is not set
+# CONFIG_NSH_DISABLE_LS is not set
+# CONFIG_NSH_DISABLE_MB is not set
+# CONFIG_NSH_DISABLE_MKDIR is not set
+# CONFIG_NSH_DISABLE_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
+
+#
+# Configure Command Options
+#
+# CONFIG_NSH_CMDOPT_DF_H is not set
+CONFIG_NSH_CODECS_BUFSIZE=128
+# CONFIG_NSH_CMDOPT_HEXDUMP is not set
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_LINELEN=80
+CONFIG_NSH_MAXARGUMENTS=6
+CONFIG_NSH_NESTDEPTH=3
+# CONFIG_NSH_DISABLESCRIPT is not set
+# CONFIG_NSH_DISABLEBG is not set
+CONFIG_NSH_CONSOLE=y
+
+#
+# USB Trace Support
+#
+# CONFIG_NSH_CONDEV is not set
+# CONFIG_NSH_ARCHINIT is not set
+
+#
+# NxWidgets/NxWM
+#
+
+#
+# Platform-specific Support
+#
+# CONFIG_PLATFORM_CONFIGDATA is not set
+
+#
+# System NSH Add-Ons
+#
+
+#
+# USB CDC/ACM Device Commands
+#
+
+#
+# USB Composite Device Commands
+#
+
+#
+# Custom Free Memory Command
+#
+# CONFIG_SYSTEM_FREE is not set
+
+#
+# I2C tool
+#
+
+#
+# FLASH Program Installation
+#
+# CONFIG_SYSTEM_INSTALL is not set
+
+#
+# FLASH Erase-all Command
+#
+
+#
+# NxPlayer media player library / command Line
+#
+# CONFIG_SYSTEM_NXPLAYER is not set
+
+#
+# RAM test
+#
+# CONFIG_SYSTEM_RAMTEST is not set
+
+#
+# readline()
+#
+CONFIG_SYSTEM_READLINE=y
+CONFIG_READLINE_ECHO=y
+
+#
+# Power Off
+#
+# CONFIG_SYSTEM_POWEROFF is not set
+
+#
+# RAMTRON
+#
+# CONFIG_SYSTEM_RAMTRON is not set
+
+#
+# SD Card
+#
+# CONFIG_SYSTEM_SDCARD is not set
+
+#
+# Sysinfo
+#
+# CONFIG_SYSTEM_SYSINFO is not set
+
+#
+# USB Monitor
+#
+
+#
+# Stack Monitor
+#
+
+#
+# USB Mass Storage Device Commands
+#
+
+#
+# Zmodem Commands
+#
+# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/nuttx/configs/z16f2800100zcog/nsh/nsh.linkcmd b/nuttx/configs/z16f2800100zcog/nsh/nsh.linkcmd
new file mode 100755
index 000000000..8113bfd35
--- /dev/null
+++ b/nuttx/configs/z16f2800100zcog/nsh/nsh.linkcmd
@@ -0,0 +1,92 @@
+/****************************************************************************/
+/* configs/z16f2800100zcog/nsh/nsh.linkcmd                                  */
+/*                                                                          */
+/*   Copyright (C) 2014 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.                                              */
+/*                                                                          */
+/****************************************************************************/
+
+-FORMAT=OMF695,INTEL32
+-map -maxhexlen=64 -quiet -sort NAME=ascending -unresolved=fatal
+-warnoverlap -NOxref -warn -debug -NOigcase
+
+RANGE ROM    $000000 : $007FFF
+RANGE RAM    $FFB000 : $FFBFFF
+RANGE IODATA $FFC000 : $FFFFFF
+RANGE EROM   $008000 : $01FFFF
+RANGE ERAM   $800000 : $87FFFF
+
+CHANGE NEAR_TEXT=NEAR_DATA
+CHANGE FAR_TEXT=FAR_DATA
+
+ORDER FAR_BSS,  FAR_DATA
+ORDER NEAR_BSS, NEAR_DATA
+COPY  NEAR_DATA EROM
+COPY  FAR_DATA  EROM
+
+define _0_exit             = 0
+define _low_near_romdata   = copy base of NEAR_DATA
+define _low_neardata       = base of NEAR_DATA
+define _len_neardata       = length of NEAR_DATA
+define _low_far_romdata    = copy base of FAR_DATA
+define _low_fardata        = base of FAR_DATA
+define _len_fardata        = length of FAR_DATA
+define _low_nearbss        = base of NEAR_BSS
+define _len_nearbss        = length of NEAR_BSS
+define _low_farbss         = base of FAR_BSS
+define _len_farbss         = length of FAR_BSS
+define _near_heaptop       = highaddr of RAM
+define _far_heaptop        = highaddr of ERAM
+define _far_stack          = highaddr of ERAM
+define _near_stack         = highaddr of RAM
+define _near_heapbot       = top of RAM
+define _far_heapbot        = top of ERAM
+
+define _SYS_CLK_SRC        = 2
+define _SYS_CLK_FREQ       = 20000000
+
+define __EXTCT_INIT_PARAM  = $80
+define __EXTCS0_INIT_PARAM = $8012
+define __EXTCS1_INIT_PARAM = $8001
+define __EXTCS2_INIT_PARAM = $0000
+define __EXTCS3_INIT_PARAM = $0000
+define __EXTCS4_INIT_PARAM = $0000
+define __EXTCS5_INIT_PARAM = $0000
+
+define __PFAF_INIT_PARAM   = $ff
+define __PGAF_INIT_PARAM   = $ff
+define __PDAF_INIT_PARAM   = $ff00
+define __PAAF_INIT_PARAM   = $0000
+define __PCAF_INIT_PARAM   = $0000
+define __PHAF_INIT_PARAM   = $0300
+define __PKAF_INIT_PARAM   = $0f
+
+/* arch/z16/src/Makefile will append target, object and library paths below */
+
diff --git a/nuttx/configs/z16f2800100zcog/nsh/nsh.zfpproj b/nuttx/configs/z16f2800100zcog/nsh/nsh.zfpproj
new file mode 100644
index 000000000..457fa859a
--- /dev/null
+++ b/nuttx/configs/z16f2800100zcog/nsh/nsh.zfpproj
@@ -0,0 +1,245 @@
+<project type="Standard" project-type="Standard" configuration="Debug" created-by="{{build_number}}" modified-by="d:5.0.0:11071102" ZDSII="ZDS - ZNEO 5.0.1 (Build 11071201)">

+<cpu>Z16F2811AL</cpu>

+

+<!-- file information -->

+<files>

+<file filter-key="flash">..\..\..\nuttx.hex</file>

+</files>

+

+<!-- configuration information -->

+<configurations>

+<configuration name="Debug" >

+<tools>

+<tool name="Assembler">

+<options>

+<option name="define" type="string" change-action="assemble">_Z16F2811AL=1,_Z16F_SERIES=1</option>

+<option name="include" type="string" change-action="assemble"></option>

+<option name="list" type="boolean" change-action="none">true</option>

+<option name="listmac" type="boolean" change-action="none">false</option>

+<option name="name" type="boolean" change-action="none">true</option>

+<option name="pagelen" type="integer" change-action="none">56</option>

+<option name="pagewidth" type="integer" change-action="none">80</option>

+<option name="quiet" type="boolean" change-action="none">true</option>

+</options>

+</tool>

+<tool name="Compiler">

+<options>

+<option name="chartype" type="string" change-action="compile">U</option>

+<option name="define" type="string" change-action="compile">_Z16F2811AL,_Z16F_SERIES</option>

+<option name="genprintf" type="boolean" change-action="compile">true</option>

+<option name="keepasm" type="boolean" change-action="none">false</option>

+<option name="keeplst" type="boolean" change-action="none">false</option>

+<option name="list" type="boolean" change-action="none">false</option>

+<option name="listinc" type="boolean" change-action="none">false</option>

+<option name="model" type="string" change-action="compile">S</option>

+<option name="modsect" type="boolean" change-action="compile">false</option>

+<option name="stdinc" type="string" change-action="compile"></option>

+<option name="usrinc" type="string" change-action="compile"></option>

+<option name="regvar" type="boolean" change-action="compile">true</option>

+<option name="regvarcache" type="boolean" change-action="none">false</option>

+<option name="reduceopt" type="boolean" change-action="compile">false</option>

+<option name="watch" type="boolean" change-action="none">false</option>

+</options>

+</tool>

+<tool name="Debugger">

+<options>

+<option name="target" type="string" change-action="rebuild">Z16F2800100ZCOG</option>

+<option name="debugtool" type="string" change-action="none">USBSmartCable</option>

+<option name="usepageerase" type="boolean" change-action="none">true</option>

+</options>

+</tool>

+<tool name="FlashProgrammer">

+<options>

+<option name="erasebeforeburn" type="boolean" change-action="none">false</option>

+<option name="eraseinfopage" type="boolean" change-action="none">false</option>

+<option name="enableinfopage" type="boolean" change-action="none">false</option>

+<option name="includeserial" type="boolean" change-action="none">false</option>

+<option name="offset" type="integer" change-action="none">0</option>

+<option name="snenable" type="boolean" change-action="none">true</option>

+<option name="sn" type="string" change-action="none">000000000000000000000000</option>

+<option name="snsize" type="integer" change-action="none">1</option>

+<option name="snstep" type="integer" change-action="none">000000000000000000000001</option>

+<option name="snstepformat" type="integer" change-action="none">0</option>

+<option name="snaddress" type="string" change-action="none">0</option>

+<option name="snformat" type="integer" change-action="none">0</option>

+<option name="snbigendian" type="boolean" change-action="none">true</option>

+<option name="singleval" type="string" change-action="none">0</option>

+<option name="singlevalformat" type="integer" change-action="none">0</option>

+<option name="usepageerase" type="boolean" change-action="none">false</option>

+<option name="autoselect" type="boolean" change-action="none">true</option>

+</options>

+</tool>

+<tool name="General">

+<options>

+<option name="warn" type="boolean" change-action="none">true</option>

+<option name="debug" type="boolean" change-action="assemble">true</option>

+<option name="debugcache" type="boolean" change-action="none">true</option>

+<option name="igcase" type="boolean" change-action="assemble">false</option>

+<option name="outputdir" type="string" change-action="compile">.</option>

+</options>

+</tool>

+<tool name="Librarian">

+<options>

+<option name="outfile" type="string" change-action="build"></option>

+<option name="warn" type="boolean" change-action="none">false</option>

+</options>

+</tool>

+<tool name="Linker">

+<options>

+<option name="directives" type="string" change-action="build"></option>

+<option name="createnew" type="boolean" change-action="build">false</option>

+<option name="eram" type="string" change-action="build">0-0</option>

+<option name="erom" type="string" change-action="build">0-0</option>

+<option name="exeform" type="string" change-action="build">OMF695,INTEL32</option>

+<option name="fplib" type="string" change-action="build">Dummy</option>

+<option name="iodata" type="string" change-action="build">0-0</option>

+<option name="linkctlfile" type="string" change-action="build"></option>

+<option name="map" type="boolean" change-action="none">true</option>

+<option name="maxhexlen" type="integer" change-action="build">64</option>

+<option name="objlibmods" type="string" change-action="build"></option>

+<option name="of" type="string" change-action="build">.\nsh</option>

+<option name="padhex" type="boolean" change-action="build">false</option>

+<option name="quiet" type="boolean" change-action="none">false</option>

+<option name="ram" type="string" change-action="build">FFB000-FFBFFF</option>

+<option name="relist" type="boolean" change-action="build">false</option>

+<option name="rom" type="string" change-action="build">000000-007FFF</option>

+<option name="sort" type="string" change-action="none">name</option>

+<option name="startuplnkcmds" type="boolean" change-action="build">true</option>

+<option name="startuptype" type="string" change-action="build">1</option>

+<option name="undefisfatal" type="boolean" change-action="none">true</option>

+<option name="useadddirectives" type="boolean" change-action="build">false</option>

+<option name="usecrun" type="boolean" change-action="build">true</option>

+<option name="warnoverlap" type="boolean" change-action="none">false</option>

+<option name="warnisfatal" type="boolean" change-action="none">false</option>

+<option name="xref" type="boolean" change-action="none">false</option>

+</options>

+</tool>

+</tools>

+</configuration>

+<configuration name="Release" >

+<tools>

+<tool name="Assembler">

+<options>

+<option name="define" type="string" change-action="assemble">_Z16F2811AL=1,_Z16F_SERIES=1</option>

+<option name="include" type="string" change-action="assemble"></option>

+<option name="list" type="boolean" change-action="none">true</option>

+<option name="listmac" type="boolean" change-action="none">false</option>

+<option name="name" type="boolean" change-action="none">true</option>

+<option name="pagelen" type="integer" change-action="none">56</option>

+<option name="pagewidth" type="integer" change-action="none">80</option>

+<option name="quiet" type="boolean" change-action="none">true</option>

+</options>

+</tool>

+<tool name="Compiler">

+<options>

+<option name="chartype" type="string" change-action="compile">U</option>

+<option name="define" type="string" change-action="compile">_Z16F2811AL,_Z16F_SERIES</option>

+<option name="genprintf" type="boolean" change-action="compile">true</option>

+<option name="keepasm" type="boolean" change-action="none">false</option>

+<option name="keeplst" type="boolean" change-action="none">false</option>

+<option name="list" type="boolean" change-action="none">false</option>

+<option name="listinc" type="boolean" change-action="none">false</option>

+<option name="model" type="string" change-action="compile">S</option>

+<option name="modsect" type="boolean" change-action="compile">false</option>

+<option name="stdinc" type="string" change-action="compile"></option>

+<option name="usrinc" type="string" change-action="compile"></option>

+<option name="regvar" type="boolean" change-action="compile">true</option>

+<option name="regvarcache" type="boolean" change-action="none">false</option>

+<option name="reduceopt" type="boolean" change-action="compile">false</option>

+<option name="watch" type="boolean" change-action="none">false</option>

+</options>

+</tool>

+<tool name="Debugger">

+<options>

+<option name="target" type="string" change-action="rebuild"></option>

+<option name="debugtool" type="string" change-action="none">ZPAKII</option>

+<option name="usepageerase" type="boolean" change-action="none">true</option>

+</options>

+</tool>

+<tool name="FlashProgrammer">

+<options>

+<option name="erasebeforeburn" type="boolean" change-action="none">false</option>

+<option name="eraseinfopage" type="boolean" change-action="none">false</option>

+<option name="enableinfopage" type="boolean" change-action="none">false</option>

+<option name="includeserial" type="boolean" change-action="none">false</option>

+<option name="offset" type="integer" change-action="none">0</option>

+<option name="snenable" type="boolean" change-action="none">false</option>

+<option name="sn" type="string" change-action="none">0</option>

+<option name="snsize" type="integer" change-action="none">0</option>

+<option name="snstep" type="integer" change-action="none">1</option>

+<option name="snstepformat" type="integer" change-action="none">0</option>

+<option name="snaddress" type="string" change-action="none">0</option>

+<option name="snformat" type="integer" change-action="none">0</option>

+<option name="snbigendian" type="boolean" change-action="none">true</option>

+<option name="singleval" type="string" change-action="none">0</option>

+<option name="singlevalformat" type="integer" change-action="none">0</option>

+<option name="usepageerase" type="boolean" change-action="none">false</option>

+<option name="autoselect" type="boolean" change-action="none">true</option>

+</options>

+</tool>

+<tool name="General">

+<options>

+<option name="warn" type="boolean" change-action="none">true</option>

+<option name="debug" type="boolean" change-action="assemble">false</option>

+<option name="debugcache" type="boolean" change-action="none">true</option>

+<option name="igcase" type="boolean" change-action="assemble">false</option>

+<option name="outputdir" type="string" change-action="compile">.</option>

+</options>

+</tool>

+<tool name="Librarian">

+<options>

+<option name="outfile" type="string" change-action="build"></option>

+<option name="warn" type="boolean" change-action="none">false</option>

+</options>

+</tool>

+<tool name="Linker">

+<options>

+<option name="directives" type="string" change-action="build"></option>

+<option name="createnew" type="boolean" change-action="build">false</option>

+<option name="eram" type="string" change-action="build">0-0</option>

+<option name="erom" type="string" change-action="build">0-0</option>

+<option name="exeform" type="string" change-action="build">OMF695,INTEL32</option>

+<option name="fplib" type="string" change-action="build">Dummy</option>

+<option name="iodata" type="string" change-action="build">0-0</option>

+<option name="linkctlfile" type="string" change-action="build"></option>

+<option name="map" type="boolean" change-action="none">true</option>

+<option name="maxhexlen" type="integer" change-action="build">64</option>

+<option name="objlibmods" type="string" change-action="build"></option>

+<option name="of" type="string" change-action="build">.\nsh</option>

+<option name="padhex" type="boolean" change-action="build">false</option>

+<option name="quiet" type="boolean" change-action="none">false</option>

+<option name="ram" type="string" change-action="build">FFB000-FFBFFF</option>

+<option name="relist" type="boolean" change-action="build">false</option>

+<option name="rom" type="string" change-action="build">000000-007FFF</option>

+<option name="sort" type="string" change-action="none">name</option>

+<option name="startuplnkcmds" type="boolean" change-action="build">true</option>

+<option name="startuptype" type="string" change-action="build">1</option>

+<option name="undefisfatal" type="boolean" change-action="none">true</option>

+<option name="useadddirectives" type="boolean" change-action="build">false</option>

+<option name="usecrun" type="boolean" change-action="build">true</option>

+<option name="warnoverlap" type="boolean" change-action="none">false</option>

+<option name="warnisfatal" type="boolean" change-action="none">false</option>

+<option name="xref" type="boolean" change-action="none">false</option>

+</options>

+</tool>

+</tools>

+</configuration>

+</configurations>

+

+<!-- watch information -->

+<watch-elements>

+<watch-element expression="0x801d1a" />

+</watch-elements>

+

+<!-- breakpoint information -->

+<breakpoints>

+<breakpoint temporary="false" enabled="true" >

+<line-number>0</line-number>

+<pathname></pathname>

+<address>37442</address>

+<command></command>

+<preserve-type>1</preserve-type>

+</breakpoint>

+</breakpoints>

+

+</project>
\ No newline at end of file
diff --git a/nuttx/configs/z16f2800100zcog/nsh/setenv.sh b/nuttx/configs/z16f2800100zcog/nsh/setenv.sh
new file mode 100755
index 000000000..726b980f8
--- /dev/null
+++ b/nuttx/configs/z16f2800100zcog/nsh/setenv.sh
@@ -0,0 +1,64 @@
+#!/bin/bash
+# configs/z16f2800100zcog/nsh/setenv.sh
+#
+#   Copyright (C) 2014 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.
+#
+# Check how we were executed
+#
+
+if [ "$_" = "$0" ] ; then
+  echo "You must source this script, not run it!" 1>&2
+  exit 1
+fi
+
+WD=`pwd`
+if [ ! -x "setenv.sh" ]; then
+  echo "This script must be executed from the top-level NuttX build directory"
+  exit 1
+fi
+
+if [ -z "${PATH_ORIG}" ]; then
+  export PATH_ORIG="${PATH}"
+fi
+
+#
+# This is the Cygwin path to location where the XDS-II tools were installed
+#
+TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/ZiLOG/ZDSII_ZNEO_5.0.1/bin"
+
+#
+# Add the path to the toolchain to the PATH variable.  NOTE that /bin and /usr/bin
+# preceded the toolchain bin directory.  This is because the ZDSII bin directory
+# includes binaries like make.exe that will interfere with the normal build process
+# if we do not give priority to the versions at /bin and /usr/bin.
+#
+export PATH="/bin:/usr/bin:${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
+echo "PATH : ${PATH}"
diff --git a/nuttx/configs/z16f2800100zcog/ostest/README.txt b/nuttx/configs/z16f2800100zcog/ostest/README.txt
index ad4a1b1cd..b859b0089 100644
--- a/nuttx/configs/z16f2800100zcog/ostest/README.txt
+++ b/nuttx/configs/z16f2800100zcog/ostest/README.txt
@@ -7,11 +7,11 @@ OSTEST Project
 ostest.zfpproj is a simple ZDS II - ZNEO 5.0.1 project that will allow you
   to use the ZDS-II debugger.  Before using, copy the following files from
   the toplevel directory:
-  
+
     nuttx.hex, nuttx.map, nuttx.lod
-  
+
   to this directory as:
-  
+
     ostest.hex, ostest.map, ostest.lod
 
 ostest.zdzbak is a project file for an older ZDS-II 4.0 version (There is no
diff --git a/nuttx/configs/z16f2800100zcog/ostest/ostest.linkcmd b/nuttx/configs/z16f2800100zcog/ostest/ostest.linkcmd
index 17539ad57..85e9dc157 100755
--- a/nuttx/configs/z16f2800100zcog/ostest/ostest.linkcmd
+++ b/nuttx/configs/z16f2800100zcog/ostest/ostest.linkcmd
@@ -2,7 +2,7 @@
 /* configs/z16f2800100zcog/ostest/ostest.linkcmd                            */
 /*                                                                          */
 /*   Copyright (C) 2008 Gregory Nutt. All rights reserved.                  */
-/*   Author: Gregory Nutt <gnutt@nuttx.org>                          */
+/*   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       */
diff --git a/nuttx/configs/z16f2800100zcog/pashello/pashello.linkcmd b/nuttx/configs/z16f2800100zcog/pashello/pashello.linkcmd
index f519219fb..84cf3e0e0 100755
--- a/nuttx/configs/z16f2800100zcog/pashello/pashello.linkcmd
+++ b/nuttx/configs/z16f2800100zcog/pashello/pashello.linkcmd
@@ -2,7 +2,7 @@
 /* configs/z16f2800100zcog/pashello/pashello.linkcmd                        */
 /*                                                                          */
 /*   Copyright (C) 2008 Gregory Nutt. All rights reserved.                  */
-/*   Author: Gregory Nutt <gnutt@nuttx.org>                          */
+/*   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       */
diff --git a/nuttx/include/sys/wait.h b/nuttx/include/sys/wait.h
index 2476adef9..18dc0c975 100644
--- a/nuttx/include/sys/wait.h
+++ b/nuttx/include/sys/wait.h
@@ -56,9 +56,9 @@
  *   Other values - Not implemented
  */
 
-#define WEXITSTATUS(s)  (((s) >> 8) & 0xff)/* Return exit status */
-
+#define WEXITSTATUS(s)  (((s) >> 8) & 0xff) /* Return exit status */
 #define WIFEXITED(s)    (((s) & 0xff) == 0) /* True: Child exited normally */
+
 #define WIFCONTINUED(s) (false)  /* True: Child has been continued */
 #define WIFSIGNALED(s)  (false)  /* True: Child exited due to uncaught signal */
 #define WIFSTOPPED(s)   (false)  /* True: Child is currently stopped */
@@ -70,13 +70,11 @@
  */
 
 #define WCONTINUED      (1 << 0) /* Status for child that has been continued (1)(2) */
-#define WNOHANG         (1 << 1) /* Do not wait if status not available (1) */
+#define WNOHANG         (1 << 1) /* Do not wait if status not available (1) (2) */
 #define WUNTRACED       (1 << 2) /* Report status of stopped child process (1) */
-
 #define WEXITED         (1 << 3) /* Wait for processes that have exited (2) */
 #define WSTOPPED        (1 << 4) /* Status for child stopped on signal (2) */
-#define WNOHANG         (1 << 5) /* Return immediately if there are no children (2) */
-#define WNOWAIT         (1 << 6) /* Keep the process in a waitable state (2) */
+#define WNOWAIT         (1 << 5) /* Keep the process in a waitable state (2) */
 
 /****************************************************************************
  * Public Type Definitions