-
Configuration Options.
- The additional
CONFIG_EXAMPLES_NSH_ROMFSETC configuration options
+ The additional CONFIG_NSH_ROMFSETC configuration options
discussed with the other NSH-specific configuration settings.
-
@@ -602,14 +604,14 @@ mount -t vfat /dev/ram1 /tmp
- The configuration settings then installed configuration.
- The
genromfs tool (available from http://romfs.sourceforge.net).
- - The file
examples/nsh/rcS.template
- (OR, if CONFIG_EXAMPLES_NSH_ARCHROMFS is defined include/arch/board/rcs.template.
+ - The file
apps/nshlib/rcS.template
+ (OR, if CONFIG_NSH_ARCHROMFS is defined include/arch/board/rcs.template.
-
rcS.template.
- The file examples/nsh/rcS.template contains the general form
+ The file apps/nshlib/rcS.template contains the general form
of the rcS file; configured values are plugged into this
template file to produce the final rcS file.
@@ -617,8 +619,8 @@ mount -t vfat /dev/ram1 /tmp
NOTE:
- examples/nsh/rcS.template generates the standard, default nsh_romfsimg.h file.
- If CONFIG_EXAMPLES_NSH_ARCHROMFS is defined in the NuttX configuration file, then a custom, board-specific nsh_romfsimg.h file residing in configs/<board>/include will be used.
+ apps/nshlib/rcS.template generates the standard, default nsh_romfsimg.h file.
+ If CONFIG_NSH_ARCHROMFS is defined in the NuttX configuration file, then a custom, board-specific nsh_romfsimg.h file residing in configs/<board>/include will be used.
NOTE when the OS is configured, include/arch/board will be linked to configs/<board>/include.
@@ -1817,192 +1819,192 @@ nsh>
[ |
- !CONFIG_EXAMPLES_NSH_DISABLESCRIPT |
- CONFIG_EXAMPLES_NSH_DISABLE_TEST |
+ !CONFIG_NSH_DISABLESCRIPT |
+ CONFIG_NSH_DISABLE_TEST |
cat |
CONFIG_NFILE_DESCRIPTORS > 0 |
- CONFIG_EXAMPLES_NSH_DISABLE_CAT |
+ CONFIG_NSH_DISABLE_CAT |
cd |
!CONFIG_DISABLE_ENVIRON && CONFIG_NFILE_DESCRIPTORS > 0 |
- CONFIG_EXAMPLES_NSH_DISABLE_CD |
+ CONFIG_NSH_DISABLE_CD |
cp |
CONFIG_NFILE_DESCRIPTORS > 0 |
- CONFIG_EXAMPLES_NSH_DISABLE_CP |
+ CONFIG_NSH_DISABLE_CP |
dd |
CONFIG_NFILE_DESCRIPTORS > 0 |
- CONFIG_EXAMPLES_NSH_DISABLE_DD |
+ CONFIG_NSH_DISABLE_DD |
echo |
|
- CONFIG_EXAMPLES_NSH_DISABLE_ECHO |
+ CONFIG_NSH_DISABLE_ECHO |
exec |
|
- CONFIG_EXAMPLES_NSH_DISABLE_EXEC |
+ CONFIG_NSH_DISABLE_EXEC |
exit |
|
- CONFIG_EXAMPLES_NSH_DISABLE_EXIT |
+ CONFIG_NSH_DISABLE_EXIT |
free |
|
- CONFIG_EXAMPLES_NSH_DISABLE_FREE |
+ CONFIG_NSH_DISABLE_FREE |
get |
CONFIG_NET && CONFIG_NET_UDP &&
CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NET_BUFSIZE >= 5581 |
- CONFIG_EXAMPLES_NSH_DISABLE_GET |
+ CONFIG_NSH_DISABLE_GET |
help |
|
- CONFIG_EXAMPLES_NSH_DISABLE_HELP |
+ CONFIG_NSH_DISABLE_HELP |
ifconfig |
CONFIG_NET |
- CONFIG_EXAMPLES_NSH_DISABLE_IFCONFIG |
+ CONFIG_NSH_DISABLE_IFCONFIG |
kill |
!CONFIG_DISABLE_SIGNALS |
- CONFIG_EXAMPLES_NSH_DISABLE_KILL |
+ CONFIG_NSH_DISABLE_KILL |
losetup |
!CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 |
- CONFIG_EXAMPLES_NSH_DISABLE_LOSETUP |
+ CONFIG_NSH_DISABLE_LOSETUP |
ls |
CONFIG_NFILE_DESCRIPTORS > 0 |
- CONFIG_EXAMPLES_NSH_DISABLE_LS |
+ CONFIG_NSH_DISABLE_LS |
mb,mh,mw |
|
- CONFIG_EXAMPLES_NSH_DISABLE_MB,
- CONFIG_EXAMPLES_NSH_DISABLE_MH,
- CONFIG_EXAMPLES_NSH_DISABLE_MW
+ CONFIG_NSH_DISABLE_MB,
+ CONFIG_NSH_DISABLE_MH,
+ CONFIG_NSH_DISABLE_MW
|
mkdir |
!CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_FS_WRITABLE4 |
- CONFIG_EXAMPLES_NSH_DISABLE_MKDIR |
+ CONFIG_NSH_DISABLE_MKDIR |
mkfatfs |
!CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_FS_FAT |
- CONFIG_EXAMPLES_NSH_DISABLE_MKFATFS |
+ CONFIG_NSH_DISABLE_MKFATFS |
mkfifo |
CONFIG_NFILE_DESCRIPTORS > 0 |
- CONFIG_EXAMPLES_NSH_DISABLE_MKFIFO |
+ CONFIG_NSH_DISABLE_MKFIFO |
mkrd |
!CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_FS_WRITABLE4 |
- CONFIG_EXAMPLES_NSH_DISABLE_MKRD |
+ CONFIG_NSH_DISABLE_MKRD |
mount |
!CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_FS_READABLE3 |
- CONFIG_EXAMPLES_NSH_DISABLE_MOUNT |
+ CONFIG_NSH_DISABLE_MOUNT |
ping |
CONFIG_NET && CONFIG_NET_ICMP &&
CONFIG_NET_ICMP_PING && !CONFIG_DISABLE_CLOCK &&
!CONFIG_DISABLE_SIGNALS |
- CONFIG_EXAMPLES_NSH_DISABLE_PING |
+ CONFIG_NSH_DISABLE_PING |
ps |
|
- CONFIG_EXAMPLES_NSH_DISABLE_PS |
+ CONFIG_NSH_DISABLE_PS |
put |
CONFIG_NET && CONFIG_NET_UDP &&
CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NET_BUFSIZE >= 5581,2 |
- CONFIG_EXAMPLES_NSH_DISABLE_PUT |
+ CONFIG_NSH_DISABLE_PUT |
pwd |
!CONFIG_DISABLE_ENVIRON && CONFIG_NFILE_DESCRIPTORS > 0 |
- CONFIG_EXAMPLES_NSH_DISABLE_PWD |
+ CONFIG_NSH_DISABLE_PWD |
rm |
!CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_FS_WRITABLE4 |
- CONFIG_EXAMPLES_NSH_DISABLE_RM |
+ CONFIG_NSH_DISABLE_RM |
rmdir |
!CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_FS_WRITABLE4 |
- CONFIG_EXAMPLES_NSH_DISABLE_RMDIR |
+ CONFIG_NSH_DISABLE_RMDIR |
set |
!CONFIG_DISABLE_ENVIRON |
- CONFIG_EXAMPLES_NSH_DISABLE_SET |
+ CONFIG_NSH_DISABLE_SET |
sh |
- CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !CONFIG_EXAMPLES_NSH_DISABLESCRIPT |
- CONFIG_EXAMPLES_NSH_DISABLE_SH |
+ CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !CONFIG_NSH_DISABLESCRIPT |
+ CONFIG_NSH_DISABLE_SH |
sleep |
!CONFIG_DISABLE_SIGNALS |
- CONFIG_EXAMPLES_NSH_DISABLE_SLEEP |
+ CONFIG_NSH_DISABLE_SLEEP |
test |
- !CONFIG_EXAMPLES_NSH_DISABLESCRIPT |
- CONFIG_EXAMPLES_NSH_DISABLE_TEST |
+ !CONFIG_NSH_DISABLESCRIPT |
+ CONFIG_NSH_DISABLE_TEST |
umount |
!CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_FS_READABLE3 |
- CONFIG_EXAMPLES_NSH_DISABLE_UMOUNT |
+ CONFIG_NSH_DISABLE_UMOUNT |
unset |
!CONFIG_DISABLE_ENVIRON |
- CONFIG_EXAMPLES_NSH_DISABLE_UNSET |
+ CONFIG_NSH_DISABLE_UNSET |
usleep |
!CONFIG_DISABLE_SIGNALS |
- CONFIG_EXAMPLES_NSH_DISABLE_USLEEP |
+ CONFIG_NSH_DISABLE_USLEEP |
wget |
CONFIG_NET && CONFIG_NET_TCP &&
CONFIG_NFILE_DESCRIPTORS > 0 |
- CONFIG_EXAMPLES_NSH_DISABLE_WGET |
+ CONFIG_NSH_DISABLE_WGET |
xd |
|
- CONFIG_EXAMPLES_NSH_DISABLE_XD |
+ CONFIG_NSH_DISABLE_XD |
@@ -2039,28 +2041,28 @@ nsh>
Description |
- CONFIG_EXAMPLES_NSH_FILEIOSIZE |
+ CONFIG_NSH_FILEIOSIZE |
Size of a static I/O buffer used for file access (ignored if
there is no filesystem). Default is 1024.
|
- CONFIG_EXAMPLES_NSH_STRERROR |
+ CONFIG_NSH_STRERROR |
strerror(errno) makes more readable output but strerror() is
very large and will not be used unless this setting is y
|
- CONFIG_EXAMPLES_NSH_LINELEN |
+ CONFIG_NSH_LINELEN |
The maximum length of one command line and of one output line.
Default: 80
|
- CONFIG_EXAMPLES_NSH_STACKSIZE |
+ CONFIG_NSH_STACKSIZE |
The stack size to use when spawning new threads or tasks. Such
new threads are generated when a command is executed in background
@@ -2068,14 +2070,14 @@ nsh>
|
- CONFIG_EXAMPLES_NSH_NESTDEPTH |
+ CONFIG_NSH_NESTDEPTH |
The maximum number of nested if-then[-else]-fi sequences that
are permissable. Default: 3
|
- CONFIG_EXAMPLES_NSH_DISABLESCRIPT |
+ CONFIG_NSH_DISABLESCRIPT |
This can be set to y to suppress support for scripting. This
setting disables the sh, test, and [ commands and the
@@ -2084,7 +2086,7 @@ nsh>
|
- CONFIG_EXAMPLES_NSH_DISABLEBG |
+ CONFIG_NSH_DISABLEBG |
This can be set to y to suppress support for background
commands. This setting disables the nice command prefix and
@@ -2093,7 +2095,7 @@ nsh>
|
- CONFIG_EXAMPLES_NSH_MMCSDMINOR |
+ CONFIG_NSH_MMCSDMINOR |
If the architecture supports an MMC/SD slot and if the NSH
architecture specific logic is present, this option will provide
@@ -2103,7 +2105,7 @@ nsh>
|
- CONFIG_EXAMPLES_NSH_ROMFSETC |
+ CONFIG_NSH_ROMFSETC |
Mount a ROMFS filesystem at /etc and provide a startup script
at /etc/init.d/rcS. The default startup script will mount
@@ -2112,25 +2114,25 @@ nsh>
|
- CONFIG_EXAMPLES_NSH_CONSOLE |
+ CONFIG_NSH_CONSOLE |
- If CONFIG_EXAMPLES_NSH_CONSOLEis set to y, then a serial
+ If CONFIG_NSH_CONSOLEis set to y, then a serial
console front-end is selected.
|
- CONFIG_EXAMPLES_NSH_TELNET |
+ CONFIG_NSH_TELNET |
- If CONFIG_EXAMPLES_NSH_TELNET is set to y, then a TELENET
+ If CONFIG_NSH_TELNET is set to y, then a TELENET
server front-end is selected. When this option is provided,
you may log into NuttX remotely using telnet in order to
access NSH.
|
- CONFIG_EXAMPLES_NSH_ARCHINIT |
+ CONFIG_NSH_ARCHINIT |
- Set CONFIG_EXAMPLES_NSH_ARCHINIT if your board provides architecture
+ Set CONFIG_NSH_ARCHINIT if your board provides architecture
specific initialization via the board-specific function nsh_archinitialize().
This function will be called early in NSH initialization to allow board logic to
do such things as configure MMC/SD slots.
@@ -2139,8 +2141,8 @@ nsh>
- One or both of CONFIG_EXAMPLES_NSH_CONSOLE and CONFIG_EXAMPLES_NSH_TELNET
- must be defined. If CONFIG_EXAMPLES_NSH_TELNET is selected, then there some
+ One or both of CONFIG_NSH_CONSOLE and CONFIG_NSH_TELNET
+ must be defined. If CONFIG_NSH_TELNET is selected, then there some
other configuration settings that apply:
@@ -2167,39 +2169,39 @@ nsh>
TCP/IP support is required for telnet (as well as various other TCP-related configuration settings).
|
- CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE |
+ CONFIG_NSH_IOBUFFER_SIZE |
Determines the size of the I/O buffer to use for sending/
receiving TELNET commands/reponses
|
- CONFIG_EXAMPLES_NSH_DHCPC |
+ CONFIG_NSH_DHCPC |
Obtain the IP address via DHCP.
|
- CONFIG_EXAMPLES_NSH_IPADDR |
+ CONFIG_NSH_IPADDR |
- If CONFIG_EXAMPLES_NSH_DHCPC is NOT set, then the static IP
+ If CONFIG_NSH_DHCPC is NOT set, then the static IP
address must be provided.
|
- CONFIG_EXAMPLES_NSH_DRIPADDR |
+ CONFIG_NSH_DRIPADDR |
Default router IP address
|
- CONFIG_EXAMPLES_NSH_NETMASK |
+ CONFIG_NSH_NETMASK |
Network mask
|
- CONFIG_EXAMPLES_NSH_NOMAC |
+ CONFIG_NSH_NOMAC |
Set if your ethernet hardware has no built-in MAC address.
If set, a bogus MAC will be assigned.
@@ -2251,7 +2253,7 @@ nsh>
- If CONFIG_EXAMPLES_NSH_ROMFSETC is selected, then the following additional
+ If CONFIG_NSH_ROMFSETC is selected, then the following additional
configuration setting apply:
@@ -2261,13 +2263,13 @@ nsh>
| Description |
- CONFIG_EXAMPLES_NSH_ARCHROMFS |
+ CONFIG_NSH_ARCHROMFS |
May be defined to specify an alternative ROMFS image that can be found at configs/<board>/include/nsh_romfsimg.h.
|
- CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT |
+ CONFIG_NSH_ROMFSMOUNTPT |
The default mountpoint for the ROMFS volume is "/etc", but that
can be changed with this setting. This must be a absolute path
@@ -2275,7 +2277,7 @@ nsh>
|
- CONFIG_EXAMPLES_NSH_INITSCRIPT |
+ CONFIG_NSH_INITSCRIPT |
This is the relative path to the startup script within the mountpoint.
The default is "init.d/rcS". This is a relative path and must not
@@ -2283,14 +2285,14 @@ nsh>
|
- CONFIG_EXAMPLES_NSH_ROMFSDEVNO |
+ CONFIG_NSH_ROMFSDEVNO |
This is the minor number of the ROMFS block device. The default is
'0' corresponding to /dev/ram0.
|
- CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE |
+ CONFIG_NSH_ROMFSSECTSIZE |
This is the sector size to use with the ROMFS volume. Since the
default volume is very small, this defaults to 64 but should be
@@ -2301,7 +2303,7 @@ nsh>
- When the default rcS file used when CONFIG_EXAMPLES_NSH_ROMFSETC is
+ When the default rcS file used when CONFIG_NSH_ROMFSETC is
selected, it will mount a FAT FS under /tmp. The following selections
describe that FAT FS.
@@ -2312,14 +2314,14 @@ nsh>
| Description |
- CONFIG_EXAMPLES_NSH_FATDEVNO |
+ CONFIG_NSH_FATDEVNO |
This is the minor number of the FAT FS block device. The default is
'1' corresponding to /dev/ram1.
|
- CONFIG_EXAMPLES_NSH_FATSECTSIZE |
+ CONFIG_NSH_FATSECTSIZE |
This is the sector size use with the FAT FS. Default is 512.
|
@@ -2346,31 +2348,31 @@ nsh>
cd- Command summaries
- Conditional command execution
- CONFIG_EXAMPLES_NSH_CONSOLECONFIG_EXAMPLES_NSH_DHCPCCONFIG_EXAMPLES_NSH_DISABLEBGCONFIG_EXAMPLES_NSH_DISABLESCRIPTCONFIG_EXAMPLES_NSH_DRIPADDRCONFIG_EXAMPLES_NSH_FATDEVNOCONFIG_EXAMPLES_NSH_FATMOUNTPTCONFIG_EXAMPLES_NSH_FATNSECTORSCONFIG_EXAMPLES_NSH_FATSECTSIZECONFIG_EXAMPLES_NSH_FILEIOSIZECONFIG_EXAMPLES_NSH_INITSCRIPTCONFIG_EXAMPLES_NSH_IOBUFFER_SIZECONFIG_EXAMPLES_NSH_IPADDRCONFIG_EXAMPLES_NSH_LINELENCONFIG_EXAMPLES_NSH_NESTDEPTHCONFIG_EXAMPLES_NSH_NETMASKCONFIG_EXAMPLES_NSH_NOMACCONFIG_EXAMPLES_NSH_ROMFSDEVNOCONFIG_EXAMPLES_NSH_ROMFSETCCONFIG_EXAMPLES_NSH_ARCHROMFSCONFIG_EXAMPLES_NSH_ROMFSMOUNTPTCONFIG_EXAMPLES_NSH_ROMFSSECTSIZECONFIG_EXAMPLES_NSH_STACKSIZECONFIG_EXAMPLES_NSH_STRERRORCONFIG_EXAMPLES_NSH_TELNETCONFIG_NSH_CONSOLECONFIG_NSH_DHCPCCONFIG_NSH_DISABLEBGCONFIG_NSH_DISABLESCRIPTCONFIG_NSH_DRIPADDRCONFIG_NSH_FATDEVNOCONFIG_NSH_FATMOUNTPTCONFIG_NSH_FATNSECTORSCONFIG_NSH_FATSECTSIZECONFIG_NSH_FILEIOSIZECONFIG_NSH_INITSCRIPTCONFIG_NSH_IOBUFFER_SIZECONFIG_NSH_IPADDRCONFIG_NSH_LINELENCONFIG_NSH_NESTDEPTHCONFIG_NSH_NETMASKCONFIG_NSH_NOMACCONFIG_NSH_ROMFSDEVNOCONFIG_NSH_ROMFSETCCONFIG_NSH_ARCHROMFSCONFIG_NSH_ROMFSMOUNTPTCONFIG_NSH_ROMFSSECTSIZECONFIG_NSH_STACKSIZECONFIG_NSH_STRERRORCONFIG_NSH_TELNET- Configuration settings
- Configuration settings, command dependencies
- Configuration settings, NSH-specific
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html
index 6e5c1d56510..ae26bf3a22d 100644
--- a/Documentation/NuttxPortingGuide.html
+++ b/Documentation/NuttxPortingGuide.html
@@ -1847,21 +1847,21 @@ extern void up_ledoff(int led);
indirectly through the mount() API.
The mount() 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.
- Example: See the cmd_mount() implementation in examples/nsh/nsh_fscmds.c.
+ Example: See the cmd_mount() implementation in apps/nshlib/nsh_fscmds.c.
-
Accessing a Character Driver as a Block Device.
See the loop device at drivers/loop.c.
- Example: See the cmd_losetup() implementation in examples/nsh/nsh_fscmds.c.
+ Example: See the cmd_losetup() implementation in apps/nshlib/nsh_fscmds.c.
-
Accessing a Block Driver as Character Device.
See the Block-to-Character (BCH) conversion logic in drivers/bch/.
- Example: See the cmd_dd() implementation in examples/nsh/nsh_ddcmd.c.
+ Example: See the cmd_dd() implementation in apps/nshlib/nsh_ddcmd.c.
-
diff --git a/TODO b/TODO
index ee9638a0b12..b2a3c731714 100644
--- a/TODO
+++ b/TODO
@@ -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
diff --git a/configs/avr32dev1/nsh/defconfig b/configs/avr32dev1/nsh/defconfig
index cacd37b1804..27e791eba1f 100755
--- a/configs/avr32dev1/nsh/defconfig
+++ b/configs/avr32dev1/nsh/defconfig
@@ -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
diff --git a/configs/avr32dev1/ostest/defconfig b/configs/avr32dev1/ostest/defconfig
index d42dc96dcdd..58eb351f78a 100755
--- a/configs/avr32dev1/ostest/defconfig
+++ b/configs/avr32dev1/ostest/defconfig
@@ -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
diff --git a/configs/c5471evm/defconfig b/configs/c5471evm/defconfig
index 15d5f7f068a..9ecfa331b87 100644
--- a/configs/c5471evm/defconfig
+++ b/configs/c5471evm/defconfig
@@ -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
diff --git a/configs/c5471evm/dhcpconfig b/configs/c5471evm/dhcpconfig
index ccfa1e7aa89..fcad5b52ad0 100644
--- a/configs/c5471evm/dhcpconfig
+++ b/configs/c5471evm/dhcpconfig
@@ -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
diff --git a/configs/c5471evm/netconfig b/configs/c5471evm/netconfig
index b28b4c4e976..657c04885c3 100644
--- a/configs/c5471evm/netconfig
+++ b/configs/c5471evm/netconfig
@@ -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
diff --git a/configs/c5471evm/nshconfig b/configs/c5471evm/nshconfig
index b557874da3f..7c5ab6fa58c 100644
--- a/configs/c5471evm/nshconfig
+++ b/configs/c5471evm/nshconfig
@@ -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
diff --git a/configs/demo9s12ne64/ostest/defconfig b/configs/demo9s12ne64/ostest/defconfig
index 21151bb63ea..c986c1a54de 100755
--- a/configs/demo9s12ne64/ostest/defconfig
+++ b/configs/demo9s12ne64/ostest/defconfig
@@ -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
diff --git a/configs/demo9s12ne64/src/Makefile b/configs/demo9s12ne64/src/Makefile
index 7ae8ccc8a3c..f63df971981 100755
--- a/configs/demo9s12ne64/src/Makefile
+++ b/configs/demo9s12ne64/src/Makefile
@@ -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))
diff --git a/configs/detron/hidkbd/defconfig b/configs/detron/hidkbd/defconfig
index b0e767579ea..f432dc2ce0c 100755
--- a/configs/detron/hidkbd/defconfig
+++ b/configs/detron/hidkbd/defconfig
@@ -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
diff --git a/configs/detron/nsh/defconfig b/configs/detron/nsh/defconfig
index 3480dd7797a..af2e99c27cd 100755
--- a/configs/detron/nsh/defconfig
+++ b/configs/detron/nsh/defconfig
@@ -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
diff --git a/configs/detron/ostest/defconfig b/configs/detron/ostest/defconfig
index 60907131195..9f45c1c05b2 100755
--- a/configs/detron/ostest/defconfig
+++ b/configs/detron/ostest/defconfig
@@ -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
diff --git a/configs/detron/src/Makefile b/configs/detron/src/Makefile
index 1d6d01355a3..dbae8322654 100755
--- a/configs/detron/src/Makefile
+++ b/configs/detron/src/Makefile
@@ -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
diff --git a/configs/detron/src/up_nsh.c b/configs/detron/src/up_nsh.c
index cac549ee7a3..5a74f8d7393 100755
--- a/configs/detron/src/up_nsh.c
+++ b/configs/detron/src/up_nsh.c
@@ -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
diff --git a/configs/detron/wlan/defconfig b/configs/detron/wlan/defconfig
index 504fe356b77..aa298ae0e7b 100755
--- a/configs/detron/wlan/defconfig
+++ b/configs/detron/wlan/defconfig
@@ -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
diff --git a/configs/ea3131/nsh/defconfig b/configs/ea3131/nsh/defconfig
index 15bf7abc902..a6f47266ee1 100755
--- a/configs/ea3131/nsh/defconfig
+++ b/configs/ea3131/nsh/defconfig
@@ -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
diff --git a/configs/ea3131/ostest/defconfig b/configs/ea3131/ostest/defconfig
index 0688c1e81b0..2f81e3961e4 100755
--- a/configs/ea3131/ostest/defconfig
+++ b/configs/ea3131/ostest/defconfig
@@ -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
diff --git a/configs/ea3131/pgnsh/defconfig b/configs/ea3131/pgnsh/defconfig
index 676e59419e8..5d4a54ab1e8 100755
--- a/configs/ea3131/pgnsh/defconfig
+++ b/configs/ea3131/pgnsh/defconfig
@@ -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
diff --git a/configs/ea3131/src/Makefile b/configs/ea3131/src/Makefile
index d624bd3ea62..cb3cc3da8d9 100755
--- a/configs/ea3131/src/Makefile
+++ b/configs/ea3131/src/Makefile
@@ -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)
diff --git a/configs/ea3131/src/up_nsh.c b/configs/ea3131/src/up_nsh.c
index 115f59f8b91..c0848c9f1a4 100755
--- a/configs/ea3131/src/up_nsh.c
+++ b/configs/ea3131/src/up_nsh.c
@@ -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);
diff --git a/configs/ea3131/usbserial/defconfig b/configs/ea3131/usbserial/defconfig
index 6758fcaa09a..d4df3b0c52d 100755
--- a/configs/ea3131/usbserial/defconfig
+++ b/configs/ea3131/usbserial/defconfig
@@ -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
diff --git a/configs/ea3131/usbstorage/defconfig b/configs/ea3131/usbstorage/defconfig
index 9ff7a9911c2..273510689fe 100755
--- a/configs/ea3131/usbstorage/defconfig
+++ b/configs/ea3131/usbstorage/defconfig
@@ -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
diff --git a/configs/eagle100/httpd/defconfig b/configs/eagle100/httpd/defconfig
index f9ed1245201..110b9c0c86b 100644
--- a/configs/eagle100/httpd/defconfig
+++ b/configs/eagle100/httpd/defconfig
@@ -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
diff --git a/configs/eagle100/nettest/defconfig b/configs/eagle100/nettest/defconfig
index ded9f0f1913..07d61b821d6 100644
--- a/configs/eagle100/nettest/defconfig
+++ b/configs/eagle100/nettest/defconfig
@@ -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
diff --git a/configs/eagle100/nsh/defconfig b/configs/eagle100/nsh/defconfig
index bb09da1b6ef..8f2bdfe65bc 100644
--- a/configs/eagle100/nsh/defconfig
+++ b/configs/eagle100/nsh/defconfig
@@ -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
diff --git a/configs/eagle100/nxflat/defconfig b/configs/eagle100/nxflat/defconfig
index 50d5e98dc70..55edb913b8c 100644
--- a/configs/eagle100/nxflat/defconfig
+++ b/configs/eagle100/nxflat/defconfig
@@ -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
diff --git a/configs/eagle100/ostest/defconfig b/configs/eagle100/ostest/defconfig
index a71bf61f46a..e2fb3e6fab2 100644
--- a/configs/eagle100/ostest/defconfig
+++ b/configs/eagle100/ostest/defconfig
@@ -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
diff --git a/configs/eagle100/src/Makefile b/configs/eagle100/src/Makefile
index 79fb8a558dc..df734e7a325 100644
--- a/configs/eagle100/src/Makefile
+++ b/configs/eagle100/src/Makefile
@@ -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))
diff --git a/configs/eagle100/src/up_nsh.c b/configs/eagle100/src/up_nsh.c
index 184523c929c..31d9adebd8e 100644
--- a/configs/eagle100/src/up_nsh.c
+++ b/configs/eagle100/src/up_nsh.c
@@ -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;
}
diff --git a/configs/eagle100/thttpd/defconfig b/configs/eagle100/thttpd/defconfig
index 54ddb6b5b84..09abbd97c6a 100644
--- a/configs/eagle100/thttpd/defconfig
+++ b/configs/eagle100/thttpd/defconfig
@@ -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
diff --git a/configs/ez80f910200kitg/ostest/defconfig b/configs/ez80f910200kitg/ostest/defconfig
index 7aaabc009ee..a7ac41c99e8 100644
--- a/configs/ez80f910200kitg/ostest/defconfig
+++ b/configs/ez80f910200kitg/ostest/defconfig
@@ -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
diff --git a/configs/ez80f910200zco/dhcpd/defconfig b/configs/ez80f910200zco/dhcpd/defconfig
index 7d283d23b0d..0b9b60c4c20 100644
--- a/configs/ez80f910200zco/dhcpd/defconfig
+++ b/configs/ez80f910200zco/dhcpd/defconfig
@@ -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
diff --git a/configs/ez80f910200zco/httpd/defconfig b/configs/ez80f910200zco/httpd/defconfig
index deb71f1a9eb..d12b966f1d5 100644
--- a/configs/ez80f910200zco/httpd/defconfig
+++ b/configs/ez80f910200zco/httpd/defconfig
@@ -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
diff --git a/configs/ez80f910200zco/nettest/defconfig b/configs/ez80f910200zco/nettest/defconfig
index 47994153b90..22774b4ecdc 100644
--- a/configs/ez80f910200zco/nettest/defconfig
+++ b/configs/ez80f910200zco/nettest/defconfig
@@ -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
diff --git a/configs/ez80f910200zco/nsh/defconfig b/configs/ez80f910200zco/nsh/defconfig
index f91c216d20b..238f9d9851a 100644
--- a/configs/ez80f910200zco/nsh/defconfig
+++ b/configs/ez80f910200zco/nsh/defconfig
@@ -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
diff --git a/configs/ez80f910200zco/ostest/defconfig b/configs/ez80f910200zco/ostest/defconfig
index 2022ff608cc..1be716ff8cc 100644
--- a/configs/ez80f910200zco/ostest/defconfig
+++ b/configs/ez80f910200zco/ostest/defconfig
@@ -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
diff --git a/configs/ez80f910200zco/poll/defconfig b/configs/ez80f910200zco/poll/defconfig
index cdbb56604e9..755a5c93a4b 100644
--- a/configs/ez80f910200zco/poll/defconfig
+++ b/configs/ez80f910200zco/poll/defconfig
@@ -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
diff --git a/configs/lm3s6965-ek/nsh/defconfig b/configs/lm3s6965-ek/nsh/defconfig
index 3cdb92a6987..03b6c35343d 100755
--- a/configs/lm3s6965-ek/nsh/defconfig
+++ b/configs/lm3s6965-ek/nsh/defconfig
@@ -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
diff --git a/configs/lm3s6965-ek/nx/defconfig b/configs/lm3s6965-ek/nx/defconfig
index a39c01208d3..f4f7a23532f 100755
--- a/configs/lm3s6965-ek/nx/defconfig
+++ b/configs/lm3s6965-ek/nx/defconfig
@@ -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
diff --git a/configs/lm3s6965-ek/ostest/defconfig b/configs/lm3s6965-ek/ostest/defconfig
index fc17aeb8685..13876f7a353 100755
--- a/configs/lm3s6965-ek/ostest/defconfig
+++ b/configs/lm3s6965-ek/ostest/defconfig
@@ -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
diff --git a/configs/lm3s6965-ek/src/Makefile b/configs/lm3s6965-ek/src/Makefile
index dfb59a4ed31..58ea3f35199 100755
--- a/configs/lm3s6965-ek/src/Makefile
+++ b/configs/lm3s6965-ek/src/Makefile
@@ -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)
diff --git a/configs/lm3s6965-ek/src/up_nsh.c b/configs/lm3s6965-ek/src/up_nsh.c
index b8f13879c34..4b06974001c 100755
--- a/configs/lm3s6965-ek/src/up_nsh.c
+++ b/configs/lm3s6965-ek/src/up_nsh.c
@@ -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;
}
diff --git a/configs/lm3s8962-ek/nsh/defconfig b/configs/lm3s8962-ek/nsh/defconfig
index 0b653237138..c3718a69aaf 100755
--- a/configs/lm3s8962-ek/nsh/defconfig
+++ b/configs/lm3s8962-ek/nsh/defconfig
@@ -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
diff --git a/configs/lm3s8962-ek/nx/defconfig b/configs/lm3s8962-ek/nx/defconfig
index e386634a7f2..c34d4440d2c 100755
--- a/configs/lm3s8962-ek/nx/defconfig
+++ b/configs/lm3s8962-ek/nx/defconfig
@@ -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
diff --git a/configs/lm3s8962-ek/ostest/defconfig b/configs/lm3s8962-ek/ostest/defconfig
index 7e7c84dda4c..f434ea83571 100755
--- a/configs/lm3s8962-ek/ostest/defconfig
+++ b/configs/lm3s8962-ek/ostest/defconfig
@@ -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
diff --git a/configs/lm3s8962-ek/src/Makefile b/configs/lm3s8962-ek/src/Makefile
index 8c5d10bc4a5..fbea519beaf 100755
--- a/configs/lm3s8962-ek/src/Makefile
+++ b/configs/lm3s8962-ek/src/Makefile
@@ -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)
diff --git a/configs/lm3s8962-ek/src/up_nsh.c b/configs/lm3s8962-ek/src/up_nsh.c
index 999013b13ea..d21edc46b73 100755
--- a/configs/lm3s8962-ek/src/up_nsh.c
+++ b/configs/lm3s8962-ek/src/up_nsh.c
@@ -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;
}
diff --git a/configs/m68332evb/defconfig b/configs/m68332evb/defconfig
index db8c91dde06..83e09d88180 100644
--- a/configs/m68332evb/defconfig
+++ b/configs/m68332evb/defconfig
@@ -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
diff --git a/configs/mbed/hidkbd/defconfig b/configs/mbed/hidkbd/defconfig
index a4e45838ff4..f66a96fa349 100644
--- a/configs/mbed/hidkbd/defconfig
+++ b/configs/mbed/hidkbd/defconfig
@@ -773,71 +773,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=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/usbserial
diff --git a/configs/mbed/nsh/defconfig b/configs/mbed/nsh/defconfig
index 6e482ff6559..1de314b2e6c 100755
--- a/configs/mbed/nsh/defconfig
+++ b/configs/mbed/nsh/defconfig
@@ -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=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
diff --git a/configs/mbed/src/Makefile b/configs/mbed/src/Makefile
index 5bbf1d13c17..98b824b66b5 100755
--- a/configs/mbed/src/Makefile
+++ b/configs/mbed/src/Makefile
@@ -39,7 +39,7 @@ CFLAGS += -I$(TOPDIR)/sched
ASRCS =
CSRCS = up_boot.c up_leds.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c
endif
ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
diff --git a/configs/mbed/src/up_nsh.c b/configs/mbed/src/up_nsh.c
index 8d0cfd47248..f8c46bc8101 100755
--- a/configs/mbed/src/up_nsh.c
+++ b/configs/mbed/src/up_nsh.c
@@ -56,16 +56,16 @@
/* PORT and SLOT number probably depend on the board configuration */
#ifdef CONFIG_ARCH_BOARD_MBED
-# define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
+# define CONFIG_NSH_HAVEUSBDEV 1
#else
# error "Unrecognized board"
-# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+# undef CONFIG_NSH_HAVEUSBDEV
#endif
/* Can't support USB features if USB is not enabled */
#ifndef CONFIG_USBDEV
-# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+# undef CONFIG_NSH_HAVEUSBDEV
#endif
/* Debug ********************************************************************/
diff --git a/configs/mcu123-lpc214x/nsh/defconfig b/configs/mcu123-lpc214x/nsh/defconfig
index 4d781194e26..bb064a9c083 100644
--- a/configs/mcu123-lpc214x/nsh/defconfig
+++ b/configs/mcu123-lpc214x/nsh/defconfig
@@ -544,70 +544,70 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
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=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
#
# Stack and heap information
diff --git a/configs/mcu123-lpc214x/ostest/defconfig b/configs/mcu123-lpc214x/ostest/defconfig
index 29331a9fa15..6da3ffeec83 100644
--- a/configs/mcu123-lpc214x/ostest/defconfig
+++ b/configs/mcu123-lpc214x/ostest/defconfig
@@ -534,70 +534,70 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
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=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
#
# Stack and heap information
diff --git a/configs/mcu123-lpc214x/src/Makefile b/configs/mcu123-lpc214x/src/Makefile
index 431d85fc0df..e3f86453fd4 100644
--- a/configs/mcu123-lpc214x/src/Makefile
+++ b/configs/mcu123-lpc214x/src/Makefile
@@ -48,7 +48,7 @@ endif
ASRCS =
AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = up_spi.c up_leds.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c
endif
ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
diff --git a/configs/mcu123-lpc214x/src/up_nsh.c b/configs/mcu123-lpc214x/src/up_nsh.c
index 9518862c8c9..1e1ee3c36ba 100644
--- a/configs/mcu123-lpc214x/src/up_nsh.c
+++ b/configs/mcu123-lpc214x/src/up_nsh.c
@@ -56,39 +56,39 @@
/* PORT and SLOT number probably depend on the board configuration */
#ifdef CONFIG_ARCH_BOARD_MCU123
-# define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
-# define CONFIG_EXAMPLES_NSH_HAVEMMCSD 1
-# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 1
+# define CONFIG_NSH_HAVEUSBDEV 1
+# define CONFIG_NSH_HAVEMMCSD 1
+# if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 1
# error "The LPC214x MMC/SD is on SPI1"
-# undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-# define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 1
+# undef CONFIG_NSH_MMCSDSPIPORTNO
+# define CONFIG_NSH_MMCSDSPIPORTNO 1
# endif
-# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+# if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
# error "The LPC214x MMC/SD is on SPI1"
-# 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 LPC214x boards here */
# error "Unrecognized LPC214x 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;
}
diff --git a/configs/mcu123-lpc214x/usbserial/defconfig b/configs/mcu123-lpc214x/usbserial/defconfig
index 57643cea90d..87bc15b2433 100644
--- a/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/configs/mcu123-lpc214x/usbserial/defconfig
@@ -535,70 +535,70 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
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=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/usbserial
diff --git a/configs/mcu123-lpc214x/usbstorage/defconfig b/configs/mcu123-lpc214x/usbstorage/defconfig
index aa6f392ba7e..24dd6c429ae 100644
--- a/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/configs/mcu123-lpc214x/usbstorage/defconfig
@@ -535,69 +535,69 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
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
-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
+# 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_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=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/usbserial
diff --git a/configs/mx1ads/ostest/defconfig b/configs/mx1ads/ostest/defconfig
index 06ab2a83fca..0c63113cc13 100644
--- a/configs/mx1ads/ostest/defconfig
+++ b/configs/mx1ads/ostest/defconfig
@@ -524,16 +524,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)
#
# DM90x0 Driver Settings
diff --git a/configs/ne64badge/ostest/defconfig b/configs/ne64badge/ostest/defconfig
index b2d74a5e620..87a3ae170fa 100755
--- a/configs/ne64badge/ostest/defconfig
+++ b/configs/ne64badge/ostest/defconfig
@@ -656,71 +656,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
diff --git a/configs/ne64badge/src/Makefile b/configs/ne64badge/src/Makefile
index 2f8f0b390a6..07081cd59f5 100755
--- a/configs/ne64badge/src/Makefile
+++ b/configs/ne64badge/src/Makefile
@@ -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))
diff --git a/configs/ntosd-dm320/nettest/defconfig b/configs/ntosd-dm320/nettest/defconfig
index bb6351bffd5..d890345b029 100644
--- a/configs/ntosd-dm320/nettest/defconfig
+++ b/configs/ntosd-dm320/nettest/defconfig
@@ -520,16 +520,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)
#
# DM90x0 Driver Settings
diff --git a/configs/ntosd-dm320/nsh/defconfig b/configs/ntosd-dm320/nsh/defconfig
index cd0bd274a87..e662ff6aac2 100644
--- a/configs/ntosd-dm320/nsh/defconfig
+++ b/configs/ntosd-dm320/nsh/defconfig
@@ -531,60 +531,60 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
#
-# 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=1024
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=80
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=y
-CONFIG_EXAMPLES_NSH_CONSOLE=y
-CONFIG_EXAMPLES_NSH_TELNET=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
+# 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=1024
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=80
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=y
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=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
#
# Settings for examples/mount
diff --git a/configs/ntosd-dm320/ostest/defconfig b/configs/ntosd-dm320/ostest/defconfig
index 9d4e026c5a5..48508b03b0b 100644
--- a/configs/ntosd-dm320/ostest/defconfig
+++ b/configs/ntosd-dm320/ostest/defconfig
@@ -512,16 +512,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)
#
# DM90x0 Driver Settings
diff --git a/configs/ntosd-dm320/poll/defconfig b/configs/ntosd-dm320/poll/defconfig
index b0c54989729..eb3336715df 100644
--- a/configs/ntosd-dm320/poll/defconfig
+++ b/configs/ntosd-dm320/poll/defconfig
@@ -527,16 +527,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)
#
# DM90x0 Driver Settings
diff --git a/configs/ntosd-dm320/thttpd/defconfig b/configs/ntosd-dm320/thttpd/defconfig
index c23e7b89f5a..06b9a177d80 100644
--- a/configs/ntosd-dm320/thttpd/defconfig
+++ b/configs/ntosd-dm320/thttpd/defconfig
@@ -657,64 +657,64 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(10<<24|0<<16|0<<8|1)
#
# Settings for examples/nsh
#
-# 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_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_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_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)
+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
#
# DM90x0 Driver Settings
diff --git a/configs/ntosd-dm320/udp/defconfig b/configs/ntosd-dm320/udp/defconfig
index 487bed2abf8..91b58291591 100644
--- a/configs/ntosd-dm320/udp/defconfig
+++ b/configs/ntosd-dm320/udp/defconfig
@@ -527,16 +527,16 @@ CONFIG_EXAMPLE_UDP_SERVERIP=(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)
#
# DM90x0 Driver Settings
diff --git a/configs/ntosd-dm320/uip/defconfig b/configs/ntosd-dm320/uip/defconfig
index d78927ed487..8ebe8941563 100644
--- a/configs/ntosd-dm320/uip/defconfig
+++ b/configs/ntosd-dm320/uip/defconfig
@@ -528,16 +528,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)
#
# DM90x0 Driver Settings
diff --git a/configs/nucleus2g/nsh/defconfig b/configs/nucleus2g/nsh/defconfig
index 6b0b35559cd..55e10597550 100755
--- a/configs/nucleus2g/nsh/defconfig
+++ b/configs/nucleus2g/nsh/defconfig
@@ -767,71 +767,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
diff --git a/configs/nucleus2g/ostest/defconfig b/configs/nucleus2g/ostest/defconfig
index 78e8e5bb80f..537a0260715 100755
--- a/configs/nucleus2g/ostest/defconfig
+++ b/configs/nucleus2g/ostest/defconfig
@@ -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
diff --git a/configs/nucleus2g/src/Makefile b/configs/nucleus2g/src/Makefile
index c54ba8a0ab3..36415136d16 100755
--- a/configs/nucleus2g/src/Makefile
+++ b/configs/nucleus2g/src/Makefile
@@ -39,7 +39,7 @@ CFLAGS += -I$(TOPDIR)/sched
ASRCS =
CSRCS = up_boot.c up_leds.c up_ssp.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c
endif
ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
diff --git a/configs/nucleus2g/src/up_nsh.c b/configs/nucleus2g/src/up_nsh.c
index 10acca85f90..faf42bb5165 100755
--- a/configs/nucleus2g/src/up_nsh.c
+++ b/configs/nucleus2g/src/up_nsh.c
@@ -56,41 +56,41 @@
/* PORT and SLOT number probably depend on the board configuration */
#ifdef CONFIG_ARCH_BOARD_NUCLEUS2G
-# define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
-# define CONFIG_EXAMPLES_NSH_HAVEMMCSD 1
-# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 0
+# define CONFIG_NSH_HAVEUSBDEV 1
+# define CONFIG_NSH_HAVEMMCSD 1
+# if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 0
# error "The Nucleus-2G 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 Nucleus-2G 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
# ifndef CONFIG_LPC17_SSP0
# warning "CONFIG_LPC17_SSP0 is not enabled"
# endif
#else
# error "Unrecognized board"
-# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+# undef CONFIG_NSH_HAVEUSBDEV
+# undef CONFIG_NSH_HAVEMMCSD
#endif
/* Can't support USB device features if USB device 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 ********************************************************************/
@@ -136,29 +136,29 @@ int nsh_archinitialize(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;
}
diff --git a/configs/nucleus2g/usbserial/defconfig b/configs/nucleus2g/usbserial/defconfig
index 71ee3c1eb37..2063261a4a0 100755
--- a/configs/nucleus2g/usbserial/defconfig
+++ b/configs/nucleus2g/usbserial/defconfig
@@ -703,71 +703,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
diff --git a/configs/nucleus2g/usbstorage/defconfig b/configs/nucleus2g/usbstorage/defconfig
index 4a30ba3a839..f0216725101 100755
--- a/configs/nucleus2g/usbstorage/defconfig
+++ b/configs/nucleus2g/usbstorage/defconfig
@@ -703,71 +703,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
diff --git a/configs/olimex-lpc1766stk/hidkbd/defconfig b/configs/olimex-lpc1766stk/hidkbd/defconfig
index b571529096f..e3267eafea1 100755
--- a/configs/olimex-lpc1766stk/hidkbd/defconfig
+++ b/configs/olimex-lpc1766stk/hidkbd/defconfig
@@ -773,71 +773,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=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/usbserial
diff --git a/configs/olimex-lpc1766stk/nettest/defconfig b/configs/olimex-lpc1766stk/nettest/defconfig
index aa4ed7f7c7c..0c2c1b0a6da 100755
--- a/configs/olimex-lpc1766stk/nettest/defconfig
+++ b/configs/olimex-lpc1766stk/nettest/defconfig
@@ -726,71 +726,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=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=n
+CONFIG_NSH_ARCHINIT=n
+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
#
# Settings for examples/usbserial
diff --git a/configs/olimex-lpc1766stk/nsh/defconfig b/configs/olimex-lpc1766stk/nsh/defconfig
index 24239d6ee36..1e2c074e814 100755
--- a/configs/olimex-lpc1766stk/nsh/defconfig
+++ b/configs/olimex-lpc1766stk/nsh/defconfig
@@ -773,71 +773,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=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/usbserial
diff --git a/configs/olimex-lpc1766stk/nx/defconfig b/configs/olimex-lpc1766stk/nx/defconfig
index d6b3d827985..565337548a9 100755
--- a/configs/olimex-lpc1766stk/nx/defconfig
+++ b/configs/olimex-lpc1766stk/nx/defconfig
@@ -882,71 +882,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
diff --git a/configs/olimex-lpc1766stk/ostest/defconfig b/configs/olimex-lpc1766stk/ostest/defconfig
index bdca7c32d0f..561eba63808 100755
--- a/configs/olimex-lpc1766stk/ostest/defconfig
+++ b/configs/olimex-lpc1766stk/ostest/defconfig
@@ -717,71 +717,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
diff --git a/configs/olimex-lpc1766stk/slip-httpd/defconfig b/configs/olimex-lpc1766stk/slip-httpd/defconfig
index dced6af18c8..81978e279d7 100755
--- a/configs/olimex-lpc1766stk/slip-httpd/defconfig
+++ b/configs/olimex-lpc1766stk/slip-httpd/defconfig
@@ -833,71 +833,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
diff --git a/configs/olimex-lpc1766stk/src/Makefile b/configs/olimex-lpc1766stk/src/Makefile
index aa89ea9ad6f..ae53d080796 100755
--- a/configs/olimex-lpc1766stk/src/Makefile
+++ b/configs/olimex-lpc1766stk/src/Makefile
@@ -39,7 +39,7 @@ CFLAGS += -I$(TOPDIR)/sched
ASRCS =
CSRCS = up_boot.c up_leds.c up_ssp.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c
endif
ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
diff --git a/configs/olimex-lpc1766stk/src/up_nsh.c b/configs/olimex-lpc1766stk/src/up_nsh.c
index afb6d084e18..df51c3cab1d 100755
--- a/configs/olimex-lpc1766stk/src/up_nsh.c
+++ b/configs/olimex-lpc1766stk/src/up_nsh.c
@@ -61,36 +61,36 @@
/* PORT and SLOT number probably depend on the board configuration */
#ifdef CONFIG_ARCH_BOARD_LPC1766STK
-# define CONFIG_EXAMPLES_NSH_HAVEMMCSD 1
-# define CONFIG_EXAMPLES_NSH_HAVEUSBHOST 1
-# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 1
+# define CONFIG_NSH_HAVEMMCSD 1
+# define CONFIG_NSH_HAVEUSBHOST 1
+# if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 1
# error "The LPC1766-STK MMC/SD is on SSP1"
-# undef CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO
-# define CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO 1
+# undef CONFIG_NSH_MMCSDSPIPORTNO
+# define CONFIG_NSH_MMCSDSPIPORTNO 1
# endif
-# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) || CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+# if !defined(CONFIG_NSH_MMCSDSLOTNO) || CONFIG_NSH_MMCSDSLOTNO != 0
# error "The LPC1766-STK 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
# ifndef CONFIG_LPC17_SSP1
# warning "CONFIG_LPC17_SSP1 is not enabled"
-# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+# undef CONFIG_NSH_HAVEMMCSD
# endif
#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
-#ifndef CONFIG_EXAMPLES_NSH_MMCSDMINOR
-# define CONFIG_EXAMPLES_NSH_MMCSDMINOR 0
+#ifndef CONFIG_NSH_MMCSDMINOR
+# define CONFIG_NSH_MMCSDMINOR 0
#endif
/* USB Host */
@@ -108,10 +108,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
@@ -140,7 +140,7 @@
* Private Data
****************************************************************************/
-#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#ifdef CONFIG_NSH_HAVEUSBHOST
static struct usbhost_driver_s *g_drvr;
#endif
@@ -156,7 +156,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;
@@ -197,7 +197,7 @@ static int nsh_waiter(int argc, char *argv[])
*
****************************************************************************/
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
static int nsh_sdinitialize(void)
{
FAR struct spi_dev_s *ssp;
@@ -209,34 +209,34 @@ static 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);
ret = -ENODEV;
goto errout;
}
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_sdinitialize: "
"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);
goto errout;
}
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;
/* Disable power to the SD/MMC via a GPIO. HIGH disables SD/MMC. */
@@ -257,7 +257,7 @@ errout:
*
****************************************************************************/
-#ifdef CONFIG_EXAMPLES_NSH_HAVEUSBHOST
+#ifdef CONFIG_NSH_HAVEUSBHOST
static int nsh_usbhostinitialize(void)
{
int pid;
diff --git a/configs/olimex-lpc1766stk/thttpd/defconfig b/configs/olimex-lpc1766stk/thttpd/defconfig
index b2f1a823258..118444517b6 100755
--- a/configs/olimex-lpc1766stk/thttpd/defconfig
+++ b/configs/olimex-lpc1766stk/thttpd/defconfig
@@ -825,71 +825,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
diff --git a/configs/olimex-lpc1766stk/usbserial/defconfig b/configs/olimex-lpc1766stk/usbserial/defconfig
index 48e0f84070f..cf7d7cb990b 100755
--- a/configs/olimex-lpc1766stk/usbserial/defconfig
+++ b/configs/olimex-lpc1766stk/usbserial/defconfig
@@ -718,71 +718,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
diff --git a/configs/olimex-lpc1766stk/usbstorage/defconfig b/configs/olimex-lpc1766stk/usbstorage/defconfig
index 7c679540109..85918740c41 100755
--- a/configs/olimex-lpc1766stk/usbstorage/defconfig
+++ b/configs/olimex-lpc1766stk/usbstorage/defconfig
@@ -718,71 +718,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
diff --git a/configs/olimex-lpc1766stk/wlan/defconfig b/configs/olimex-lpc1766stk/wlan/defconfig
index 58105751c7d..43d281570d2 100755
--- a/configs/olimex-lpc1766stk/wlan/defconfig
+++ b/configs/olimex-lpc1766stk/wlan/defconfig
@@ -773,71 +773,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
diff --git a/configs/olimex-lpc2378/nsh/defconfig b/configs/olimex-lpc2378/nsh/defconfig
index 73b7fad0b61..85c3f3bf0db 100755
--- a/configs/olimex-lpc2378/nsh/defconfig
+++ b/configs/olimex-lpc2378/nsh/defconfig
@@ -354,62 +354,62 @@ CONFIG_EXAMPLES_SERLOOP_BUFIO=
#
# Settings for examples/nsh
#
-# 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
# Stack and heap information
diff --git a/configs/olimex-lpc2378/ostest/defconfig b/configs/olimex-lpc2378/ostest/defconfig
index 6f92f208575..f3938a53096 100755
--- a/configs/olimex-lpc2378/ostest/defconfig
+++ b/configs/olimex-lpc2378/ostest/defconfig
@@ -354,62 +354,62 @@ CONFIG_EXAMPLES_SERLOOP_BUFIO=
#
# Settings for examples/nsh
#
-# 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
# Stack and heap information
diff --git a/configs/olimex-lpc2378/src/Makefile b/configs/olimex-lpc2378/src/Makefile
index dac27f82a1d..1319a49155d 100755
--- a/configs/olimex-lpc2378/src/Makefile
+++ b/configs/olimex-lpc2378/src/Makefile
@@ -54,7 +54,7 @@ ASRCS =
AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = up_leds.c
#CSRCS += up_spi.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c
endif
COBJS = $(CSRCS:.c=$(OBJEXT))
diff --git a/configs/olimex-lpc2378/src/up_nsh.c b/configs/olimex-lpc2378/src/up_nsh.c
index 4bf6ac8dfbb..d6b2445ca7a 100755
--- a/configs/olimex-lpc2378/src/up_nsh.c
+++ b/configs/olimex-lpc2378/src/up_nsh.c
@@ -61,23 +61,23 @@
/* PORT and SLOT number probably depend on the board configuration */
-#undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
-#undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#undef CONFIG_NSH_HAVEUSBDEV
+#undef CONFIG_NSH_HAVEMMCSD
/* 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 ********************************************************************/
diff --git a/configs/olimex-strp711/nettest/defconfig b/configs/olimex-strp711/nettest/defconfig
index 985f654d6e4..ed34172d1dd 100755
--- a/configs/olimex-strp711/nettest/defconfig
+++ b/configs/olimex-strp711/nettest/defconfig
@@ -662,70 +662,70 @@ 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=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
#
# Stack and heap information
diff --git a/configs/olimex-strp711/nsh/defconfig b/configs/olimex-strp711/nsh/defconfig
index 87d75418f48..27e58db9371 100644
--- a/configs/olimex-strp711/nsh/defconfig
+++ b/configs/olimex-strp711/nsh/defconfig
@@ -597,69 +597,69 @@ 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
-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
+# 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_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=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
#
# Stack and heap information
diff --git a/configs/olimex-strp711/ostest/defconfig b/configs/olimex-strp711/ostest/defconfig
index 9bb56b7c11d..0add6394e89 100644
--- a/configs/olimex-strp711/ostest/defconfig
+++ b/configs/olimex-strp711/ostest/defconfig
@@ -597,70 +597,70 @@ 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=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
#
# Stack and heap information
diff --git a/configs/olimex-strp711/src/Makefile b/configs/olimex-strp711/src/Makefile
index 722d60b7c54..761237d852f 100644
--- a/configs/olimex-strp711/src/Makefile
+++ b/configs/olimex-strp711/src/Makefile
@@ -48,7 +48,7 @@ endif
ASRCS =
AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = up_spi.c up_leds.c up_buttons.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c
endif
ifeq ($(CONFIG_NET_ENC28J60),y)
diff --git a/configs/olimex-strp711/src/up_nsh.c b/configs/olimex-strp711/src/up_nsh.c
index cff3129dbbb..e6d2d349ee5 100644
--- a/configs/olimex-strp711/src/up_nsh.c
+++ b/configs/olimex-strp711/src/up_nsh.c
@@ -56,43 +56,43 @@
/* PORT and SLOT number probably depend on the board configuration */
#ifdef CONFIG_ARCH_BOARD_OLIMEX_STRP711
-# define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
+# define CONFIG_NSH_HAVEUSBDEV 1
# ifdef CONFIG_STR71X_BSPI1
-# define CONFIG_EXAMPLES_NSH_HAVEMMCSD 1
-# if !defined(CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO) || CONFIG_EXAMPLES_NSH_MMCSDSPIPORTNO != 1
+# define CONFIG_NSH_HAVEMMCSD 1
+# if !defined(CONFIG_NSH_MMCSDSPIPORTNO) || CONFIG_NSH_MMCSDSPIPORTNO != 1
# error "The Olimex STR-P711 MMC/SD is on BSPI1"
-# 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 Olimex STR-P711 MMC/SD is on BSPI1 slot 0"
-# undef CONFIG_EXAMPLES_NSH_MMCSDSLOTNO
-# define CONFIG_EXAMPLES_NSH_MMCSDSLOTNO 0
+# undef CONFIG_NSH_MMCSDSLOTNO
+# define CONFIG_NSH_MMCSDSLOTNO 0
# endif
# else
-# undef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+# undef CONFIG_NSH_HAVEMMCSD
# endif
#else
/* Add configuration for new STR71x boards here */
# error "Unrecognized STR71x 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 ********************************************************************/
@@ -128,39 +128,39 @@ int nsh_archinitialize(void)
FAR struct spi_dev_s *spi;
int ret;
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
/* 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);
#endif
return OK;
diff --git a/configs/pjrc-8051/defconfig b/configs/pjrc-8051/defconfig
index 1c1340a8ab3..764ebe1edb4 100644
--- a/configs/pjrc-8051/defconfig
+++ b/configs/pjrc-8051/defconfig
@@ -344,16 +344,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
diff --git a/configs/qemu-i486/nsh/defconfig b/configs/qemu-i486/nsh/defconfig
index 91f34e55ce7..dfe3fb49438 100644
--- a/configs/qemu-i486/nsh/defconfig
+++ b/configs/qemu-i486/nsh/defconfig
@@ -448,64 +448,64 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
#
-# 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=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=n
+CONFIG_NSH_ARCHINIT=n
+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
#
# Stack and heap information
diff --git a/configs/qemu-i486/ostest/defconfig b/configs/qemu-i486/ostest/defconfig
index 394761ed2d5..9695160cf98 100644
--- a/configs/qemu-i486/ostest/defconfig
+++ b/configs/qemu-i486/ostest/defconfig
@@ -364,17 +364,17 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
#
-# 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=2048
-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)
+# Settings for apps/nshlib
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=2048
+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
diff --git a/configs/sam3u-ek/nsh/defconfig b/configs/sam3u-ek/nsh/defconfig
index 61f49da6c56..8b2cf20e30d 100755
--- a/configs/sam3u-ek/nsh/defconfig
+++ b/configs/sam3u-ek/nsh/defconfig
@@ -743,71 +743,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
diff --git a/configs/sam3u-ek/nx/defconfig b/configs/sam3u-ek/nx/defconfig
index 12ae973c8b2..42d2dc9b238 100755
--- a/configs/sam3u-ek/nx/defconfig
+++ b/configs/sam3u-ek/nx/defconfig
@@ -752,71 +752,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
diff --git a/configs/sam3u-ek/ostest/defconfig b/configs/sam3u-ek/ostest/defconfig
index cdb31139fcb..1d5456a9a75 100755
--- a/configs/sam3u-ek/ostest/defconfig
+++ b/configs/sam3u-ek/ostest/defconfig
@@ -741,71 +741,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
diff --git a/configs/sam3u-ek/src/Makefile b/configs/sam3u-ek/src/Makefile
index c80b99c8fa2..9aa681b8b43 100755
--- a/configs/sam3u-ek/src/Makefile
+++ b/configs/sam3u-ek/src/Makefile
@@ -41,7 +41,7 @@ ASRCS =
AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c up_lcd.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c
endif
ifeq ($(CONFIG_SAM3U_HSMCI),y)
diff --git a/configs/sam3u-ek/src/up_nsh.c b/configs/sam3u-ek/src/up_nsh.c
index cb3665f904d..842d8b76271 100755
--- a/configs/sam3u-ek/src/up_nsh.c
+++ b/configs/sam3u-ek/src/up_nsh.c
@@ -62,26 +62,26 @@
/* PORT and SLOT number probably depend on the board configuration */
#ifdef CONFIG_ARCH_BOARD_SAM3UEK
-# 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 SAM3U boards here */
# error "Unrecognized SAM3U 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
@@ -89,11 +89,11 @@
*/
#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_SAM3U_HSMCI)
-# 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 ********************************************************************/
@@ -126,7 +126,7 @@
int nsh_archinitialize(void)
{
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
FAR struct sdio_dev_s *sdio;
int ret;
@@ -134,20 +134,20 @@ int nsh_archinitialize(void)
/* 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 SDIO 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);
diff --git a/configs/sim/mount/defconfig b/configs/sim/mount/defconfig
index 98ac9d11941..d8c9870abcd 100644
--- a/configs/sim/mount/defconfig
+++ b/configs/sim/mount/defconfig
@@ -340,17 +340,17 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
#
-# 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)
+# Settings for apps/nshlib
+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/mount
diff --git a/configs/sim/nettest/defconfig b/configs/sim/nettest/defconfig
index 8c37132074d..9e19a3b8785 100644
--- a/configs/sim/nettest/defconfig
+++ b/configs/sim/nettest/defconfig
@@ -340,17 +340,17 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
#
-# 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)
+# Settings for apps/nshlib
+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/mount
diff --git a/configs/sim/nsh/defconfig b/configs/sim/nsh/defconfig
index 9547e45acdc..f7611123b9c 100644
--- a/configs/sim/nsh/defconfig
+++ b/configs/sim/nsh/defconfig
@@ -340,60 +340,60 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
#
-# 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=1024
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=80
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=y
-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=(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=1
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=2
-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=1024
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=80
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=y
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=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=1
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=2
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
#
# Settings for examples/mount
diff --git a/configs/sim/nx/defconfig b/configs/sim/nx/defconfig
index 688fb6a66a2..fa6557d7473 100644
--- a/configs/sim/nx/defconfig
+++ b/configs/sim/nx/defconfig
@@ -434,60 +434,60 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
#
-# 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=1024
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=80
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=y
-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=(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=1
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=2
-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=1024
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=80
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=y
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=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=1
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=2
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
#
# Settings for examples/nx
diff --git a/configs/sim/nx/defconfig-x11 b/configs/sim/nx/defconfig-x11
index 3594732cce4..5d483ef0a2a 100644
--- a/configs/sim/nx/defconfig-x11
+++ b/configs/sim/nx/defconfig-x11
@@ -434,60 +434,60 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
#
-# 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=1024
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=80
-CONFIG_EXAMPLES_NSH_STACKSIZE=4096
-CONFIG_EXAMPLES_NSH_NESTDEPTH=3
-CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n
-CONFIG_EXAMPLES_NSH_DISABLEBG=n
-CONFIG_EXAMPLES_NSH_ROMFSETC=y
-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=(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=1
-CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE=64
-CONFIG_EXAMPLES_NSH_FATDEVNO=2
-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=1024
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=80
+CONFIG_NSH_STACKSIZE=4096
+CONFIG_NSH_NESTDEPTH=3
+CONFIG_NSH_DISABLESCRIPT=n
+CONFIG_NSH_DISABLEBG=n
+CONFIG_NSH_ROMFSETC=y
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=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=1
+CONFIG_NSH_ROMFSSECTSIZE=64
+CONFIG_NSH_FATDEVNO=2
+CONFIG_NSH_FATSECTSIZE=512
+CONFIG_NSH_FATNSECTORS=1024
+CONFIG_NSH_FATMOUNTPT=/tmp
#
# Settings for examples/nx
diff --git a/configs/sim/ostest/defconfig b/configs/sim/ostest/defconfig
index 625feca2a04..87f3c878b73 100644
--- a/configs/sim/ostest/defconfig
+++ b/configs/sim/ostest/defconfig
@@ -340,17 +340,17 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100
CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192
#
-# 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)
+# Settings for apps/nshlib
+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
diff --git a/configs/sim/pashello/defconfig b/configs/sim/pashello/defconfig
index 5466c71e07f..6fdb006ce8d 100644
--- a/configs/sim/pashello/defconfig
+++ b/configs/sim/pashello/defconfig
@@ -336,16 +336,16 @@ CONFIG_EXAMPLE_NETTEST_CLIENTIP=(192<<24|168<<16|0<<8|106)
#
# 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
diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig
index 335337307da..3eacda9ce92 100644
--- a/configs/skp16c26/ostest/defconfig
+++ b/configs/skp16c26/ostest/defconfig
@@ -515,16 +515,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)
#
# DM90x0 Driver Settings
diff --git a/configs/stm3210e-eval/RIDE/defconfig b/configs/stm3210e-eval/RIDE/defconfig
index 7725c6d0a80..ce1687172ea 100755
--- a/configs/stm3210e-eval/RIDE/defconfig
+++ b/configs/stm3210e-eval/RIDE/defconfig
@@ -677,71 +677,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
diff --git a/configs/stm3210e-eval/nsh/defconfig b/configs/stm3210e-eval/nsh/defconfig
index 352133a8c0a..9f56ba0f8d4 100755
--- a/configs/stm3210e-eval/nsh/defconfig
+++ b/configs/stm3210e-eval/nsh/defconfig
@@ -686,71 +686,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
diff --git a/configs/stm3210e-eval/ostest/defconfig b/configs/stm3210e-eval/ostest/defconfig
index 7038add286b..955a15e71d1 100755
--- a/configs/stm3210e-eval/ostest/defconfig
+++ b/configs/stm3210e-eval/ostest/defconfig
@@ -688,71 +688,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
diff --git a/configs/stm3210e-eval/src/Makefile b/configs/stm3210e-eval/src/Makefile
index d291a169307..42839b0f473 100755
--- a/configs/stm3210e-eval/src/Makefile
+++ b/configs/stm3210e-eval/src/Makefile
@@ -43,7 +43,7 @@ AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c \
up_extcontext.c up_selectnor.c up_deselectnor.c \
up_selectsram.c up_deselectsram.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c
endif
ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
diff --git a/configs/stm3210e-eval/src/up_nsh.c b/configs/stm3210e-eval/src/up_nsh.c
index db36946bd62..ab4b625f0e3 100755
--- a/configs/stm3210e-eval/src/up_nsh.c
+++ b/configs/stm3210e-eval/src/up_nsh.c
@@ -70,26 +70,26 @@
/* PORT and SLOT number probably depend on the board configuration */
#ifdef CONFIG_ARCH_BOARD_STM3210E_EVAL
-# 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 STM32 boards here */
# error "Unrecognized STM32 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
@@ -97,11 +97,11 @@
*/
#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_STM32_SDIO)
-# 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 ********************************************************************/
@@ -138,7 +138,7 @@ int nsh_archinitialize(void)
FAR struct spi_dev_s *spi;
FAR struct mtd_dev_s *mtd;
#endif
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
FAR struct sdio_dev_s *sdio;
int ret;
#endif
@@ -177,24 +177,24 @@ int nsh_archinitialize(void)
/* Mount the SDIO-based MMC/SD block driver */
-#ifdef CONFIG_EXAMPLES_NSH_HAVEMMCSD
+#ifdef CONFIG_NSH_HAVEMMCSD
/* 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);
diff --git a/configs/stm3210e-eval/usbserial/defconfig b/configs/stm3210e-eval/usbserial/defconfig
index 7bef8a50b42..46646bc416b 100755
--- a/configs/stm3210e-eval/usbserial/defconfig
+++ b/configs/stm3210e-eval/usbserial/defconfig
@@ -689,71 +689,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
diff --git a/configs/stm3210e-eval/usbstorage/defconfig b/configs/stm3210e-eval/usbstorage/defconfig
index ceeabb907f2..688e99f69e3 100755
--- a/configs/stm3210e-eval/usbstorage/defconfig
+++ b/configs/stm3210e-eval/usbstorage/defconfig
@@ -688,71 +688,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
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index a5a4bf35073..9b41759044a 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -518,66 +518,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
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=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
+# 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=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=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
#
# Stack and heap information
diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig
index ae87161011f..b93973eea09 100644
--- a/configs/us7032evb1/ostest/defconfig
+++ b/configs/us7032evb1/ostest/defconfig
@@ -518,66 +518,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
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=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
+# 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=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=1
-CONFIG_EXAMPLES_NSH_MMCSDSLOTNO=0
-CONFIG_EXAMPLES_NSH_MMCSDMINOR=0
+CONFIG_NSH_MMCSDSPIPORTNO=1
+CONFIG_NSH_MMCSDSLOTNO=0
+CONFIG_NSH_MMCSDMINOR=0
#
# Stack and heap information
diff --git a/configs/vsn/nsh/appconfig b/configs/vsn/nsh/appconfig
index d946c07a3df..65e8c220fa2 100755
--- a/configs/vsn/nsh/appconfig
+++ b/configs/vsn/nsh/appconfig
@@ -35,8 +35,38 @@
#
############################################################################
-# Add the list of built-in apps needed by this configuration
+########################################################################
+#
+# Applications to be included within the NuttX binary as described
+# under the apps/README.txt
+#
+# Set thi config parameter above to: CONFIG_TASK_NAME_SIZE=16
+# In order to enable argv[0]= argument set the option
+# CONFIG_TASK_NAME_SIZE=16
+#
-CONFIGURED_APPS += hello/.built_always poweroff/.built_always \
- sdcard/.built_always ramtron/.built_always nshlib/.built_always
+# Invoke the following application after NuttX starts
+#CONFIG_BUILTIN_APP_START="hello"
+# Application Libraries
+CONFIGURED_APPS += nshlib/.built_always
+
+# Individual selection of built-in applications:
+
+# Hello world provide a simple skeleton/demo application
+CONFIGURED_APPS += hello/.built_always
+
+# Provide poweroff command to switch off the board
+CONFIGURED_APPS += poweroff/.built_always
+
+# Provide SDcard tool
+CONFIGURED_APPS += sdcard/.built_always
+
+# Provide RAMTRON tool
+CONFIGURED_APPS += ramtron/.built_always
+
+# Provide UNIX style free
+CONFIGURED_APPS += free/.built_always
+
+# Provide JAVA Virtual Machine (the Darjeeling JVM)
+#CONFIGURED_APPS += jvm/.built_always
diff --git a/configs/vsn/nsh/defconfig b/configs/vsn/nsh/defconfig
index f7340137269..1e5f34c2f9b 100755
--- a/configs/vsn/nsh/defconfig
+++ b/configs/vsn/nsh/defconfig
@@ -704,76 +704,76 @@ 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_ARCHROMFS - May be defined to specify an alternative
+# If CONFIG_NSH_ROMFSETC is selected:
+# CONFIG_NSH_ARCHROMFS - May be defined to specify an alternative
# ROMFS image that can be found at configs//include/nsh_romfsimg.h.
-# 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_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_BUILTIN_APPS=y
-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=y
-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_ARCHROMFS=y
-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=40
-CONFIG_EXAMPLES_NSH_FATMOUNTPT=/tmp
+CONFIG_NSH_BUILTIN_APPS=y
+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=y
+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_ARCHROMFS=y
+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=40
+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
diff --git a/configs/vsn/src/Makefile b/configs/vsn/src/Makefile
index f12a8bcefbb..6e55c30ca0a 100644
--- a/configs/vsn/src/Makefile
+++ b/configs/vsn/src/Makefile
@@ -46,7 +46,7 @@ AOBJS = $(ASRCS:.S=$(OBJEXT))
CSRCS = sysclock.c boot.c leds.c buttons.c spi.c \
usbdev.c power.c
-ifeq ($(CONFIG_EXAMPLES_NSH_ARCHINIT),y)
+ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += nsh.c
endif
ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
diff --git a/configs/vsn/src/nsh.c b/configs/vsn/src/nsh.c
index d29368833f4..c4e691ba9ca 100644
--- a/configs/vsn/src/nsh.c
+++ b/configs/vsn/src/nsh.c
@@ -58,12 +58,12 @@
/* PORT and SLOT number probably depend on the board configuration */
-#define CONFIG_EXAMPLES_NSH_HAVEUSBDEV 1
+#define CONFIG_NSH_HAVEUSBDEV 1
/* Can't support USB features if USB is not enabled */
#ifndef CONFIG_USBDEV
-# undef CONFIG_EXAMPLES_NSH_HAVEUSBDEV
+# undef CONFIG_NSH_HAVEUSBDEV
#endif
diff --git a/configs/vsn/src/sdcard.c b/configs/vsn/src/sdcard.c
index 367e4150bb4..af36062dd86 100644
--- a/configs/vsn/src/sdcard.c
+++ b/configs/vsn/src/sdcard.c
@@ -52,13 +52,13 @@
#include "vsn.h"
-#define CONFIG_EXAMPLES_NSH_HAVEMMCSD 1
-#if defined(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO) && CONFIG_EXAMPLES_NSH_MMCSDSLOTNO != 0
+#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
/* Can't support MMC/SD features if mountpoints are disabled or if SDIO support
@@ -66,11 +66,11 @@
*/
#if defined(CONFIG_DISABLE_MOUNTPOINT) || !defined(CONFIG_STM32_SDIO)
-# 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
@@ -79,24 +79,24 @@ int up_sdcard(void)
{
/* Mount the SDIO-based MMC/SD block driver */
-#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 */
- sdio = sdio_initialize(CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+ sdio = sdio_initialize(CONFIG_NSH_MMCSDSLOTNO);
if (!sdio)
{
- message("SDIO: Failed to initialize slot %d\n", CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+ message("SDIO: Failed to initialize slot %d\n", CONFIG_NSH_MMCSDSLOTNO);
return -ENODEV;
}
- message("SDIO: Initialized slot %d\n", CONFIG_EXAMPLES_NSH_MMCSDSLOTNO);
+ message("SDIO: Initialized slot %d\n", CONFIG_NSH_MMCSDSLOTNO);
/* Now bind the SPI interface to the MMC/SD driver */
- ret = mmcsd_slotinitialize(CONFIG_EXAMPLES_NSH_MMCSDMINOR, sdio);
+ ret = mmcsd_slotinitialize(CONFIG_NSH_MMCSDMINOR, sdio);
if (ret != OK)
{
message("SDIO: Failed to bind to the MMC/SD driver: %d\n", ret);
diff --git a/configs/xtrs/nsh/defconfig b/configs/xtrs/nsh/defconfig
index 4026adf6fe9..83c6498aefb 100644
--- a/configs/xtrs/nsh/defconfig
+++ b/configs/xtrs/nsh/defconfig
@@ -341,58 +341,58 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/nsh
#
-# 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=1024
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=40
-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=(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
+# 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=1024
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=40
+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=(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
#
# Stack and heap information
diff --git a/configs/xtrs/ostest/defconfig b/configs/xtrs/ostest/defconfig
index 21af7f055bc..aad132b8b47 100644
--- a/configs/xtrs/ostest/defconfig
+++ b/configs/xtrs/ostest/defconfig
@@ -340,16 +340,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
diff --git a/configs/xtrs/pashello/defconfig b/configs/xtrs/pashello/defconfig
index 0170247473f..24607207aee 100644
--- a/configs/xtrs/pashello/defconfig
+++ b/configs/xtrs/pashello/defconfig
@@ -340,16 +340,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
diff --git a/configs/z16f2800100zcog/ostest/defconfig b/configs/z16f2800100zcog/ostest/defconfig
index ea7aa62db40..55617bd8582 100644
--- a/configs/z16f2800100zcog/ostest/defconfig
+++ b/configs/z16f2800100zcog/ostest/defconfig
@@ -368,16 +368,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
diff --git a/configs/z16f2800100zcog/pashello/defconfig b/configs/z16f2800100zcog/pashello/defconfig
index 10761a6a44a..cbe0e1fbf0e 100644
--- a/configs/z16f2800100zcog/pashello/defconfig
+++ b/configs/z16f2800100zcog/pashello/defconfig
@@ -368,16 +368,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
diff --git a/configs/z80sim/nsh/defconfig b/configs/z80sim/nsh/defconfig
index 38c3c2b4171..b6af3aa2766 100644
--- a/configs/z80sim/nsh/defconfig
+++ b/configs/z80sim/nsh/defconfig
@@ -331,58 +331,58 @@ CONFIG_NET_RESOLV_ENTRIES=4
#
# Settings for examples/nsh
#
-# 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=1024
-CONFIG_EXAMPLES_NSH_STRERROR=n
-CONFIG_EXAMPLES_NSH_LINELEN=40
-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=(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
+# 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=1024
+CONFIG_NSH_STRERROR=n
+CONFIG_NSH_LINELEN=40
+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=(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
#
# Stack and heap information
diff --git a/configs/z80sim/ostest/defconfig b/configs/z80sim/ostest/defconfig
index f978e75b0d9..78a173af3b0 100644
--- a/configs/z80sim/ostest/defconfig
+++ b/configs/z80sim/ostest/defconfig
@@ -330,16 +330,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
diff --git a/configs/z80sim/pashello/defconfig b/configs/z80sim/pashello/defconfig
index 0fe2828db68..c8a99c9bfd2 100644
--- a/configs/z80sim/pashello/defconfig
+++ b/configs/z80sim/pashello/defconfig
@@ -330,16 +330,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
diff --git a/configs/z8encore000zco/ostest/defconfig b/configs/z8encore000zco/ostest/defconfig
index b206996a4a5..54cc2a863d7 100644
--- a/configs/z8encore000zco/ostest/defconfig
+++ b/configs/z8encore000zco/ostest/defconfig
@@ -368,17 +368,17 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=256
#
-# 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=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)
+# Settings for apps/nshlib
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=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)
#
# Stack and heap information
diff --git a/configs/z8f64200100kit/ostest/defconfig b/configs/z8f64200100kit/ostest/defconfig
index 34181dd5ad6..b37b81e34eb 100644
--- a/configs/z8f64200100kit/ostest/defconfig
+++ b/configs/z8f64200100kit/ostest/defconfig
@@ -368,17 +368,17 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=1
CONFIG_EXAMPLES_OSTEST_STACKSIZE=256
#
-# 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=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)
+# Settings for apps/nshlib
+CONFIG_NSH_CONSOLE=y
+CONFIG_NSH_TELNET=n
+CONFIG_NSH_IOBUFFER_SIZE=512
+CONFIG_NSH_CMD_SIZE=40
+CONFIG_NSH_STACKSIZE=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)
#
# Stack and heap information
diff --git a/examples/nsh/nsh_main.c b/examples/nsh/nsh_main.c
index fc6c9b0f9c5..c973530cc4e 100644
--- a/examples/nsh/nsh_main.c
+++ b/examples/nsh/nsh_main.c
@@ -101,7 +101,7 @@ void user_initialize(void)
int user_start(int argc, char *argv[])
{
int mid_priority;
-#if defined(CONFIG_EXAMPLES_NSH_CONSOLE) && defined(CONFIG_EXAMPLES_NSH_TELNET)
+#if defined(CONFIG_NSH_CONSOLE) && defined(CONFIG_NSH_TELNET)
int ret;
#endif
@@ -125,9 +125,9 @@ int user_start(int argc, char *argv[])
* the telnet front end on another thread.
*/
-#if defined(CONFIG_EXAMPLES_NSH_CONSOLE) && defined(CONFIG_EXAMPLES_NSH_TELNET)
+#if defined(CONFIG_NSH_CONSOLE) && defined(CONFIG_NSH_TELNET)
# ifndef CONFIG_CUSTOM_STACK
- ret = task_create("nsh_telnetmain", mid_priority, CONFIG_EXAMPLES_NSH_STACKSIZE,
+ ret = task_create("nsh_telnetmain", mid_priority, CONFIG_NSH_STACKSIZE,
nsh_telnetmain, NULL);
# else
ret = task_create("nsh_telnetmain", mid_priority, nsh_telnetmain, NULL);
@@ -139,13 +139,13 @@ int user_start(int argc, char *argv[])
/* If only the telnet front-end is selected, run it on this thread */
-#elif defined(CONFIG_EXAMPLES_NSH_TELNET)
+#elif defined(CONFIG_NSH_TELNET)
return nsh_telnetmain(0, NULL);
#endif
/* If the serial console front end is selected, then run it on this thread */
-#ifdef CONFIG_EXAMPLES_NSH_CONSOLE
+#ifdef CONFIG_NSH_CONSOLE
return nsh_consolemain(0, NULL);
#endif
}
diff --git a/netutils/README b/netutils/README.txt
similarity index 100%
rename from netutils/README
rename to netutils/README.txt
diff --git a/netutils/telnetd/README.txt b/netutils/telnetd/README.txt
index 14b05236c30..24fcba7d5d4 100644
--- a/netutils/telnetd/README.txt
+++ b/netutils/telnetd/README.txt
@@ -1,7 +1,7 @@
This directory is here for historical reasons. Nothing contained in this
directory is currently used by NuttX. This directly contains a functional
port of the tiny uIP shell. In the NuttX environment, the NuttShell (at
-/examples/nsh) supercedes this tiny shell and also supports telnetd.
+apps/nshlib) supercedes this tiny shell and also supports telnetd.
This example is retained here for reference purposes only.
diff --git a/tools/mkromfsimg.sh b/tools/mkromfsimg.sh
index 5e742f47de5..b628d241961 100755
--- a/tools/mkromfsimg.sh
+++ b/tools/mkromfsimg.sh
@@ -65,21 +65,21 @@ if [ ! -r $topdir/.config ]; then
exit 1
fi
-romfsetc=`grep CONFIG_EXAMPLES_NSH_ROMFSETC= $topdir/.config | cut -d'=' -f2`
+romfsetc=`grep CONFIG_NSH_ROMFSETC= $topdir/.config | cut -d'=' -f2`
disablempt=`grep CONFIG_DISABLE_MOUNTPOINT= $topdir/.config | cut -d'=' -f2`
-disablescript=`grep CONFIG_EXAMPLES_NSH_DISABLESCRIPT= $topdir/.config | cut -d'=' -f2`
+disablescript=`grep CONFIG_NSH_DISABLESCRIPT= $topdir/.config | cut -d'=' -f2`
ndescriptors=`grep CONFIG_NFILE_DESCRIPTORS= $topdir/.config | cut -d'=' -f2`
devconsole=`grep CONFIG_DEV_CONSOLE= $topdir/.config | cut -d'=' -f2`
romfs=`grep CONFIG_FS_ROMFS= $topdir/.config | cut -d'=' -f2`
-romfsmpt=`grep CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT= $topdir/.config | cut -d'=' -f2`
-initscript=`grep CONFIG_EXAMPLES_NSH_INITSCRIPT= $topdir/.config | cut -d'=' -f2`
-romfsdevno=`grep CONFIG_EXAMPLES_NSH_ROMFSDEVNO= $topdir/.config | cut -d'=' -f2`
-romfssectsize=`grep CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE= $topdir/.config | cut -d'=' -f2`
+romfsmpt=`grep CONFIG_NSH_ROMFSMOUNTPT= $topdir/.config | cut -d'=' -f2`
+initscript=`grep CONFIG_NSH_INITSCRIPT= $topdir/.config | cut -d'=' -f2`
+romfsdevno=`grep CONFIG_NSH_ROMFSDEVNO= $topdir/.config | cut -d'=' -f2`
+romfssectsize=`grep CONFIG_NSH_ROMFSSECTSIZE= $topdir/.config | cut -d'=' -f2`
fatfs=`grep CONFIG_FS_FAT= $topdir/.config | cut -d'=' -f2`
-fatdevno=`grep CONFIG_EXAMPLES_NSH_FATDEVNO= $topdir/.config | cut -d'=' -f2`
-fatsectsize=`grep CONFIG_EXAMPLES_NSH_FATSECTSIZE= $topdir/.config | cut -d'=' -f2`
-fatnsectors=`grep CONFIG_EXAMPLES_NSH_FATNSECTORS= $topdir/.config | cut -d'=' -f2`
-fatmpt=`grep CONFIG_EXAMPLES_NSH_FATMOUNTPT= $topdir/.config | cut -d'=' -f2`
+fatdevno=`grep CONFIG_NSH_FATDEVNO= $topdir/.config | cut -d'=' -f2`
+fatsectsize=`grep CONFIG_NSH_FATSECTSIZE= $topdir/.config | cut -d'=' -f2`
+fatnsectors=`grep CONFIG_NSH_FATNSECTORS= $topdir/.config | cut -d'=' -f2`
+fatmpt=`grep CONFIG_NSH_FATMOUNTPT= $topdir/.config | cut -d'=' -f2`
# The following settings are required for general ROMFS support
#
@@ -95,7 +95,7 @@ fi
if [ "X$disablescript" = "Xy" ]; then
echo "NSH scripting support is required for this feature"
- echo "Set CONFIG_EXAMPLES_NSH_DISABLESCRIPT=n to continue"
+ echo "Set CONFIG_NSH_DISABLESCRIPT=n to continue"
exit 1
fi
@@ -179,7 +179,7 @@ fi
# /., /./*, /.., or /../*
if [ ${romfsmpt:0:1} != "\"" ]; then
- echo "CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT must be a string"
+ echo "CONFIG_NSH_ROMFSMOUNTPT must be a string"
echo "Change it so that it is enclosed in quotes."
exit 1
fi
@@ -187,7 +187,7 @@ fi
uromfsmpt=`echo $romfsmpt | sed -e "s/\"//g"`
if [ ${uromfsmpt:0:1} != "/" ]; then
- echo "CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT must be an absolute path in the target FS"
+ echo "CONFIG_NSH_ROMFSMOUNTPT must be an absolute path in the target FS"
echo "Change it so that it begins with the character '/'. Eg. /etc"
exit 1
fi
@@ -199,14 +199,14 @@ done
if [ -z "$tmpdir" -o "X$tmpdir" = "Xdev" -o "X$tmpdir" = "." -o \
${tmpdir:0:2} = "./" -o "X$tmpdir" = ".." -o ${tmpdir:0:3} = "../" ]; then
- echo "Invalid CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT selection."
+ echo "Invalid CONFIG_NSH_ROMFSMOUNTPT selection."
exit 1
fi
# Verify that the path to the init file is a relative path and not ., ./*, .., or ../*
if [ ${initscript:0:1} != "\"" ]; then
- echo "CONFIG_EXAMPLES_NSH_INITSCRIPT must be a string"
+ echo "CONFIG_NSH_INITSCRIPT must be a string"
echo "Change it so that it is enclosed in quotes."
exit 1
fi
@@ -214,14 +214,14 @@ fi
uinitscript=`echo $initscript | sed -e "s/\"//g"`
if [ ${uinitscript:0:1} == "/" ]; then
- echo "CONFIG_EXAMPLES_NSH_INITSCRIPT must be an relative path in under $romfsmpt"
+ echo "CONFIG_NSH_INITSCRIPT must be an relative path in under $romfsmpt"
echo "Change it so that it begins with the character '/'. Eg. init.d/rcS. "
exit 1
fi
if [ "X$uinitscript" = "." -o ${uinitscript:0:2} = "./" -o \
"X$uinitscript" = ".." -o ${uinitscript:0:3} = "../" ]; then
- echo "Invalid CONFIG_EXAMPLES_NSH_INITSCRIPT selection. Must not begin with . or .."
+ echo "Invalid CONFIG_NSH_INITSCRIPT selection. Must not begin with . or .."
exit 1
fi