Update documentation, change CONFIG_EXAMPLES_NSH to CONFIG_NSH

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3394 42af7a65-404d-4744-a932-0658087f49c3
2026-05-22 13:52:22 +08:00 · 2011-03-18 20:35:31 +00:00
parent 715cd48f70
commit 34e8f21889
141 changed files with 4920 additions and 4888 deletions
@@ -1847,21 +1847,21 @@ extern void up_ledoff(int led);
    indirectly through the <code>mount()</code> API.
    The <code>mount()</code> API binds a block driver instance with a file system and with a mountpoint.
    Then the user may use the block driver to access the file system on the underlying media.
-    <i>Example</i>: See the <code>cmd_mount()</code> implementation in <code>examples/nsh/nsh_fscmds.c</code>.
+    <i>Example</i>: See the <code>cmd_mount()</code> implementation in <code>apps/nshlib/nsh_fscmds.c</code>.
    </p>
  </li>
  <li>
    <p>
    <b>Accessing a Character Driver as a Block Device</b>.
    See the loop device at <code>drivers/loop.c</code>.
-    <i>Example</i>: See the <code>cmd_losetup()</code> implementation in <code>examples/nsh/nsh_fscmds.c</code>.
+    <i>Example</i>: See the <code>cmd_losetup()</code> implementation in <code>apps/nshlib/nsh_fscmds.c</code>.
    </p>
  </li>
  <li>
    <p>
    <b>Accessing a Block Driver as Character Device</b>.
    See the Block-to-Character (BCH) conversion logic in <code>drivers/bch/</code>.
-    <i>Example</i>: See the <code>cmd_dd()</code> implementation in <code>examples/nsh/nsh_ddcmd.c</code>.
+    <i>Example</i>: See the <code>cmd_dd()</code> implementation in <code>apps/nshlib/nsh_ddcmd.c</code>.
    </p>
  </li>
  <li>
@@ -17,7 +17,7 @@ NuttX TODO List (Last updated March 16 2011)
  (1)  Pascal add-on (pcode/)
  (1)  Documentation (Documentation/)
  (5)  Build system / Toolchains
-  (4)  NuttShell (NSH) (examples/nsh)
+  (4)  NuttShell (NSH) (apps/nshlib)
  (3)  Other Applications & Tests (examples/)
  (7)  Linux/Cywgin simulation (arch/sim)
  (3)  ARM (arch/arm/)
@@ -226,7 +226,7 @@ o Network (net/, drivers/net)
  Priority:    Medium

  Description: Need to standardize collection of statistics from network
-               drivers.  examples/nsh ifconfig command should present
+               drivers.  apps/nshlib ifconfig command should present
               statistics.
  Status:      Open
  Priority:    Low
@@ -237,7 +237,7 @@ o Network (net/, drivers/net)
               solution is simple: A mutex will be needed to make sure that each 
               send that is started is able to be the exclusive sender until all of
               the data to be sent has been ACKed.
-  Status:      Open.  There is some temporary logic to examples/nsh that does
+  Status:      Open.  There is some temporary logic to apps/nshlib that does
               this same fix and that temporary logic should be removed when
               send() is fixed.
  Priority:    Medium-Low.  This is an important issue for applications that
@@ -551,8 +551,8 @@ o Build system
  Priority:    High if you are using NX and a newer compiler.
               

-o NuttShell (NSH) (examples/nsh)
-  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+o NuttShell (NSH) (apps/nshlib)
+  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

  Description: When the telnetd front end is received, each TCP packet
               received causes a prompt (nsh >) to be presented.  The
@@ -670,71 +670,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/usbserial
@@ -670,71 +670,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/usbserial
@@ -400,16 +400,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)

 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)

 #
 # Settings for examples/wget
@@ -400,16 +400,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)

 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)

 #
 # Settings for examples/wget
@@ -400,16 +400,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)

 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)

 #
 # Settings for examples/wget
@@ -400,16 +400,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)

 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=n
-CONFIG_EXAMPLES_NSH_TELNET=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=n
+CONFIG_NSH_TELNET=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)

 #
 # Settings for examples/wget
@@ -645,71 +645,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=512
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=512
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=512
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/usbserial
@@ -41,7 +41,7 @@ ASRCS		=
 AOBJS		= $(ASRCS:.S=$(OBJEXT))

 CSRCS		= up_boot.c up_leds.c up_buttons.c up_spi.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 COBJS		= $(CSRCS:.c=$(OBJEXT))
@@ -768,71 +768,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/usbserial
@@ -775,71 +775,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/usbserial
@@ -702,71 +702,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/usbserial
@@ -39,7 +39,7 @@ CFLAGS		+= -I$(TOPDIR)/sched

 ASRCS		= 
 CSRCS		= up_boot.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif

@@ -59,37 +59,37 @@
 /* Configuration ************************************************************/

 #ifdef CONFIG_ARCH_BOARD_DETRON
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
-#  define CONFIG_EXAMPLES_NSH_HAVEUSBHOST 1
+#  undef CONFIG_NSH_HAVEMMCSD
+#  define CONFIG_NSH_HAVEUSBHOST 1
 #else
 #  error "Unrecognized board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#  undef CONFIG_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBHOST
 #endif

 /* Can't support MMC/SD features if mountpoints are disabled */

 #if defined(CONFIG_DISABLE_MOUNTPOINT)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif

 /* MMC/SD PORT and SLOT number probably depend on the board configuration */

-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0
+#ifdef CONFIG_NSH_HAVEMMCSD
+#  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
 #    error "The Detron MMC/SD is on SSP0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0
+#    undef CONFIG_NSH_MMCSDSPIPORTNO
+#    define CONFIG_NSH_MMCSDSPIPORTNO 0
 #  endif
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "The Detron MMC/SD is only one slot (0)"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#    undef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #endif

-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif

 /* USB Host */
@@ -107,10 +107,10 @@
 #endif

 #if !defined(CONFIG_USBHOST) || !defined(CONFIG_LPC17_USBHOST)
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#  undef CONFIG_NSH_HAVEUSBHOST
 #endif

-#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#ifdef CONFIG_NSH_HAVEUSBHOST
 #  ifndef CONFIG_USBHOST_DEFPRIO
 #    define CONFIG_USBHOST_DEFPRIO 50
 #  endif
@@ -139,7 +139,7 @@
 * Private Data
 ****************************************************************************/

-#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#ifdef CONFIG_NSH_HAVEUSBHOST
 static struct usbhost_driver_s *g_drvr;
 #endif

@@ -155,7 +155,7 @@ static struct usbhost_driver_s *g_drvr;
 *
 ****************************************************************************/

-#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#ifdef CONFIG_NSH_HAVEUSBHOST
 static int nsh_waiter(int argc, char *argv[])
 {
  bool connected = false;
@@ -196,7 +196,7 @@ static int nsh_waiter(int argc, char *argv[])
 *
 ****************************************************************************/

-#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#ifdef CONFIG_NSH_HAVEUSBHOST
 static int nsh_usbhostinitialize(void)
 {
  int pid;
@@ -254,7 +254,7 @@ static int nsh_usbhostinitialize(void)
 *
 ****************************************************************************/

-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
 int nsh_sdinitialize(void)
 {
  FAR struct spi_dev_s *ssp;
@@ -262,29 +262,29 @@ int nsh_sdinitialize(void)

  /* Get the SSP port */

-  ssp = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+  ssp = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
  if (!ssp)
    {
      message("nsh_archinitialize: Failed to initialize SSP port %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+              CONFIG_NSH_MMCSDSPIPORTNO);
      return -ENODEV;
    }

  message("Successfully initialized SSP port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);

  /* Bind the SSP port to the slot */

-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ssp);
+  ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR, CONFIG_NSH_MMCSDSLOTNO, ssp);
  if (ret < 0)
    {
      message("nsh_archinitialize: Failed to bind SSP port %d to MMC/SD slot %d: %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret);
+              CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO, ret);
      return ret;
    }

  message("Successfuly bound SSP port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
  return OK;
 }
 #else
@@ -774,71 +774,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/usbserial
@@ -654,71 +654,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/usbserial
@@ -654,71 +654,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/usbserial
@@ -799,71 +799,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/usbserial
@@ -53,7 +53,7 @@ endif
 ifeq ($(CONFIG_LPC313X_SPI),y)
 CSRCS		+= up_spi.c
 endif
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 ifeq ($(CONFIG_PAGING),y)
@@ -61,26 +61,26 @@
 /* PORT and SLOT number probably depend on the board configuration */

 #ifdef CONFIG_ARCH_BOARD_EA3131
-#  define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
-#  define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#  if defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) && CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  define CONFIG_NSH_HAVEUSBDEV 1
+#  define CONFIG_NSH_HAVEMMCSD  1
+#  if defined(CONFIG_NSH_MMCSDSLOTNO) && CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "Only one MMC/SD slot"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
+#    undef CONFIG_NSH_MMCSDSLOTNO
 #  endif
-#  ifndef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#  ifndef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #else
   /* Add configuration for new LPC313X boards here */
 #  error "Unrecognized LPC313X board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif

 /* Can't support USB features if USB is not enabled */

 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif

 /* Can't support MMC/SD features if mountpoints are disabled or if SDIO support
@@ -88,11 +88,11 @@
 */

 #if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_LPC313X_MCI)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif

-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif

 /* Debug ********************************************************************/
@@ -125,27 +125,27 @@

 int nsh_archinitialize(void)
 {
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
  FAR struct sdio_dev_s *sdio;
  int ret;

  /* First, get an instance of the SDIO interface */

  message("nsh_archinitialize: Initializing SDIO slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
-  sdio = sdio_initialize(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSLOTNO);
+  sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO);
  if (!sdio)
    {
      message("nsh_archinitialize: Failed to initialize SDIO slot %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+              CONFIG_NSH_MMCSDSLOTNO);
      return -ENODEV;
    }

  /* Now bind the SPI interface to the MMC/SD driver */

  message("nsh_archinitialize: Bind SDIO to the MMC/SD driver, minor=%d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDMINOR);
-  ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, sdio);
+          CONFIG_NSH_MMCSDMINOR);
+  ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio);
  if (ret != OK)
    {
      message("nsh_archinitialize: Failed to bind SDIO to the MMC/SD driver: %d\n", ret);
@@ -657,71 +657,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/usbserial
@@ -657,71 +657,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/usbserial
@@ -520,71 +520,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/dhcpd
@@ -511,71 +511,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Stack and heap information
@@ -496,71 +496,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Stack and heap information
@@ -509,71 +509,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Stack and heap information
@@ -503,71 +503,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Stack and heap information
@@ -40,7 +40,7 @@ CFLAGS		+= -I$(TOPDIR)/sched
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_boot.c up_leds.c up_ethernet.c up_ssi.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 COBJS		= $(CSRCS:.c=$(OBJEXT))
@@ -56,39 +56,39 @@
 /* PORT and SLOT number probably depend on the board configuration */

 #ifdef CONFIG_ARCH_BOARD_EAGLE100
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  define CONFIG_NSH_HAVEMMCSD  1
+#  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
 #    error "The Eagle100 MMC/SD is on SSI0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0
+#    undef CONFIG_NSH_MMCSDSPIPORTNO
+#    define CONFIG_NSH_MMCSDSPIPORTNO 0
 #  endif
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "The Eagle100 MMC/SD is on SSI0 slot 0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#    undef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #else
   /* Add configuration for new LM3s boards here */
 #  error "Unrecognized lm3s board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif

 /* Can't support USB features if USB is not enabled */

 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif

 /* Can't support MMC/SD features if mountpoints are disabled */

 #if defined(CONFIG_DISABLE_MOUNTPOINT)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif

-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif

 /* Debug ********************************************************************/
@@ -127,33 +127,33 @@ int nsh_archinitialize(void)
  /* Get the SPI port */

  message("nsh_archinitialize: Initializing SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);

-  spi = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+  spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
  if (!spi)
    {
      message("nsh_archinitialize: Failed to initialize SPI port %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+              CONFIG_NSH_MMCSDSPIPORTNO);
      return -ENODEV;
    }

  message("nsh_archinitialize: Successfully initialized SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);

  /* Bind the SPI port to the slot */

  message("nsh_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);

-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR, CONFIG_NSH_MMCSDSLOTNO, spi);
  if (ret < 0)
    {
      message("nsh_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret);
+              CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO, ret);
      return ret;
    }

  message("nsh_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
  return OK;
 }
@@ -607,71 +607,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Stack and heap information
@@ -638,66 +638,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLES_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+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

 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/nx
@@ -665,66 +665,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLES_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+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

 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/dhcpd
@@ -673,66 +673,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLES_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+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

 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/dhcpd
@@ -665,66 +665,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLES_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+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

 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/nx
@@ -665,66 +665,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLES_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+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

 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/nx
@@ -648,66 +648,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLES_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+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

 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/nx
@@ -665,66 +665,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=1024
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
-CONFIG_EXAMPLES_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=1024
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10L<<24|0L<<16|0L<<8|2L)
+CONFIG_NSH_DRIPADDR=(10L<<24|0L<<16|0L<<8|1L)
+CONFIG_NSH_NETMASK=(255L<<24|255L<<16|255L<<8|0L)
+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

 #
 # Architecture-specific NSH options
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/nx
@@ -520,71 +520,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=y
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Stack and heap information
@@ -641,71 +641,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/nx
@@ -517,71 +517,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Stack and heap information
@@ -40,7 +40,7 @@ CFLAGS		+= -I$(TOPDIR)/sched
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_boot.c up_leds.c up_ethernet.c up_ssi.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 ifeq ($(CONFIG_NX_LCDDRIVER),y)
@@ -56,39 +56,39 @@
 /* PORT and SLOT number probably depend on the board configuration */

 #ifdef CONFIG_ARCH_BOARD_LM3S6965EK
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  define CONFIG_NSH_HAVEMMCSD  1
+#  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
 #    error "The LM3S6965 Eval Kit MMC/SD is on SSI0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0
+#    undef CONFIG_NSH_MMCSDSPIPORTNO
+#    define CONFIG_NSH_MMCSDSPIPORTNO 0
 #  endif
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "The LM3S6965 Eval Kit MMC/SD is on SSI0 slot 0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#    undef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #else
   /* Add configuration for new LM3s boards here */
 #  error "Unrecognized lm3s board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif

 /* Can't support USB features if USB is not enabled */

 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif

 /* Can't support MMC/SD features if mountpoints are disabled */

 #if defined(CONFIG_DISABLE_MOUNTPOINT)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif

-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif

 /* Debug ********************************************************************/
@@ -127,33 +127,33 @@ int nsh_archinitialize(void)
  /* Get the SPI port */

  message("nsh_archinitialize: Initializing SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);

-  spi = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+  spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
  if (!spi)
    {
      message("nsh_archinitialize: Failed to initialize SPI port %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+              CONFIG_NSH_MMCSDSPIPORTNO);
      return -ENODEV;
    }

  message("nsh_archinitialize: Successfully initialized SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);

  /* Bind the SPI port to the slot */

  message("nsh_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);

-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR, CONFIG_NSH_MMCSDSLOTNO, spi);
  if (ret < 0)
    {
      message("nsh_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret);
+              CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO, ret);
      return ret;
    }

  message("nsh_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
  return OK;
 }
@@ -520,71 +520,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=y
-CONFIG_EXAMPLES_NSH_ARCHINIT=y
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=y
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=y
+CONFIG_NSH_ARCHINIT=y
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=y
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Stack and heap information
@@ -640,71 +640,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Settings for examples/nx
@@ -517,71 +517,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048
 CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3

 #
-# Settings for examples/nsh
+# Settings for apps/nshlib
 #
-# CONFIG_EXAMPLES_NSH_FILEIOSIZE - Size of a static I/O buffer
-# CONFIG_EXAMPLES_NSH_STRERROR - Use strerror(errno)
-# CONFIG_EXAMPLES_NSH_LINELEN - Maximum length of one command line
-# CONFIG_EXAMPLES_NSH_STACKSIZE - Stack size to use for new threads.
-# CONFIG_EXAMPLES_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
-# CONFIG_EXAMPLES_NSH_DISABLESCRIPT - Disable scripting support
-# CONFIG_EXAMPLES_NSH_DISABLEBG - Disable background commands
-# CONFIG_EXAMPLES_NSH_ROMFSETC - Use startup script in /etc
-# CONFIG_EXAMPLES_NSH_CONSOLE - Use serial console front end
-# CONFIG_EXAMPLES_NSH_TELNET - Use telnetd console front end
-# CONFIG_EXAMPLES_NSH_ARCHINIT - Platform provides architecture
+# CONFIG_NSH_FILEIOSIZE - Size of a static I/O buffer
+# CONFIG_NSH_STRERROR - Use strerror(errno)
+# CONFIG_NSH_LINELEN - Maximum length of one command line
+# CONFIG_NSH_STACKSIZE - Stack size to use for new threads.
+# CONFIG_NSH_NESTDEPTH - Max number of nested if-then[-else]-fi
+# CONFIG_NSH_DISABLESCRIPT - Disable scripting support
+# CONFIG_NSH_DISABLEBG - Disable background commands
+# CONFIG_NSH_ROMFSETC - Use startup script in /etc
+# CONFIG_NSH_CONSOLE - Use serial console front end
+# CONFIG_NSH_TELNET - Use telnetd console front end
+# CONFIG_NSH_ARCHINIT - Platform provides architecture
 #   specific initialization (nsh_archinitialize()).
 #
-# If CONFIG_EXAMPLES_NSH_TELNET is selected:
-# CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
-# CONFIG_EXAMPLES_NSH_DHCPC - Obtain address using DHCP
-# CONFIG_EXAMPLES_NSH_IPADDR - Provides static IP address
-# CONFIG_EXAMPLES_NSH_DRIPADDR - Provides static router IP address
-# CONFIG_EXAMPLES_NSH_NETMASK - Provides static network mask
-# CONFIG_EXAMPLES_NSH_NOMAC - Use a bogus MAC address
+# If CONFIG_NSH_TELNET is selected:
+# CONFIG_NSH_IOBUFFER_SIZE -- Telnetd I/O buffer size
+# CONFIG_NSH_DHCPC - Obtain address using DHCP
+# CONFIG_NSH_IPADDR - Provides static IP address
+# CONFIG_NSH_DRIPADDR - Provides static router IP address
+# CONFIG_NSH_NETMASK - Provides static network mask
+# CONFIG_NSH_NOMAC - Use a bogus MAC address
 #
-# If CONFIG_EXAMPLES_NSH_ROMFSETC is selected:
-# CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT - ROMFS mountpoint
-# CONFIG_EXAMPLES_NSH_INITSCRIPT - Relative path to init script
-# CONFIG_EXAMPLES_NSH_ROMFSDEVNO - ROMFS RAM device minor
-# CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE - ROMF sector size
-# CONFIG_EXAMPLES_NSH_FATDEVNO - FAT FS RAM device minor
-# CONFIG_EXAMPLES_NSH_FATSECTSIZE - FAT FS sector size
-# CONFIG_EXAMPLES_NSH_FATNSECTORS - FAT FS number of sectors
-# CONFIG_EXAMPLES_NSH_FATMOUNTPT - FAT FS mountpoint
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ROMFSMOUNTPT - ROMFS mountpoint
+# CONFIG_NSH_INITSCRIPT - Relative path to init script
+# CONFIG_NSH_ROMFSDEVNO - ROMFS RAM device minor
+# CONFIG_NSH_ROMFSSECTSIZE - ROMF sector size
+# CONFIG_NSH_FATDEVNO - FAT FS RAM device minor
+# CONFIG_NSH_FATSECTSIZE - FAT FS sector size
+# CONFIG_NSH_FATNSECTORS - FAT FS number of sectors
+# CONFIG_NSH_FATMOUNTPT - FAT FS mountpoint
 #
-CONFIG_EXAMPLES_NSH_FILEIOSIZE=512
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=64
-CONFIG_EXAMPLES_NSH_STACKSIZE=2048
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=n
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_ARCHINIT=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
-CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT="/etc"
-CONFIG_EXAMPLES_NSH_INITSCRIPT="init.d/rcS"
-CONFIG_EXAMPLES_NSH_ROMFSDEVNO=0
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=1
-CONFIG_EXAMPLES_NSH_FATSECTSIZE=512
-CONFIG_EXAMPLES_NSH_FATNSECTORS=1024
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_FILEIOSIZE=512
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=64
+CONFIG_NSH_STACKSIZE=2048
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=n
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_ARCHINIT=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+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

 #
 # Architecture-specific NSH options
 #
-CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=0
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0

 #
 # Stack and heap information
@@ -40,7 +40,7 @@ CFLAGS		+= -I$(TOPDIR)/sched
 ASRCS		= 
 AOBJS		= $(ASRCS:.S=$(OBJEXT))
 CSRCS		= up_boot.c up_leds.c up_ethernet.c up_ssi.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
 CSRCS		+= up_nsh.c
 endif
 ifeq ($(CONFIG_NX_LCDDRIVER),y)
@@ -56,39 +56,39 @@
 /* PORT and SLOT number probably depend on the board configuration */

 #ifdef CONFIG_ARCH_BOARD_LM3S8962EK
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  define CONFIG_EXAMPLES_NSH_HAVEMMCSD  1
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  define CONFIG_NSH_HAVEMMCSD  1
+#  if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
 #    error "The LM3S8962 Eval Kit MMC/SD is on SSI0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 0
+#    undef CONFIG_NSH_MMCSDSPIPORTNO
+#    define CONFIG_NSH_MMCSDSPIPORTNO 0
 #  endif
-#  if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#  if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
 #    error "The LM3S8962 Eval Kit MMC/SD is on SSI0 slot 0"
-#    undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-#    define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+#    undef CONFIG_NSH_MMCSDSLOTNO
+#    define CONFIG_NSH_MMCSDSLOTNO 0
 #  endif
 #else
   /* Add configuration for new LM3s boards here */
 #  error "Unrecognized lm3s board"
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif

 /* Can't support USB features if USB is not enabled */

 #ifndef CONFIG_USBDEV
-#  undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+#  undef CONFIG_NSH_HAVEUSBDEV
 #endif

 /* Can't support MMC/SD features if mountpoints are disabled */

 #if defined(CONFIG_DISABLE_MOUNTPOINT)
-#  undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#  undef CONFIG_NSH_HAVEMMCSD
 #endif

-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-#  define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+#  define CONFIG_NSH_MMCSDMINOR 0
 #endif

 /* Debug ********************************************************************/
@@ -127,33 +127,33 @@ int nsh_archinitialize(void)
  /* Get the SPI port */

  message("nsh_archinitialize: Initializing SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);

-  spi = up_spiinitialize(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+  spi = up_spiinitialize(CONFIG_NSH_MMCSDSPIPORTNO);
  if (!spi)
    {
      message("nsh_archinitialize: Failed to initialize SPI port %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+              CONFIG_NSH_MMCSDSPIPORTNO);
      return -ENODEV;
    }

  message("nsh_archinitialize: Successfully initialized SPI port %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO);

  /* Bind the SPI port to the slot */

  message("nsh_archinitialize: Binding SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);

-  ret = mmcsd_spislotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, spi);
+  ret = mmcsd_spislotinitialize(CONFIG_NSH_MMCSDMINOR, CONFIG_NSH_MMCSDSLOTNO, spi);
  if (ret < 0)
    {
      message("nsh_archinitialize: Failed to bind SPI port %d to MMC/SD slot %d: %d\n",
-              CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO, ret);
+              CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO, ret);
      return ret;
    }

  message("nsh_archinitialize: Successfuly bound SPI port %d to MMC/SD slot %d\n",
-          CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO, CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+          CONFIG_NSH_MMCSDSPIPORTNO, CONFIG_NSH_MMCSDSLOTNO);
  return OK;
 }
@@ -346,16 +346,16 @@ CONFIG_NET_RESOLV_ENTRIES=4

 #
 # Settings for examples/nsh
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=n
-CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512
-CONFIG_EXAMPLES_NSH_CMD_SIZE=40
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_DHCPC=n
-CONFIG_EXAMPLES_NSH_NOMAC=n
-CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
-CONFIG_EXAMPLES_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
-CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0)
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_DHCPC=n
+CONFIG_NSH_NOMAC=n
+CONFIG_NSH_IPADDR=(10<<24|0<<16|0<<8|2)
+CONFIG_NSH_DRIPADDR=(10<<24|0<<16|0<<8|1)
+CONFIG_NSH_NETMASK=(255<<24|255<<16|255<<8|0)

 #
 # Stack and heap information
--- a/Show More
+++ b/Show More