summaryrefslogtreecommitdiff
path: root/nuttx/configs/mcu123-lpc214x
diff options
context:
space:
mode:
Diffstat (limited to 'nuttx/configs/mcu123-lpc214x')
-rw-r--r--nuttx/configs/mcu123-lpc214x/nsh/defconfig118
-rw-r--r--nuttx/configs/mcu123-lpc214x/ostest/defconfig118
-rw-r--r--nuttx/configs/mcu123-lpc214x/src/Makefile2
-rw-r--r--nuttx/configs/mcu123-lpc214x/src/up_nsh.c44
-rw-r--r--nuttx/configs/mcu123-lpc214x/usbserial/defconfig118
-rw-r--r--nuttx/configs/mcu123-lpc214x/usbstorage/defconfig116
6 files changed, 258 insertions, 258 deletions
diff --git a/nuttx/configs/mcu123-lpc214x/nsh/defconfig b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
index 4d781194e..bb064a9c0 100644
--- a/nuttx/configs/mcu123-lpc214x/nsh/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/nsh/defconfig
@@ -544,70 +544,70 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
#
-# 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
+# Settings for apps/nshlib
+#
+# 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_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_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_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/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
index 29331a9fa..6da3ffeec 100644
--- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig
@@ -534,70 +534,70 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
#
-# 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
+# Settings for apps/nshlib
+#
+# 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_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_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_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
#
# Stack and heap information
diff --git a/nuttx/configs/mcu123-lpc214x/src/Makefile b/nuttx/configs/mcu123-lpc214x/src/Makefile
index 431d85fc0..e3f86453f 100644
--- a/nuttx/configs/mcu123-lpc214x/src/Makefile
+++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/src/up_nsh.c b/nuttx/configs/mcu123-lpc214x/src/up_nsh.c
index 9518862c8..1e1ee3c36 100644
--- a/nuttx/configs/mcu123-lpc214x/src/up_nsh.c
+++ b/nuttx/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/nuttx/configs/mcu123-lpc214x/usbserial/defconfig b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
index 57643cea9..87bc15b24 100644
--- a/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbserial/defconfig
@@ -535,70 +535,70 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
#
-# 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
+# Settings for apps/nshlib
+#
+# 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_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_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_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/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
index aa6f392ba..24dd6c429 100644
--- a/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
+++ b/nuttx/configs/mcu123-lpc214x/usbstorage/defconfig
@@ -535,69 +535,69 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096
CONFIG_EXAMPLES_OSTEST_NBARRIER_THREADS=3
#
-# 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
+# Settings for apps/nshlib
+#
+# 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_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_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_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