diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-18 20:35:31 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-03-18 20:35:31 +0000 |
| commit | dacf833f9af5137dcad044152b8c75e56ddd0e79 (patch) | |
| tree | 77d8c645bbcbc5843d09373dd67bf01207b5739e | |
| parent | 058e81edfdee203f2143b3f0910aa957a7f8da48 (diff) | |
| download | nuttx-dacf833f9af5137dcad044152b8c75e56ddd0e79.tar.gz nuttx-dacf833f9af5137dcad044152b8c75e56ddd0e79.tar.bz2 nuttx-dacf833f9af5137dcad044152b8c75e56ddd0e79.zip | |
Update documentation, change CONFIG_EXAMPLES_NSH to CONFIG_NSH
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3394 42af7a65-404d-4744-a932-0658087f49c3
159 files changed, 5452 insertions, 5420 deletions
diff --git a/apps/README.txt b/apps/README.txt index 272addcb1..86758dddf 100644 --- a/apps/README.txt +++ b/apps/README.txt @@ -18,7 +18,7 @@ To execute an application function: NuttShell provides transparent method of invoking the command, when the following option is enabled: - CONFIG_EXAMPLES_NSH_BUILTIN_APPS=y + CONFIG_NSH_BUILTIN_APPS=y in the NuttX configuration. diff --git a/apps/nshlib/Makefile b/apps/nshlib/Makefile index e4f5bf7b5..74cfccc9e 100644 --- a/apps/nshlib/Makefile +++ b/apps/nshlib/Makefile @@ -49,11 +49,11 @@ ASRCS = CSRCS = nsh_main.c nsh_fscmds.c nsh_ddcmd.c nsh_proccmds.c nsh_mmcmds.c \ nsh_envcmds.c nsh_dbgcmds.c -ifeq ($(CONFIG_EXAMPLES_NSH_BUILTIN_APPS),y) +ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) CSRCS += nsh_apps.c endif -ifeq ($(CONFIG_EXAMPLES_NSH_ROMFSETC),y) +ifeq ($(CONFIG_NSH_ROMFSETC),y) CSRCS += nsh_romfsetc.c endif @@ -61,15 +61,15 @@ ifeq ($(CONFIG_NET),y) CSRCS += nsh_netinit.c nsh_netcmds.c endif -ifeq ($(CONFIG_EXAMPLES_NSH_CONSOLE),y) +ifeq ($(CONFIG_NSH_CONSOLE),y) CSRCS += nsh_serial.c endif -ifeq ($(CONFIG_EXAMPLES_NSH_TELNET),y) +ifeq ($(CONFIG_NSH_TELNET),y) CSRCS += nsh_telnetd.c endif -ifneq ($(CONFIG_EXAMPLES_NSH_DISABLESCRIPT),y) +ifneq ($(CONFIG_NSH_DISABLESCRIPT),y) CSRCS += nsh_test.c endif diff --git a/apps/nshlib/README.txt b/apps/nshlib/README.txt index 10bb202df..b96201ae7 100644 --- a/apps/nshlib/README.txt +++ b/apps/nshlib/README.txt @@ -100,7 +100,7 @@ NSH Start-Up Script ^^^^^^^^^^^^^^^^^^^ NSH supports options to provide a start up script for NSH. In general -this capability is enabled with CONFIG_EXAMPLES_NSH_ROMFSETC, but has +this capability is enabled with CONFIG_NSH_ROMFSETC, but has several other related configuration options as described in the final section of this README. This capability also depends on: @@ -116,7 +116,7 @@ for the use of Start-Up files. This paragraph will discuss the general behavior when all of the configuration options are set to the default values. -In this default case, enabling CONFIG_EXAMPLES_NSH_ROMFSETC will cause +In this default case, enabling CONFIG_NSH_ROMFSETC will cause NSH to behave as follows at NSH startup time: - NSH will create a read-only RAM disk (a ROM disk), containing a tiny @@ -159,12 +159,12 @@ Modifying the ROMFS Image ------------------------- The contents of the /etc directory are retained in the file -apps/nshlib/nsh_romfsimg.h (OR, if CONFIG_EXAMPLES_NSH_ARCHROMFS +apps/nshlib/nsh_romfsimg.h (OR, if CONFIG_NSH_ARCHROMFS is defined, include/arch/board/rcs.template). In order to modify the start-up behavior, there are three things to study: 1. Configuration Options. - The additional CONFIG_EXAMPLES_NSH_ROMFSETC configuration options + The additional CONFIG_NSH_ROMFSETC configuration options discussed in the final section of this README. 2. tools/mkromfsimg.sh Script. @@ -179,7 +179,7 @@ the start-up behavior, there are three things to study: - The configuration settings of the installed NuttX configuration. - The genromfs tool (available from http://romfs.sourceforge.net). - The file apps/nshlib/rcS.template (OR, if - CONFIG_EXAMPLES_NSH_ARCHROMFS is defined, include/arch/board/rcs.template) + CONFIG_NSH_ARCHROMFS is defined, include/arch/board/rcs.template) 3. rcS.template. The file apps/nshlib/rcS.template contains the general form @@ -189,7 +189,7 @@ the start-up behavior, there are three things to study: NOTE: apps/nshlib/rcS.template generates the standard, default - nsh_romfsimg.h file. If CONFIG_EXAMPLES_NSH_ARCHROMFS is defined + 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 @@ -769,7 +769,7 @@ Command Dependencies on Configuration Settings Command Depends on Configuration ---------- -------------------------- - [ !CONFIG_EXAMPLES_NSH_DISABLESCRIPT + [ !CONFIG_NSH_DISABLESCRIPT cat CONFIG_NFILE_DESCRIPTORS > 0 cd !CONFIG_DISABLE_ENVIRON && CONFIG_NFILE_DESCRIPTORS > 0 cp CONFIG_NFILE_DESCRIPTORS > 0 @@ -797,9 +797,9 @@ Command Dependencies on Configuration Settings rm !CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_FS_WRITABLE (see note 4) rmdir !CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_FS_WRITABLE (see note 4) set !CONFIG_DISABLE_ENVIRON - sh CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !CONFIG_EXAMPLES_NSH_DISABLESCRIPT + sh CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !CONFIG_NSH_DISABLESCRIPT sleep !CONFIG_DISABLE_SIGNALS - test !CONFIG_EXAMPLES_NSH_DISABLESCRIPT + test !CONFIG_NSH_DISABLESCRIPT umount !CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_FS_READABLE unset !CONFIG_DISABLE_ENVIRON usleep !CONFIG_DISABLE_SIGNALS @@ -821,19 +821,19 @@ In addition, each NSH command can be individually disabled via one of the follow settings. All of these settings make the configuration of NSH potentially complex but also allow it to squeeze into very small memory footprints. - CONFIG_EXAMPLES_NSH_DISABLE_CAT, CONFIG_EXAMPLES_NSH_DISABLE_CD, CONFIG_EXAMPLES_NSH_DISABLE_CP, - CONFIG_EXAMPLES_NSH_DISABLE_DD, CONFIG_EXAMPLES_NSH_DISABLE_ECHO, CONFIG_EXAMPLES_NSH_DISABLE_EXEC, - CONFIG_EXAMPLES_NSH_DISABLE_EXIT, CONFIG_EXAMPLES_NSH_DISABLE_FREE, CONFIG_EXAMPLES_NSH_DISABLE_GET, - CONFIG_EXAMPLES_NSH_DISABLE_HELP, CONFIG_EXAMPLES_NSH_DISABLE_IFCONFIG, CONFIG_EXAMPLES_NSH_DISABLE_KILL, - CONFIG_EXAMPLES_NSH_DISABLE_LOSETUP, CONFIG_EXAMPLES_NSH_DISABLE_LS, CONFIG_EXAMPLES_NSH_DISABLE_MB, - CONFIG_EXAMPLES_NSH_DISABLE_MKDIR, CONFIG_EXAMPLES_NSH_DISABLE_MKFATFS, CONFIG_EXAMPLES_NSH_DISABLE_MKFIFO, - CONFIG_EXAMPLES_NSH_DISABLE_MKRD, CONFIG_EXAMPLES_NSH_DISABLE_MH, CONFIG_EXAMPLES_NSH_DISABLE_MOUNT, - CONFIG_EXAMPLES_NSH_DISABLE_MW, CONFIG_EXAMPLES_NSH_DISABLE_PS, CONFIG_EXAMPLES_NSH_DISABLE_PING, - CONFIG_EXAMPLES_NSH_DISABLE_PUT, CONFIG_EXAMPLES_NSH_DISABLE_PWD, CONFIG_EXAMPLES_NSH_DISABLE_RM, - CONFIG_EXAMPLES_NSH_DISABLE_RMDIR, CONFIG_EXAMPLES_NSH_DISABLE_SET, CONFIG_EXAMPLES_NSH_DISABLE_SH, - CONFIG_EXAMPLES_NSH_DISABLE_SLEEP, CONFIG_EXAMPLES_NSH_DISABLE_TEST, CONFIG_EXAMPLES_NSH_DISABLE_UMOUNT, - CONFIG_EXAMPLES_NSH_DISABLE_UNSET, CONFIG_EXAMPLES_NSH_DISABLE_USLEEP, CONFIG_EXAMPLES_NSH_DISABLE_WGET, - CONFIG_EXAMPLES_NSH_DISABLE_XD + CONFIG_NSH_DISABLE_CAT, CONFIG_NSH_DISABLE_CD, CONFIG_NSH_DISABLE_CP, + CONFIG_NSH_DISABLE_DD, CONFIG_NSH_DISABLE_ECHO, CONFIG_NSH_DISABLE_EXEC, + CONFIG_NSH_DISABLE_EXIT, CONFIG_NSH_DISABLE_FREE, CONFIG_NSH_DISABLE_GET, + CONFIG_NSH_DISABLE_HELP, CONFIG_NSH_DISABLE_IFCONFIG, CONFIG_NSH_DISABLE_KILL, + CONFIG_NSH_DISABLE_LOSETUP, CONFIG_NSH_DISABLE_LS, CONFIG_NSH_DISABLE_MB, + CONFIG_NSH_DISABLE_MKDIR, CONFIG_NSH_DISABLE_MKFATFS, CONFIG_NSH_DISABLE_MKFIFO, + CONFIG_NSH_DISABLE_MKRD, CONFIG_NSH_DISABLE_MH, CONFIG_NSH_DISABLE_MOUNT, + CONFIG_NSH_DISABLE_MW, CONFIG_NSH_DISABLE_PS, CONFIG_NSH_DISABLE_PING, + CONFIG_NSH_DISABLE_PUT, CONFIG_NSH_DISABLE_PWD, CONFIG_NSH_DISABLE_RM, + CONFIG_NSH_DISABLE_RMDIR, CONFIG_NSH_DISABLE_SET, CONFIG_NSH_DISABLE_SH, + CONFIG_NSH_DISABLE_SLEEP, CONFIG_NSH_DISABLE_TEST, CONFIG_NSH_DISABLE_UMOUNT, + CONFIG_NSH_DISABLE_UNSET, CONFIG_NSH_DISABLE_USLEEP, CONFIG_NSH_DISABLE_WGET, + CONFIG_NSH_DISABLE_XD NSH-Specific Configuration Settings ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -841,70 +841,70 @@ NSH-Specific Configuration Settings The behavior of NSH can be modified with the following settings in the configs/<board-name>/defconfig file: - * 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 or as new TELNET connections are established. - * 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 if-then[-else]-fi construct. This would only be set on systems where a minimal footprint is a necessity and scripting is not. - * 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 the '&' command suffix. This would only be set on systems where a minimal footprint is a necessity and background command execution is not. - * 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 the MMC/SD minor number, i.e., the MMC/SD block driver will be registered as /dev/mmcsdN where N is the minor number. Default is zero. - * 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 a FAT FS RAMDISK at /tmp but the logic is easily extensible. - * CONFIG_EXAMPLES_NSH_CONSOLE - If CONFIG_EXAMPLES_NSH_CONSOLE is set to 'y', then a serial + * CONFIG_NSH_CONSOLE + If CONFIG_NSH_CONSOLE is set to 'y', then a serial console front-end is selected. - * CONFIG_EXAMPLES_NSH_TELNET - If CONFIG_EXAMPLES_NSH_TELNET is set to 'y', then a TELENET + * CONFIG_NSH_TELNET + 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 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. - 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: * CONFIG_NET=y @@ -917,24 +917,24 @@ NSH-Specific Configuration Settings 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 - If CONFIG_EXAMPLES_NSH_DHCPC is NOT set, then the static IP + * CONFIG_NSH_IPADDR + 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. @@ -958,47 +958,47 @@ NSH-Specific Configuration Settings Per RFC2131 (p. 9), the DHCP client must be prepared to receive DHCP messages of up to 576 bytes (excluding Ethernet, IP, or UDP headers and FCS). - If CONFIG_EXAMPLES_NSH_ROMFSETC is selected, then the following additional + If CONFIG_NSH_ROMFSETC is selected, then the following additional configuration setting apply: - * 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 beginning with '/'. - * 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 start with '/'. - * 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 increased if the ROMFS volume were to be become large. Any value selected must be a power of 2. - 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. - * 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. - * CONFIG_EXAMPLES_NSH_FATNSECTORS + * CONFIG_NSH_FATNSECTORS This is the number of sectors to use with the FAT FS. Defalt is 1024. The amount of memory used by the FAT FS will be - CONFIG_EXAMPLES_NSH_FATSECTSIZE * CONFIG_EXAMPLES_NSH_FATNSECTORS + CONFIG_NSH_FATSECTSIZE * CONFIG_NSH_FATNSECTORS bytes. - * CONFIG_EXAMPLES_NSH_FATMOUNTPT + * CONFIG_NSH_FATMOUNTPT This is the location where the FAT FS will be mounted. Default is /tmp. diff --git a/apps/nshlib/nsh.h b/apps/nshlib/nsh.h index c92bb6e80..38ba66a95 100644 --- a/apps/nshlib/nsh.h +++ b/apps/nshlib/nsh.h @@ -46,7 +46,7 @@ #include <stdint.h> #include <stdbool.h> -#ifdef CONFIG_EXAMPLES_NSH_CONSOLE +#ifdef CONFIG_NSH_CONSOLE # include <stdio.h> #endif @@ -57,65 +57,65 @@ /* The telnetd interface and background commands require pthread support */ #ifdef CONFIG_DISABLE_PTHREAD -# undef CONFIG_EXAMPLES_NSH_TELNET -# ifndef CONFIG_EXAMPLES_NSH_DISABLEBG -# define CONFIG_EXAMPLES_NSH_DISABLEBG 1 +# undef CONFIG_NSH_TELNET +# ifndef CONFIG_NSH_DISABLEBG +# define CONFIG_NSH_DISABLEBG 1 # endif #endif /* Telnetd requires networking support */ #ifndef CONFIG_NET -# undef CONFIG_EXAMPLES_NSH_TELNET +# undef CONFIG_NSH_TELNET #endif /* One front end must be defined */ -#if !defined(CONFIG_EXAMPLES_NSH_CONSOLE) && !defined(CONFIG_EXAMPLES_NSH_TELNET) +#if !defined(CONFIG_NSH_CONSOLE) && !defined(CONFIG_NSH_TELNET) # error "No NSH front end defined" #endif /* Verify support for ROMFS /etc directory support options */ -#ifdef CONFIG_EXAMPLES_NSH_ROMFSETC +#ifdef CONFIG_NSH_ROMFSETC # ifdef CONFIG_DISABLE_MOUNTPOINT # error "Mountpoint support is disabled" -# undef CONFIG_EXAMPLES_NSH_ROMFSETC +# undef CONFIG_NSH_ROMFSETC # endif # if CONFIG_NFILE_DESCRIPTORS < 4 # error "Not enough file descriptors" -# undef CONFIG_EXAMPLES_NSH_ROMFSETC +# undef CONFIG_NSH_ROMFSETC # endif # ifndef CONFIG_FS_ROMFS # error "ROMFS support not enabled" -# undef CONFIG_EXAMPLES_NSH_ROMFSETC +# undef CONFIG_NSH_ROMFSETC # endif -# ifndef CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT -# define CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT "/etc" +# ifndef CONFIG_NSH_ROMFSMOUNTPT +# define CONFIG_NSH_ROMFSMOUNTPT "/etc" # endif -# ifdef CONFIG_EXAMPLES_NSH_INIT -# ifndef CONFIG_EXAMPLES_NSH_INITSCRIPT -# define CONFIG_EXAMPLES_NSH_INITSCRIPT "init.d/rcS" +# ifdef CONFIG_NSH_INIT +# ifndef CONFIG_NSH_INITSCRIPT +# define CONFIG_NSH_INITSCRIPT "init.d/rcS" # endif # endif # undef NSH_INITPATH -# define NSH_INITPATH CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT "/" CONFIG_EXAMPLES_NSH_INITSCRIPT -# ifndef CONFIG_EXAMPLES_NSH_ROMFSDEVNO -# define CONFIG_EXAMPLES_NSH_ROMFSDEVNO 0 +# define NSH_INITPATH CONFIG_NSH_ROMFSMOUNTPT "/" CONFIG_NSH_INITSCRIPT +# ifndef CONFIG_NSH_ROMFSDEVNO +# define CONFIG_NSH_ROMFSDEVNO 0 # endif -# ifndef CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE -# define CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE 64 +# ifndef CONFIG_NSH_ROMFSSECTSIZE +# define CONFIG_NSH_ROMFSSECTSIZE 64 # endif -# define NSECTORS(b) (((b)+CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE-1)/CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE) +# define NSECTORS(b) (((b)+CONFIG_NSH_ROMFSSECTSIZE-1)/CONFIG_NSH_ROMFSSECTSIZE) # define STR_RAMDEVNO(m) #m # define MKMOUNT_DEVNAME(m) "/dev/ram" STR_RAMDEVNO(m) -# define MOUNT_DEVNAME MKMOUNT_DEVNAME(CONFIG_EXAMPLES_NSH_ROMFSDEVNO) +# define MOUNT_DEVNAME MKMOUNT_DEVNAME(CONFIG_NSH_ROMFSDEVNO) #else -# undef CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT -# undef CONFIG_EXAMPLES_NSH_INIT -# undef CONFIG_EXAMPLES_NSH_INITSCRIPT -# undef CONFIG_EXAMPLES_NSH_ROMFSDEVNO -# undef CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE +# undef CONFIG_NSH_ROMFSMOUNTPT +# undef CONFIG_NSH_INIT +# undef CONFIG_NSH_INITSCRIPT +# undef CONFIG_NSH_ROMFSDEVNO +# undef CONFIG_NSH_ROMFSSECTSIZE #endif /* This is the maximum number of arguments that will be accepted for a command */ @@ -123,10 +123,10 @@ #define NSH_MAX_ARGUMENTS 6 /* strerror() produces much nicer output but is, however, quite large and - * will only be used if CONFIG_EXAMPLES_NSH_STRERROR is defined. + * will only be used if CONFIG_NSH_STRERROR is defined. */ -#ifdef CONFIG_EXAMPLES_NSH_STRERROR +#ifdef CONFIG_NSH_STRERROR # define NSH_ERRNO strerror(errno) # define NSH_ERRNO_OF(err) strerror(err) #else @@ -136,36 +136,36 @@ /* Maximum size of one command line (telnet or serial) */ -#ifndef CONFIG_EXAMPLES_NSH_LINELEN -# define CONFIG_EXAMPLES_NSH_LINELEN 80 +#ifndef CONFIG_NSH_LINELEN +# define CONFIG_NSH_LINELEN 80 #endif /* The following two settings are used only in the telnetd interface */ -#ifndef CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE -# define CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE 512 +#ifndef CONFIG_NSH_IOBUFFER_SIZE +# define CONFIG_NSH_IOBUFFER_SIZE 512 #endif /* As threads are created to handle each request, a stack must be allocated * for the thread. Use a default if the user provided no stacksize. */ -#ifndef CONFIG_EXAMPLES_NSH_STACKSIZE -# define CONFIG_EXAMPLES_NSH_STACKSIZE 4096 +#ifndef CONFIG_NSH_STACKSIZE +# define CONFIG_NSH_STACKSIZE 4096 #endif /* The maximum number of nested if-then[-else]-fi sequences that * are permissable. */ -#ifndef CONFIG_EXAMPLES_NSH_NESTDEPTH -# define CONFIG_EXAMPLES_NSH_NESTDEPTH 3 +#ifndef CONFIG_NSH_NESTDEPTH +# define CONFIG_NSH_NESTDEPTH 3 #endif /* Define to enable dumping of all input/output buffers */ -#undef CONFIG_EXAMPLES_NSH_TELNETD_DUMPBUFFER -#undef CONFIG_EXAMPLES_NSH_FULLPATH +#undef CONFIG_NSH_TELNETD_DUMPBUFFER +#undef CONFIG_NSH_FULLPATH /* Make sure that the home directory is defined */ @@ -222,15 +222,15 @@ struct nsh_state_s struct nsh_parser_s { -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG bool np_bg; /* true: The last command executed in background */ #endif bool np_redirect; /* true: Output from the last command was re-directed */ bool np_fail; /* true: The last command failed */ -#ifndef CONFIG_EXAMPLES_NSH_DISABLESCRIPT +#ifndef CONFIG_NSH_DISABLESCRIPT uint8_t np_ndx; /* Current index into np_st[] */ #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG int np_nice; /* "nice" value applied to last background cmd */ #endif @@ -238,8 +238,8 @@ struct nsh_parser_s * execution of commands that span multiple lines (like if-then-else-fi) */ -#ifndef CONFIG_EXAMPLES_NSH_DISABLESCRIPT - struct nsh_state_s np_st[CONFIG_EXAMPLES_NSH_NESTDEPTH]; +#ifndef CONFIG_NSH_DISABLESCRIPT + struct nsh_state_s np_st[CONFIG_NSH_NESTDEPTH]; #endif }; @@ -251,7 +251,7 @@ struct nsh_vtbl_s * of the front end. */ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG FAR struct nsh_vtbl_s *(*clone)(FAR struct nsh_vtbl_s *vtbl); void (*addref)(FAR struct nsh_vtbl_s *vtbl); void (*release)(FAR struct nsh_vtbl_s *vtbl); @@ -298,7 +298,7 @@ extern const char g_fmtsignalrecvd[]; /* Initialization */ -#ifdef CONFIG_EXAMPLES_NSH_ROMFSETC +#ifdef CONFIG_NSH_ROMFSETC extern int nsh_romfsetc(void); #else # define nsh_romfsetc() (-ENOSYS) @@ -310,13 +310,13 @@ extern int nsh_netinit(void); # define nsh_netinit() (-ENOSYS) #endif -#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !defined(CONFIG_EXAMPLES_NSH_DISABLESCRIPT) +#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !defined(CONFIG_NSH_DISABLESCRIPT) extern int nsh_script(FAR struct nsh_vtbl_s *vtbl, const char *cmd, const char *path); #endif /* Architecture-specific initialization */ -#ifdef CONFIG_EXAMPLES_NSH_ARCHINIT +#ifdef CONFIG_NSH_ARCHINIT extern int nsh_archinitialize(void); #else # define nsh_archinitialize() (-ENOSYS) @@ -328,7 +328,7 @@ extern int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline); /* Application interface */ -#ifdef CONFIG_EXAMPLES_NSH_BUILTIN_APPS +#ifdef CONFIG_NSH_BUILTIN_APPS extern int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd, FAR char *argv[]); #endif @@ -348,141 +348,141 @@ extern void nsh_dumpbuffer(FAR struct nsh_vtbl_s *vtbl, const char *msg, /* Shell command handlers */ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_ECHO +#ifndef CONFIG_NSH_DISABLE_ECHO extern int cmd_echo(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_EXEC +#ifndef CONFIG_NSH_DISABLE_EXEC extern int cmd_exec(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_MB +#ifndef CONFIG_NSH_DISABLE_MB extern int cmd_mb(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_MH +#ifndef CONFIG_NSH_DISABLE_MH extern int cmd_mh(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_MW +#ifndef CONFIG_NSH_DISABLE_MW extern int cmd_mw(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_FREE +#ifndef CONFIG_NSH_DISABLE_FREE extern int cmd_free(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_PS +#ifndef CONFIG_NSH_DISABLE_PS extern int cmd_ps(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_XD +#ifndef CONFIG_NSH_DISABLE_XD extern int cmd_xd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); #endif -#if !defined(CONFIG_EXAMPLES_NSH_DISABLESCRIPT) && !defined(CONFIG_EXAMPLES_NSH_DISABLE_TEST) +#if !defined(CONFIG_NSH_DISABLESCRIPT) && !defined(CONFIG_NSH_DISABLE_TEST) extern int cmd_test(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); extern int cmd_lbracket(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); #endif #if CONFIG_NFILE_DESCRIPTORS > 0 -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_CAT +# ifndef CONFIG_NSH_DISABLE_CAT extern int cmd_cat(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_CP +# ifndef CONFIG_NSH_DISABLE_CP extern int cmd_cp(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_DD +# ifndef CONFIG_NSH_DISABLE_DD extern int cmd_dd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_LS +# ifndef CONFIG_NSH_DISABLE_LS extern int cmd_ls(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# if CONFIG_NFILE_STREAMS > 0 && !defined(CONFIG_EXAMPLES_NSH_DISABLESCRIPT) -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_SH +# if CONFIG_NFILE_STREAMS > 0 && !defined(CONFIG_NSH_DISABLESCRIPT) +# ifndef CONFIG_NSH_DISABLE_SH extern int cmd_sh(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# endif /* CONFIG_NFILE_STREAMS && !CONFIG_EXAMPLES_NSH_DISABLESCRIPT */ +# endif /* CONFIG_NFILE_STREAMS && !CONFIG_NSH_DISABLESCRIPT */ # ifndef CONFIG_DISABLE_MOUNTPOINT -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_LOSETUP +# ifndef CONFIG_NSH_DISABLE_LOSETUP extern int cmd_losetup(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_MKFIFO +# ifndef CONFIG_NSH_DISABLE_MKFIFO extern int cmd_mkfifo(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif # ifdef CONFIG_FS_READABLE -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_MOUNT +# ifndef CONFIG_NSH_DISABLE_MOUNT extern int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_UMOUNT +# ifndef CONFIG_NSH_DISABLE_UMOUNT extern int cmd_umount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif # ifdef CONFIG_FS_WRITABLE -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_MKDIR +# ifndef CONFIG_NSH_DISABLE_MKDIR extern int cmd_mkdir(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_MKRD +# ifndef CONFIG_NSH_DISABLE_MKRD extern int cmd_mkrd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_RM +# ifndef CONFIG_NSH_DISABLE_RM extern int cmd_rm(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_RMDIR +# ifndef CONFIG_NSH_DISABLE_RMDIR extern int cmd_rmdir(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif # endif /* CONFIG_FS_WRITABLE */ # endif /* CONFIG_FS_READABLE */ # ifdef CONFIG_FS_FAT -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_MKFATFS +# ifndef CONFIG_NSH_DISABLE_MKFATFS extern int cmd_mkfatfs(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif # endif /* CONFIG_FS_FAT */ # endif /* !CONFIG_DISABLE_MOUNTPOINT */ # if !defined(CONFIG_DISABLE_ENVIRON) -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_CD +# ifndef CONFIG_NSH_DISABLE_CD extern int cmd_cd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_PWD +# ifndef CONFIG_NSH_DISABLE_PWD extern int cmd_pwd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif # endif /* !CONFIG_DISABLE_MOUNTPOINT */ #endif /* CONFIG_NFILE_DESCRIPTORS */ #if defined(CONFIG_NET) -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_IFCONFIG +# ifndef CONFIG_NSH_DISABLE_IFCONFIG extern int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif #if defined(CONFIG_NET_UDP) && CONFIG_NFILE_DESCRIPTORS > 0 -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_GET +# ifndef CONFIG_NSH_DISABLE_GET extern int cmd_get(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_PUT +# ifndef CONFIG_NSH_DISABLE_PUT extern int cmd_put(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif #endif #if defined(CONFIG_NET_TCP) && CONFIG_NFILE_DESCRIPTORS > 0 -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_WGET +# ifndef CONFIG_NSH_DISABLE_WGET extern int cmd_wget(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif #endif #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \ !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS) -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_PING +# ifndef CONFIG_NSH_DISABLE_PING extern int cmd_ping(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif #endif #endif #ifndef CONFIG_DISABLE_ENVIRON -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_SET +# ifndef CONFIG_NSH_DISABLE_SET extern int cmd_set(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_UNSET +# ifndef CONFIG_NSH_DISABLE_UNSET extern int cmd_unset(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif #endif /* CONFIG_DISABLE_ENVIRON */ #ifndef CONFIG_DISABLE_SIGNALS -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_KILL +# ifndef CONFIG_NSH_DISABLE_KILL extern int cmd_kill(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_SLEEP +# ifndef CONFIG_NSH_DISABLE_SLEEP extern int cmd_sleep(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_USLEEP +# ifndef CONFIG_NSH_DISABLE_USLEEP extern int cmd_usleep(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif #endif /* CONFIG_DISABLE_SIGNALS */ diff --git a/apps/nshlib/nsh_apps.c b/apps/nshlib/nsh_apps.c index 0c786dc12..e792f0781 100644 --- a/apps/nshlib/nsh_apps.c +++ b/apps/nshlib/nsh_apps.c @@ -51,7 +51,7 @@ #include "nsh.h" -#ifdef CONFIG_EXAMPLES_NSH_BUILTIN_APPS +#ifdef CONFIG_NSH_BUILTIN_APPS /**************************************************************************** * Definitions @@ -127,6 +127,6 @@ int nsh_execapp(FAR struct nsh_vtbl_s *vtbl, FAR const char *cmd, return OK; } -#endif /* CONFIG_EXAMPLES_NSH_BUILTIN_APPS */ +#endif /* CONFIG_NSH_BUILTIN_APPS */ diff --git a/apps/nshlib/nsh_dbgcmds.c b/apps/nshlib/nsh_dbgcmds.c index 001f5dd49..811a5773e 100644 --- a/apps/nshlib/nsh_dbgcmds.c +++ b/apps/nshlib/nsh_dbgcmds.c @@ -137,7 +137,7 @@ int mem_parse(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv, * Name: cmd_mb ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_MB +#ifndef CONFIG_NSH_DISABLE_MB int cmd_mb(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { struct dbgmem_s mem; @@ -190,7 +190,7 @@ int cmd_mb(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) * Name: cmd_mh ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_MH +#ifndef CONFIG_NSH_DISABLE_MH int cmd_mh(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { struct dbgmem_s mem; @@ -243,7 +243,7 @@ int cmd_mh(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) * Name: cmd_mw ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_MW +#ifndef CONFIG_NSH_DISABLE_MW int cmd_mw(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { struct dbgmem_s mem; @@ -329,7 +329,7 @@ void nsh_dumpbuffer(FAR struct nsh_vtbl_s *vtbl, const char *msg, * Name: cmd_xd ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_XD +#ifndef CONFIG_NSH_DISABLE_XD int cmd_xd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char *addr; diff --git a/apps/nshlib/nsh_ddcmd.c b/apps/nshlib/nsh_ddcmd.c index c33a80ec0..404b484a8 100644 --- a/apps/nshlib/nsh_ddcmd.c +++ b/apps/nshlib/nsh_ddcmd.c @@ -53,7 +53,7 @@ #include <nuttx/fs.h> #include "nsh.h" -#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_EXAMPLES_NSH_DISABLE_DD) +#if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_NSH_DISABLE_DD) /**************************************************************************** * Definitions @@ -492,7 +492,7 @@ int cmd_dd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) #ifdef CAN_PIPE_FROM_STD DD_INFD = 0; /* stdin */ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_DD +#ifndef CONFIG_NSH_DISABLE_DD dd.infread = readch; /* Character oriented read */ dd.infclose = noclose; /* Don't close stdin */ #endif @@ -503,7 +503,7 @@ int cmd_dd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) #ifdef CAN_PIPE_FROM_STD DD_OUTDF = 1; /* stdout */ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_DD +#ifndef CONFIG_NSH_DISABLE_DD dd.outfwrite = writech; /* Character oriented write */ dd.outfclose = noclose; /* Don't close stdout */ #endif @@ -637,5 +637,5 @@ errout_with_paths: return ret; } -#endif /* CONFIG_NFILE_DESCRIPTORS && !CONFIG_EXAMPLES_NSH_DISABLE_DD */ +#endif /* CONFIG_NFILE_DESCRIPTORS && !CONFIG_NSH_DISABLE_DD */ diff --git a/apps/nshlib/nsh_envcmds.c b/apps/nshlib/nsh_envcmds.c index edb2693c4..c452668f3 100644 --- a/apps/nshlib/nsh_envcmds.c +++ b/apps/nshlib/nsh_envcmds.c @@ -208,7 +208,7 @@ void nsh_freefullpath(char *relpath) ****************************************************************************/ #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON) -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_CD +#ifndef CONFIG_NSH_DISABLE_CD int cmd_cd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { const char *path = argv[1]; @@ -266,7 +266,7 @@ int cmd_cd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) * Name: cmd_echo ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_ECHO +#ifndef CONFIG_NSH_DISABLE_ECHO int cmd_echo(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { int i; @@ -289,7 +289,7 @@ int cmd_echo(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON) -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_PWD +#ifndef CONFIG_NSH_DISABLE_PWD int cmd_pwd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { nsh_output(vtbl, "%s\n", nsh_getcwd()); @@ -303,7 +303,7 @@ int cmd_pwd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #ifndef CONFIG_DISABLE_ENVIRON -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_SET +#ifndef CONFIG_NSH_DISABLE_SET int cmd_set(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { int ret = setenv(argv[1], argv[2], TRUE); @@ -321,7 +321,7 @@ int cmd_set(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #ifndef CONFIG_DISABLE_ENVIRON -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_UNSET +#ifndef CONFIG_NSH_DISABLE_UNSET int cmd_unset(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { int ret = unsetenv(argv[1]); diff --git a/apps/nshlib/nsh_fscmds.c b/apps/nshlib/nsh_fscmds.c index 4a471e65f..f0451ce02 100644 --- a/apps/nshlib/nsh_fscmds.c +++ b/apps/nshlib/nsh_fscmds.c @@ -83,9 +83,9 @@ */ #if CONFIG_NFILE_DESCRIPTORS > 0 -# ifdef CONFIG_EXAMPLES_NSH_FILEIOSIZE -# if CONFIG_EXAMPLES_NSH_FILEIOSIZE > (PATH_MAX + 1) -# define IOBUFFERSIZE CONFIG_EXAMPLES_NSH_FILEIOSIZE +# ifdef CONFIG_NSH_FILEIOSIZE +# if CONFIG_NSH_FILEIOSIZE > (PATH_MAX + 1) +# define IOBUFFERSIZE CONFIG_NSH_FILEIOSIZE # else # define IOBUFFERSIZE (PATH_MAX + 1) # endif @@ -176,7 +176,7 @@ static int foreach_direntry(FAR struct nsh_vtbl_s *vtbl, const char *cmd, const /* Trim trailing '/' from directory names */ -#ifdef CONFIG_EXAMPLES_NSH_FULLPATH +#ifdef CONFIG_NSH_FULLPATH trim_dir(arg); #endif @@ -330,7 +330,7 @@ static int ls_handler(FAR struct nsh_vtbl_s *vtbl, const char *dirpath, struct d /* then provide the filename that is common to normal and verbose output */ -#ifdef CONFIG_EXAMPLES_NSH_FULLPATH +#ifdef CONFIG_NSH_FULLPATH nsh_output(vtbl, " %s/%s", arg, entryp->d_name); #else nsh_output(vtbl, " %s", entryp->d_name); @@ -395,7 +395,7 @@ static int ls_recursive(FAR struct nsh_vtbl_s *vtbl, const char *dirpath, ****************************************************************************/ #if CONFIG_NFILE_DESCRIPTORS > 0 -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_CAT +#ifndef CONFIG_NSH_DISABLE_CAT int cmd_cat(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char buffer[IOBUFFERSIZE]; @@ -508,7 +508,7 @@ int cmd_cat(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #if CONFIG_NFILE_DESCRIPTORS > 0 -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_CP +#ifndef CONFIG_NSH_DISABLE_CP int cmd_cp(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { struct stat buf; @@ -690,7 +690,7 @@ errout: ****************************************************************************/ #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT) -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_LOSETUP +#ifndef CONFIG_NSH_DISABLE_LOSETUP int cmd_losetup(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char *loopdev = NULL; @@ -821,7 +821,7 @@ errout_with_paths: ****************************************************************************/ #if CONFIG_NFILE_DESCRIPTORS > 0 -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_LS +#ifndef CONFIG_NSH_DISABLE_LS int cmd_ls(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { const char *relpath; @@ -914,7 +914,7 @@ int cmd_ls(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_WRITABLE) -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_MKDIR +#ifndef CONFIG_NSH_DISABLE_MKDIR int cmd_mkdir(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char *fullpath = nsh_getfullpath(vtbl, argv[1]); @@ -939,7 +939,7 @@ int cmd_mkdir(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_FAT) -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_MKFATFS +#ifndef CONFIG_NSH_DISABLE_MKFATFS int cmd_mkfatfs(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { struct fat_format_s fmt = FAT_FORMAT_INITIALIZER; @@ -965,7 +965,7 @@ int cmd_mkfatfs(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #if CONFIG_NFILE_DESCRIPTORS > 0 -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_MKFIFO +#ifndef CONFIG_NSH_DISABLE_MKFIFO int cmd_mkfifo(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char *fullpath = nsh_getfullpath(vtbl, argv[1]); @@ -990,7 +990,7 @@ int cmd_mkfifo(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_WRITABLE) -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_MKRD +#ifndef CONFIG_NSH_DISABLE_MKRD int cmd_mkrd(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { const char *fmt; @@ -1100,7 +1100,7 @@ errout_with_fmt: ****************************************************************************/ #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_READABLE) -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_MOUNT +#ifndef CONFIG_NSH_DISABLE_MOUNT int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char *source; @@ -1190,7 +1190,7 @@ int cmd_mount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_WRITABLE) -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_RM +#ifndef CONFIG_NSH_DISABLE_RM int cmd_rm(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char *fullpath = nsh_getfullpath(vtbl, argv[1]); @@ -1215,7 +1215,7 @@ int cmd_rm(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_WRITABLE) -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_RMDIR +#ifndef CONFIG_NSH_DISABLE_RMDIR int cmd_rmdir(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char *fullpath = nsh_getfullpath(vtbl, argv[1]); @@ -1239,7 +1239,7 @@ int cmd_rmdir(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) * Name: nsh_script ****************************************************************************/ -#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !defined(CONFIG_EXAMPLES_NSH_DISABLESCRIPT) +#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !defined(CONFIG_NSH_DISABLESCRIPT) int nsh_script(FAR struct nsh_vtbl_s *vtbl, const char *cmd, const char *path) { char *fullpath; @@ -1280,7 +1280,7 @@ int nsh_script(FAR struct nsh_vtbl_s *vtbl, const char *cmd, const char *path) /* Get the next line of input from the file*/ fflush(stdout); - pret = fgets(buffer, CONFIG_EXAMPLES_NSH_LINELEN, stream); + pret = fgets(buffer, CONFIG_NSH_LINELEN, stream); if (pret) { /* Parse process the command. NOTE: this is recursive... @@ -1304,8 +1304,8 @@ int nsh_script(FAR struct nsh_vtbl_s *vtbl, const char *cmd, const char *path) * Name: cmd_sh ****************************************************************************/ -#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !defined(CONFIG_EXAMPLES_NSH_DISABLESCRIPT) -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_SH +#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !defined(CONFIG_NSH_DISABLESCRIPT) +#ifndef CONFIG_NSH_DISABLE_SH int cmd_sh(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { return nsh_script(vtbl, argv[0], argv[1]); @@ -1318,7 +1318,7 @@ int cmd_sh(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_READABLE) -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_UMOUNT +#ifndef CONFIG_NSH_DISABLE_UMOUNT int cmd_umount(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char *fullpath = nsh_getfullpath(vtbl, argv[1]); diff --git a/apps/nshlib/nsh_main.c b/apps/nshlib/nsh_main.c index 3437707a3..9b23e6b79 100644 --- a/apps/nshlib/nsh_main.c +++ b/apps/nshlib/nsh_main.c @@ -52,11 +52,11 @@ #include <errno.h> #include <debug.h> -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG # include <pthread.h> #endif -#ifdef CONFIG_EXAMPLES_NSH_BUILTIN_APPS +#ifdef CONFIG_NSH_BUILTIN_APPS # include <apps/apps.h> #endif #include <apps/nsh.h> @@ -79,7 +79,7 @@ * Maximum size is NSH_MAX_ARGUMENTS+5 */ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG # define MAX_ARGV_ENTRIES (NSH_MAX_ARGUMENTS+5) #else # define MAX_ARGV_ENTRIES (NSH_MAX_ARGUMENTS+4) @@ -98,7 +98,7 @@ struct cmdmap_s const char *usage; /* Usage instructions for 'help' command */ }; -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG struct cmdarg_s { FAR struct nsh_vtbl_s *vtbl; /* For front-end interaction */ @@ -112,11 +112,11 @@ struct cmdarg_s * Private Function Prototypes ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_HELP +#ifndef CONFIG_NSH_DISABLE_HELP static int cmd_help(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_EXIT +#ifndef CONFIG_NSH_DISABLE_EXIT static int cmd_exit(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); #endif static int cmd_unrecognized(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); @@ -134,31 +134,31 @@ static const char g_failure[] = "1"; static const struct cmdmap_s g_cmdmap[] = { -#if !defined(CONFIG_EXAMPLES_NSH_DISABLESCRIPT) && !defined(CONFIG_EXAMPLES_NSH_DISABLE_TEST) +#if !defined(CONFIG_NSH_DISABLESCRIPT) && !defined(CONFIG_NSH_DISABLE_TEST) { "[", cmd_lbracket, 4, NSH_MAX_ARGUMENTS, "<expression> ]" }, #endif #if CONFIG_NFILE_DESCRIPTORS > 0 -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_CAT +# ifndef CONFIG_NSH_DISABLE_CAT { "cat", cmd_cat, 2, NSH_MAX_ARGUMENTS, "<path> [<path> [<path> ...]]" }, # endif #ifndef CONFIG_DISABLE_ENVIRON -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_CD +# ifndef CONFIG_NSH_DISABLE_CD { "cd", cmd_cd, 1, 2, "[<dir-path>|-|~|..]" }, # endif #endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_CP +# ifndef CONFIG_NSH_DISABLE_CP { "cp", cmd_cp, 3, 3, "<source-path> <dest-path>" }, # endif #endif #if CONFIG_NFILE_DESCRIPTORS > 0 -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_LS +# ifndef CONFIG_NSH_DISABLE_LS { "dd", cmd_dd, 3, 6, "if=<infile> of=<outfile> [bs=<sectsize>] [count=<sectors>] [skip=<sectors>]" }, # endif #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_ECHO +#ifndef CONFIG_NSH_DISABLE_ECHO # ifndef CONFIG_DISABLE_ENVIRON { "echo", cmd_echo, 0, NSH_MAX_ARGUMENTS, "[<string|$name> [<string|$name>...]]" }, # else @@ -166,172 +166,172 @@ static const struct cmdmap_s g_cmdmap[] = # endif #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_EXEC +#ifndef CONFIG_NSH_DISABLE_EXEC { "exec", cmd_exec, 2, 3, "<hex-address>" }, #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_EXIT +#ifndef CONFIG_NSH_DISABLE_EXIT { "exit", cmd_exit, 1, 1, NULL }, #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_FREE +#ifndef CONFIG_NSH_DISABLE_FREE { "free", cmd_free, 1, 1, NULL }, #endif #if defined(CONFIG_NET_UDP) && CONFIG_NFILE_DESCRIPTORS > 0 -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_GET +# ifndef CONFIG_NSH_DISABLE_GET { "get", cmd_get, 4, 7, "[-b|-n] [-f <local-path>] -h <ip-address> <remote-path>" }, # endif #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_HELP +#ifndef CONFIG_NSH_DISABLE_HELP { "help", cmd_help, 1, 1, NULL }, #endif #ifdef CONFIG_NET -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_IFCONFIG +# ifndef CONFIG_NSH_DISABLE_IFCONFIG { "ifconfig", cmd_ifconfig, 1, 1, NULL }, # endif #endif #ifndef CONFIG_DISABLE_SIGNALS -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_SLEEP +# ifndef CONFIG_NSH_DISABLE_SLEEP { "kill", cmd_kill, 3, 3, "-<signal> <pid>" }, # endif #endif #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_MOUNTPOINT) -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_LOSETUP +# ifndef CONFIG_NSH_DISABLE_LOSETUP { "losetup", cmd_losetup, 3, 6, "[-d <dev-path>] | [[-o <offset>] [-r] <dev-path> <file-path>]" }, # endif #endif #if CONFIG_NFILE_DESCRIPTORS > 0 -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_LS +# ifndef CONFIG_NSH_DISABLE_LS { "ls", cmd_ls, 1, 5, "[-lRs] <dir-path>" }, # endif #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_MB +#ifndef CONFIG_NSH_DISABLE_MB { "mb", cmd_mb, 2, 3, "<hex-address>[=<hex-value>][ <hex-byte-count>]" }, #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_WRITABLE) -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_MKDIR +# ifndef CONFIG_NSH_DISABLE_MKDIR { "mkdir", cmd_mkdir, 2, 2, "<path>" }, # endif #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_FAT) -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_MKFATFS +# ifndef CONFIG_NSH_DISABLE_MKFATFS { "mkfatfs", cmd_mkfatfs, 2, 2, "<path>" }, # endif #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_MKFIFO +# ifndef CONFIG_NSH_DISABLE_MKFIFO { "mkfifo", cmd_mkfifo, 2, 2, "<path>" }, # endif #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_WRITABLE) -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_MKRD +# ifndef CONFIG_NSH_DISABLE_MKRD { "mkrd", cmd_mkrd, 2, 6, "[-m <minor>] [-s <sector-size>] <nsectors>" }, # endif #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_MH +#ifndef CONFIG_NSH_DISABLE_MH { "mh", cmd_mh, 2, 3, "<hex-address>[=<hex-value>][ <hex-byte-count>]" }, #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_READABLE) -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_MOUNT +# ifndef CONFIG_NSH_DISABLE_MOUNT { "mount", cmd_mount, 4, 5, "-t <fstype> <block-device> <dir-path>" }, # endif #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_MW +#ifndef CONFIG_NSH_DISABLE_MW { "mw", cmd_mw, 2, 3, "<hex-address>[=<hex-value>][ <hex-byte-count>]" }, #endif #if defined(CONFIG_NET) && defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \ !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS) -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_PING +# ifndef CONFIG_NSH_DISABLE_PING { "ping", cmd_ping, 2, 6, "[-c <count>] [-i <interval>] <ip-address>" }, # endif #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_PS +#ifndef CONFIG_NSH_DISABLE_PS { "ps", cmd_ps, 1, 1, NULL }, #endif #if defined(CONFIG_NET_UDP) && CONFIG_NFILE_DESCRIPTORS > 0 -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_PUT +# ifndef CONFIG_NSH_DISABLE_PUT { "put", cmd_put, 4, 7, "[-b|-n] [-f <remote-path>] -h <ip-address> <local-path>" }, # endif #endif #if CONFIG_NFILE_DESCRIPTORS > 0 && !defined(CONFIG_DISABLE_ENVIRON) -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_PWD +# ifndef CONFIG_NSH_DISABLE_PWD { "pwd", cmd_pwd, 1, 1, NULL }, # endif #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_WRITABLE) -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_RM +# ifndef CONFIG_NSH_DISABLE_RM { "rm", cmd_rm, 2, 2, "<file-path>" }, # endif -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_RMDIR +# ifndef CONFIG_NSH_DISABLE_RMDIR { "rmdir", cmd_rmdir, 2, 2, "<dir-path>" }, # endif #endif #ifndef CONFIG_DISABLE_ENVIRON -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_SET +# ifndef CONFIG_NSH_DISABLE_SET { "set", cmd_set, 3, 3, "<name> <value>" }, # endif #endif -#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !defined(CONFIG_EXAMPLES_NSH_DISABLESCRIPT) -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_SH +#if CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !defined(CONFIG_NSH_DISABLESCRIPT) +# ifndef CONFIG_NSH_DISABLE_SH { "sh", cmd_sh, 2, 2, "<script-path>" }, # endif #endif #ifndef CONFIG_DISABLE_SIGNALS -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_SLEEP +# ifndef CONFIG_NSH_DISABLE_SLEEP { "sleep", cmd_sleep, 2, 2, "<sec>" }, # endif #endif -#if !defined(CONFIG_EXAMPLES_NSH_DISABLESCRIPT) && !defined(CONFIG_EXAMPLES_NSH_DISABLE_TEST) +#if !defined(CONFIG_NSH_DISABLESCRIPT) && !defined(CONFIG_NSH_DISABLE_TEST) { "test", cmd_test, 3, NSH_MAX_ARGUMENTS, "<expression>" }, #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 && defined(CONFIG_FS_READABLE) -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_UMOUNT +# ifndef CONFIG_NSH_DISABLE_UMOUNT { "umount", cmd_umount, 2, 2, "<dir-path>" }, # endif #endif #ifndef CONFIG_DISABLE_ENVIRON -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_UNSET +# ifndef CONFIG_NSH_DISABLE_UNSET { "unset", cmd_unset, 2, 2, "<name>" }, # endif #endif #ifndef CONFIG_DISABLE_SIGNALS -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_USLEEP +# ifndef CONFIG_NSH_DISABLE_USLEEP { "usleep", cmd_usleep, 2, 2, "<usec>" }, # endif #endif #if defined(CONFIG_NET_TCP) && CONFIG_NFILE_DESCRIPTORS > 0 -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_GET +# ifndef CONFIG_NSH_DISABLE_GET { "wget", cmd_wget, 2, 4, "[-o <local-path>] <url>" }, # endif #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_XD +#ifndef CONFIG_NSH_DISABLE_XD { "xd", cmd_xd, 3, 3, "<hex-address> <byte-count>" }, #endif { NULL, NULL, 1, 1, NULL } @@ -352,7 +352,7 @@ const char g_fmtnosuch[] = "nsh: %s: no such %s: %s\n"; const char g_fmttoomanyargs[] = "nsh: %s: too many arguments\n"; const char g_fmtdeepnesting[] = "nsh: %s: nesting too deep\n"; const char g_fmtcontext[] = "nsh: %s: not valid in this context\n"; -#ifdef CONFIG_EXAMPLES_NSH_STRERROR +#ifdef CONFIG_NSH_STRERROR const char g_fmtcmdfailed[] = "nsh: %s: %s failed: %s\n"; #else const char g_fmtcmdfailed[] = "nsh: %s: %s failed: %d\n"; @@ -371,18 +371,18 @@ const char g_fmtsignalrecvd[] = "nsh: %s: Interrupted by signal\n"; * Name: cmd_help ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_HELP +#ifndef CONFIG_NSH_DISABLE_HELP static int cmd_help(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { const struct cmdmap_s *ptr; nsh_output(vtbl, "NSH command forms:\n"); -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG nsh_output(vtbl, " [nice [-d <niceness>>]] <cmd> [> <file>|>> <file>] [&]\n"); #else nsh_output(vtbl, " <cmd> [> <file>|>> <file>]\n"); #endif -#ifndef CONFIG_EXAMPLES_NSH_DISABLESCRIPT +#ifndef CONFIG_NSH_DISABLESCRIPT nsh_output(vtbl, "OR\n"); nsh_output(vtbl, " if <cmd>\n"); nsh_output(vtbl, " then\n"); @@ -421,7 +421,7 @@ static int cmd_unrecognized(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) * Name: cmd_exit ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_EXIT +#ifndef CONFIG_NSH_DISABLE_EXIT static int cmd_exit(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { nsh_exit(vtbl); @@ -491,7 +491,7 @@ static int nsh_execute(FAR struct nsh_vtbl_s *vtbl, int argc, char *argv[]) * a list of pre-built applications. */ -#ifdef CONFIG_EXAMPLES_NSH_BUILTIN_APPS +#ifdef CONFIG_NSH_BUILTIN_APPS if (handler == cmd_unrecognized && nsh_execapp(vtbl, cmd, argv) == OK) { /* The pre-built application was successfully started -- return OK. @@ -510,7 +510,7 @@ static int nsh_execute(FAR struct nsh_vtbl_s *vtbl, int argc, char *argv[]) * Name: nsh_releaseargs ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG static void nsh_releaseargs(struct cmdarg_s *arg) { FAR struct nsh_vtbl_s *vtbl = arg->vtbl; @@ -544,7 +544,7 @@ static void nsh_releaseargs(struct cmdarg_s *arg) * Name: nsh_child ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG static pthread_addr_t nsh_child(pthread_addr_t arg) { struct cmdarg_s *carg = (struct cmdarg_s *)arg; @@ -568,7 +568,7 @@ static pthread_addr_t nsh_child(pthread_addr_t arg) * Name: nsh_cloneargs ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG static inline struct cmdarg_s *nsh_cloneargs(FAR struct nsh_vtbl_s *vtbl, int fd, int argc, char *argv[]) { @@ -735,7 +735,7 @@ char *nsh_argument(FAR struct nsh_vtbl_s *vtbl, char **saveptr) * Name: nsh_cmdenabled ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLESCRIPT +#ifndef CONFIG_NSH_DISABLESCRIPT static inline bool nsh_cmdenabled(FAR struct nsh_vtbl_s *vtbl) { struct nsh_parser_s *np = &vtbl->np; @@ -766,7 +766,7 @@ static inline bool nsh_cmdenabled(FAR struct nsh_vtbl_s *vtbl) * Name: nsh_ifthenelse ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLESCRIPT +#ifndef CONFIG_NSH_DISABLESCRIPT static inline int nsh_ifthenelse(FAR struct nsh_vtbl_s *vtbl, FAR char **ppcmd, FAR char **saveptr) { struct nsh_parser_s *np = &vtbl->np; @@ -800,7 +800,7 @@ static inline int nsh_ifthenelse(FAR struct nsh_vtbl_s *vtbl, FAR char **ppcmd, /* Check if we have exceeded the maximum depth of nesting */ - if (np->np_ndx >= CONFIG_EXAMPLES_NSH_NESTDEPTH-1) + if (np->np_ndx >= CONFIG_NSH_NESTDEPTH-1) { nsh_output(vtbl, g_fmtdeepnesting, "if"); goto errout; @@ -909,7 +909,7 @@ static inline int nsh_saveresult(FAR struct nsh_vtbl_s *vtbl, bool result) { struct nsh_parser_s *np = &vtbl->np; -#ifndef CONFIG_EXAMPLES_NSH_DISABLESCRIPT +#ifndef CONFIG_NSH_DISABLESCRIPT if (np->np_st[np->np_ndx].ns_state == NSH_PARSER_IF) { np->np_fail = false; @@ -928,7 +928,7 @@ static inline int nsh_saveresult(FAR struct nsh_vtbl_s *vtbl, bool result) * Name: nsh_nice ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG static inline int nsh_nice(FAR struct nsh_vtbl_s *vtbl, FAR char **ppcmd, FAR char **saveptr) { FAR char *cmd = *ppcmd; @@ -1016,7 +1016,7 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline) /* Initialize parser state */ memset(argv, 0, MAX_ARGV_ENTRIES*sizeof(FAR char *)); -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG vtbl->np.np_bg = false; #endif vtbl->np.np_redirect = false; @@ -1028,7 +1028,7 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline) /* Handler if-then-else-fi */ -#ifndef CONFIG_EXAMPLES_NSH_DISABLESCRIPT +#ifndef CONFIG_NSH_DISABLESCRIPT if (nsh_ifthenelse(vtbl, &cmd, &saveptr) != 0) { goto errout; @@ -1037,7 +1037,7 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline) /* Handle nice */ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG if (nsh_nice(vtbl, &cmd, &saveptr) != 0) { goto errout; @@ -1048,7 +1048,7 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline) * currently disabled. */ -#ifndef CONFIG_EXAMPLES_NSH_DISABLESCRIPT +#ifndef CONFIG_NSH_DISABLESCRIPT if (!cmd || !nsh_cmdenabled(vtbl)) #else if (!cmd) @@ -1088,7 +1088,7 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline) /* Check if the command should run in background */ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG if (argc > 1 && strcmp(argv[argc-1], "&") == 0) { vtbl->np.np_bg = true; @@ -1155,9 +1155,9 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline) * However is app is to be started as nuttapp new process will * be created anyway, so skip this step. */ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG if (vtbl->np.np_bg -#ifdef CONFIG_EXAMPLES_NSH_BUILTIN_APPS +#ifdef CONFIG_NSH_BUILTIN_APPS && nuttapp_isavail(argv[0]) < 0 #endif ) @@ -1287,7 +1287,7 @@ int nsh_parse(FAR struct nsh_vtbl_s *vtbl, char *cmdline) return nsh_saveresult(vtbl, false); -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG errout_with_redirect: if (vtbl->np.np_redirect) { diff --git a/apps/nshlib/nsh_mmcmds.c b/apps/nshlib/nsh_mmcmds.c index f2e218786..4b6e0bf41 100644 --- a/apps/nshlib/nsh_mmcmds.c +++ b/apps/nshlib/nsh_mmcmds.c @@ -75,7 +75,7 @@ * Name: cmd_free ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_FREE +#ifndef CONFIG_NSH_DISABLE_FREE int cmd_free(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { struct mallinfo mem; diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c index 44fea2e2a..507742f56 100644 --- a/apps/nshlib/nsh_netcmds.c +++ b/apps/nshlib/nsh_netcmds.c @@ -74,7 +74,7 @@ #endif #if defined(CONFIG_NET_TCP) && CONFIG_NFILE_DESCRIPTORS > 0 -# ifndef CONFIG_EXAMPLES_NSH_DISABLE_WGET +# ifndef CONFIG_NSH_DISABLE_WGET # include <net/uip/uip-lib.h> # include <net/uip/webclient.h> # endif @@ -143,7 +143,7 @@ static inline uint16_t ping_newid(void) * Name: uip_statistics ****************************************************************************/ -#if defined(CONFIG_NET_STATISTICS) && !defined(CONFIG_EXAMPLES_NSH_DISABLE_IFCONFIG) +#if defined(CONFIG_NET_STATISTICS) && !defined(CONFIG_NSH_DISABLE_IFCONFIG) static inline void uip_statistics(FAR struct nsh_vtbl_s *vtbl) { nsh_output(vtbl, "uIP IP "); @@ -405,7 +405,7 @@ errout: ****************************************************************************/ #if defined(CONFIG_NET_TCP) && CONFIG_NFILE_DESCRIPTORS > 0 -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_WGET +#ifndef CONFIG_NSH_DISABLE_WGET static void wget_callback(FAR char **buffer, int offset, int datend, FAR int *buflen, FAR void *arg) { @@ -423,7 +423,7 @@ static void wget_callback(FAR char **buffer, int offset, int datend, ****************************************************************************/ #if defined(CONFIG_NET_UDP) && CONFIG_NFILE_DESCRIPTORS > 0 -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_GET +#ifndef CONFIG_NSH_DISABLE_GET int cmd_get(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { struct tftpc_args_s args; @@ -463,7 +463,7 @@ int cmd_get(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) * Name: cmd_ifconfig ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_IFCONFIG +#ifndef CONFIG_NSH_DISABLE_IFCONFIG int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { netdev_foreach(ifconfig_callback, vtbl); @@ -478,7 +478,7 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) #if defined(CONFIG_NET_ICMP) && defined(CONFIG_NET_ICMP_PING) && \ !defined(CONFIG_DISABLE_CLOCK) && !defined(CONFIG_DISABLE_SIGNALS) -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_PING +#ifndef CONFIG_NSH_DISABLE_PING int cmd_ping(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { FAR const char *fmt = g_fmtarginvalid; @@ -641,7 +641,7 @@ errout: ****************************************************************************/ #if defined(CONFIG_NET_UDP) && CONFIG_NFILE_DESCRIPTORS > 0 -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_PUT +#ifndef CONFIG_NSH_DISABLE_PUT int cmd_put(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { struct tftpc_args_s args; @@ -682,7 +682,7 @@ int cmd_put(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #if defined(CONFIG_NET_TCP) && CONFIG_NFILE_DESCRIPTORS > 0 -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_WGET +#ifndef CONFIG_NSH_DISABLE_WGET int cmd_wget(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char *localfile = NULL; diff --git a/apps/nshlib/nsh_netinit.c b/apps/nshlib/nsh_netinit.c index eb0052cc7..f49c64e40 100644 --- a/apps/nshlib/nsh_netinit.c +++ b/apps/nshlib/nsh_netinit.c @@ -46,7 +46,7 @@ #include <net/if.h> #include <net/uip/uip-lib.h> -#if defined(CONFIG_EXAMPLES_NSH_DHCPC) +#if defined(CONFIG_NSH_DHCPC) # include <net/uip/resolv.h> # include <net/uip/dhcpc.h> #endif @@ -86,16 +86,16 @@ int nsh_netinit(void) { struct in_addr addr; -#if defined(CONFIG_EXAMPLES_NSH_DHCPC) +#if defined(CONFIG_NSH_DHCPC) FAR void *handle; #endif -#if defined(CONFIG_EXAMPLES_NSH_DHCPC) || defined(CONFIG_EXAMPLES_NSH_NOMAC) +#if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_NOMAC) uint8_t mac[IFHWADDRLEN]; #endif /* Many embedded network interfaces must have a software assigned MAC */ -#ifdef CONFIG_EXAMPLES_NSH_NOMAC +#ifdef CONFIG_NSH_NOMAC mac[0] = 0x00; mac[1] = 0xe0; mac[2] = 0xb0; @@ -107,8 +107,8 @@ int nsh_netinit(void) /* Set up our host address */ -#if !defined(CONFIG_EXAMPLES_NSH_DHCPC) - addr.s_addr = HTONL(CONFIG_EXAMPLES_NSH_IPADDR); +#if !defined(CONFIG_NSH_DHCPC) + addr.s_addr = HTONL(CONFIG_NSH_IPADDR); #else addr.s_addr = 0; #endif @@ -116,21 +116,21 @@ int nsh_netinit(void) /* Set up the default router address */ - addr.s_addr = HTONL(CONFIG_EXAMPLES_NSH_DRIPADDR); + addr.s_addr = HTONL(CONFIG_NSH_DRIPADDR); uip_setdraddr("eth0", &addr); /* Setup the subnet mask */ - addr.s_addr = HTONL(CONFIG_EXAMPLES_NSH_NETMASK); + addr.s_addr = HTONL(CONFIG_NSH_NETMASK); uip_setnetmask("eth0", &addr); -#if defined(CONFIG_EXAMPLES_NSH_DHCPC) +#if defined(CONFIG_NSH_DHCPC) /* Set up the resolver */ resolv_init(); #endif -#if defined(CONFIG_EXAMPLES_NSH_DHCPC) +#if defined(CONFIG_NSH_DHCPC) /* Get the MAC address of the NIC */ uip_getmacaddr("eth0", mac); diff --git a/apps/nshlib/nsh_proccmds.c b/apps/nshlib/nsh_proccmds.c index b49e114ae..0ee48a71d 100644 --- a/apps/nshlib/nsh_proccmds.c +++ b/apps/nshlib/nsh_proccmds.c @@ -98,7 +98,7 @@ static const char *g_statenames[] = * Name: ps_task ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_PS +#ifndef CONFIG_NSH_DISABLE_PS static void ps_task(FAR _TCB *tcb, FAR void *arg) { struct nsh_vtbl_s *vtbl = (struct nsh_vtbl_s*)arg; @@ -145,7 +145,7 @@ static void ps_task(FAR _TCB *tcb, FAR void *arg) * Name: cmd_exec ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_EXEC +#ifndef CONFIG_NSH_DISABLE_EXEC int cmd_exec(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char *endptr; @@ -167,7 +167,7 @@ int cmd_exec(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) * Name: cmd_ps ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_PS +#ifndef CONFIG_NSH_DISABLE_PS int cmd_ps(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { nsh_output(vtbl, "PID PRI SCHD TYPE NP STATE NAME\n"); @@ -181,7 +181,7 @@ int cmd_ps(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #ifndef CONFIG_DISABLE_SIGNALS -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_KILL +#ifndef CONFIG_NSH_DISABLE_KILL int cmd_kill(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char *ptr; @@ -255,7 +255,7 @@ invalid_arg: ****************************************************************************/ #ifndef CONFIG_DISABLE_SIGNALS -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_SLEEP +#ifndef CONFIG_NSH_DISABLE_SLEEP int cmd_sleep(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char *endptr; @@ -278,7 +278,7 @@ int cmd_sleep(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) ****************************************************************************/ #ifndef CONFIG_DISABLE_SIGNALS -#ifndef CONFIG_EXAMPLES_NSH_DISABLE_USLEEP +#ifndef CONFIG_NSH_DISABLE_USLEEP int cmd_usleep(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { char *endptr; diff --git a/apps/nshlib/nsh_romfsetc.c b/apps/nshlib/nsh_romfsetc.c index ec8300de4..184709111 100644 --- a/apps/nshlib/nsh_romfsetc.c +++ b/apps/nshlib/nsh_romfsetc.c @@ -47,13 +47,13 @@ #include "nsh.h" -#ifdef CONFIG_EXAMPLES_NSH_ROMFSETC +#ifdef CONFIG_NSH_ROMFSETC /* Should we use the default ROMFS image? Or a custom, board-specific * ROMFS image? */ -#ifdef CONFIG_EXAMPLES_NSH_ARCHROMFS +#ifdef CONFIG_NSH_ARCHROMFS # include <arch/board/nsh_romfsimg.h> #else # include "nsh_romfsimg.h" @@ -97,8 +97,8 @@ int nsh_romfsetc(void) /* Create a ROM disk for the /etc filesystem */ - ret = romdisk_register(CONFIG_EXAMPLES_NSH_ROMFSDEVNO, romfs_img, - NSECTORS(romfs_img_len), CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE); + ret = romdisk_register(CONFIG_NSH_ROMFSDEVNO, romfs_img, + NSECTORS(romfs_img_len), CONFIG_NSH_ROMFSSECTSIZE); if (ret < 0) { dbg("nsh: romdisk_register failed: %d\n", -ret); @@ -108,17 +108,17 @@ int nsh_romfsetc(void) /* Mount the file system */ vdbg("Mounting ROMFS filesystem at target=%s with source=%s\n", - CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT, MOUNT_DEVNAME); + CONFIG_NSH_ROMFSMOUNTPT, MOUNT_DEVNAME); - ret = mount(MOUNT_DEVNAME, CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT, "romfs", MS_RDONLY, NULL); + ret = mount(MOUNT_DEVNAME, CONFIG_NSH_ROMFSMOUNTPT, "romfs", MS_RDONLY, NULL); if (ret < 0) { dbg("nsh: mount(%s,%s,romfs) failed: %s\n", - MOUNT_DEVNAME, CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT, errno); + MOUNT_DEVNAME, CONFIG_NSH_ROMFSMOUNTPT, errno); return ERROR; } return OK; } -#endif /* CONFIG_EXAMPLES_NSH_ROMFSETC */ +#endif /* CONFIG_NSH_ROMFSETC */ diff --git a/apps/nshlib/nsh_serial.c b/apps/nshlib/nsh_serial.c index 54e6fff4c..609ce3f49 100644 --- a/apps/nshlib/nsh_serial.c +++ b/apps/nshlib/nsh_serial.c @@ -63,7 +63,7 @@ struct serial_s struct nsh_vtbl_s ss_vtbl; int ss_fd; /* Re-direct file descriptor */ FILE *ss_stream; /* Re-direct stream */ - char ss_line[CONFIG_EXAMPLES_NSH_LINELEN]; + char ss_line[CONFIG_NSH_LINELEN]; }; struct serialsave_s @@ -76,7 +76,7 @@ struct serialsave_s * Private Function Prototypes ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG static FAR struct nsh_vtbl_s *nsh_consoleclone(FAR struct nsh_vtbl_s *vtbl); static void nsh_consolerelease(FAR struct nsh_vtbl_s *vtbl); #endif @@ -108,7 +108,7 @@ static inline FAR struct serial_s *nsh_allocstruct(void) struct serial_s *pstate = (struct serial_s *)zalloc(sizeof(struct serial_s)); if (pstate) { -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG pstate->ss_vtbl.clone = nsh_consoleclone; pstate->ss_vtbl.release = nsh_consolerelease; #endif @@ -262,7 +262,7 @@ static FAR char *nsh_consolelinebuffer(FAR struct nsh_vtbl_s *vtbl) * ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG static FAR struct nsh_vtbl_s *nsh_consoleclone(FAR struct nsh_vtbl_s *vtbl) { FAR struct serial_s *pstate = (FAR struct serial_s *)vtbl; @@ -290,7 +290,7 @@ static FAR struct nsh_vtbl_s *nsh_consoleclone(FAR struct nsh_vtbl_s *vtbl) * ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG static void nsh_consolerelease(FAR struct nsh_vtbl_s *vtbl) { FAR struct serial_s *pstate = (FAR struct serial_s *)vtbl; @@ -422,7 +422,7 @@ int nsh_consolemain(int argc, char *argv[]) /* Execute the startup script */ -#ifdef CONFIG_EXAMPLES_NSH_ROMFSETC +#ifdef CONFIG_NSH_ROMFSETC (void)nsh_script(&pstate->ss_vtbl, "init", NSH_INITPATH); #endif @@ -437,7 +437,7 @@ int nsh_consolemain(int argc, char *argv[]) /* Get the next line of input */ - if (fgets(pstate->ss_line, CONFIG_EXAMPLES_NSH_LINELEN, stdin)) + if (fgets(pstate->ss_line, CONFIG_NSH_LINELEN, stdin)) { /* Parse process the command */ diff --git a/apps/nshlib/nsh_telnetd.c b/apps/nshlib/nsh_telnetd.c index 6cf9c188b..4f571f44a 100644 --- a/apps/nshlib/nsh_telnetd.c +++ b/apps/nshlib/nsh_telnetd.c @@ -59,14 +59,14 @@ #include <net/if.h> #include <net/uip/uip-lib.h> -#if defined(CONFIG_EXAMPLES_NSH_DHCPC) +#if defined(CONFIG_NSH_DHCPC) # include <net/uip/resolv.h> # include <net/uip/dhcpc.h> #endif #include "nsh.h" -#ifdef CONFIG_EXAMPLES_NSH_TELNET +#ifdef CONFIG_NSH_TELNET /**************************************************************************** * Definitions @@ -89,7 +89,7 @@ #define TELNET_DO 253 #define TELNET_DONT 254 -#ifdef CONFIG_EXAMPLES_NSH_TELNETD_DUMPBUFFER +#ifdef CONFIG_NSH_TELNETD_DUMPBUFFER # define nsh_telnetdump(vtbl,msg,buf,nb) nsh_dumpbuffer(vtbl,msg,buf,nb) #else # define nsh_telnetdump(vtbl,msg,buf,nb) @@ -105,7 +105,7 @@ struct telnetio_s int tio_sockfd; uint8_t tio_bufndx; uint8_t tio_state; - char tio_inbuffer[CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE]; + char tio_inbuffer[CONFIG_NSH_IOBUFFER_SIZE]; }; struct redirect_s @@ -134,15 +134,15 @@ struct telnetd_s struct telnetio_s *tn; struct redirect_s rd; } u; - char tn_outbuffer[CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE]; - char tn_cmd[CONFIG_EXAMPLES_NSH_LINELEN]; + char tn_outbuffer[CONFIG_NSH_IOBUFFER_SIZE]; + char tn_cmd[CONFIG_NSH_LINELEN]; }; /**************************************************************************** * Private Function Prototypes ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG static void tio_semtake(struct telnetio_s *tio); static FAR struct nsh_vtbl_s *nsh_telnetclone(FAR struct nsh_vtbl_s *vtbl); #endif @@ -192,7 +192,7 @@ static FAR struct telnetd_s *nsh_allocstruct(void) struct telnetd_s *pstate = (struct telnetd_s *)zalloc(sizeof(struct telnetd_s)); if (pstate) { -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG pstate->tn_vtbl.clone = nsh_telnetclone; pstate->tn_vtbl.release = nsh_telnetrelease; #endif @@ -287,7 +287,7 @@ static void nsh_putchar(struct telnetd_s *pstate, uint8_t ch) /* If a newline was added or if the buffer is full, then process it now */ - if (ch == ISO_nl || tio->tio_bufndx == (CONFIG_EXAMPLES_NSH_LINELEN - 1)) + if (ch == ISO_nl || tio->tio_bufndx == (CONFIG_NSH_LINELEN - 1)) { pstate->tn_cmd[tio->tio_bufndx] = '\0'; nsh_telnetdump(&pstate->tn_vtbl, "TELNET CMD", @@ -488,7 +488,7 @@ static void *nsh_connection(void *arg) /* Execute the startup script */ -#if defined(CONFIG_EXAMPLES_NSH_ROMFSETC) && !defined(CONFIG_EXAMPLES_NSH_CONSOLE) +#if defined(CONFIG_NSH_ROMFSETC) && !defined(CONFIG_NSH_CONSOLE) (void)nsh_script(vtbl, "init", NSH_INITPATH); #endif @@ -504,7 +504,7 @@ static void *nsh_connection(void *arg) /* Read a buffer of data from the TELNET client */ ret = recv(tio->tio_sockfd, tio->tio_inbuffer, - CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE, 0); + CONFIG_NSH_IOBUFFER_SIZE, 0); if (ret > 0) { @@ -594,12 +594,12 @@ static int nsh_telnetoutput(FAR struct nsh_vtbl_s *vtbl, const char *fmt, ...) va_list ap; /* Put the new info into the buffer. Here we are counting on the fact that - * no output strings will exceed CONFIG_EXAMPLES_NSH_LINELEN! + * no output strings will exceed CONFIG_NSH_LINELEN! */ va_start(ap, fmt); vsnprintf(&pstate->tn_outbuffer[nbytes], - (CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE - 1) - nbytes, fmt, ap); + (CONFIG_NSH_IOBUFFER_SIZE - 1) - nbytes, fmt, ap); va_end(ap); /* Get the size of the new string just added and the total size of @@ -611,7 +611,7 @@ static int nsh_telnetoutput(FAR struct nsh_vtbl_s *vtbl, const char *fmt, ...) /* Expand any terminating \n to \r\n */ - if (nbytes < (CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE - 2) && + if (nbytes < (CONFIG_NSH_IOBUFFER_SIZE - 2) && pstate->tn_outbuffer[nbytes-1] == '\n') { pstate->tn_outbuffer[nbytes-1] = ISO_cr; @@ -625,7 +625,7 @@ static int nsh_telnetoutput(FAR struct nsh_vtbl_s *vtbl, const char *fmt, ...) * maximum length string. */ - if (nbytes > CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE - CONFIG_EXAMPLES_NSH_LINELEN) + if (nbytes > CONFIG_NSH_IOBUFFER_SIZE - CONFIG_NSH_LINELEN) { nsh_flush(pstate); } @@ -686,7 +686,7 @@ static FAR char *nsh_telnetlinebuffer(FAR struct nsh_vtbl_s *vtbl) * ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG static FAR struct nsh_vtbl_s *nsh_telnetclone(FAR struct nsh_vtbl_s *vtbl) { FAR struct telnetd_s *pstate = (FAR struct telnetd_s *)vtbl; @@ -720,7 +720,7 @@ static FAR struct nsh_vtbl_s *nsh_telnetclone(FAR struct nsh_vtbl_s *vtbl) * ****************************************************************************/ -#ifndef CONFIG_EXAMPLES_NSH_DISABLEBG +#ifndef CONFIG_NSH_DISABLEBG static void nsh_telnetrelease(FAR struct nsh_vtbl_s *vtbl) { FAR struct telnetd_s *pstate = (FAR struct telnetd_s *)vtbl; @@ -846,8 +846,8 @@ int nsh_telnetmain(int argc, char *argv[]) { /* Execute nsh_connection() on each connection to port 23 */ - uip_server(HTONS(23), nsh_connection, CONFIG_EXAMPLES_NSH_STACKSIZE); + uip_server(HTONS(23), nsh_connection, CONFIG_NSH_STACKSIZE); return OK; } -#endif /* CONFIG_EXAMPLES_NSH_TELNET */ +#endif /* CONFIG_NSH_TELNET */ diff --git a/apps/nshlib/nsh_test.c b/apps/nshlib/nsh_test.c index 594887b18..dd63d6796 100644 --- a/apps/nshlib/nsh_test.c +++ b/apps/nshlib/nsh_test.c @@ -70,7 +70,7 @@ #include "nsh.h" -#if !defined(CONFIG_EXAMPLES_NSH_DISABLESCRIPT) && !defined(CONFIG_EXAMPLES_NSH_DISABLE_TEST) +#if !defined(CONFIG_NSH_DISABLESCRIPT) && !defined(CONFIG_NSH_DISABLE_TEST) /**************************************************************************** * Definitions @@ -434,4 +434,4 @@ int cmd_lbracket(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) } } -#endif /* !CONFIG_EXAMPLES_NSH_DISABLESCRIPT && !CONFIG_EXAMPLES_NSH_DISABLE_TEST */ +#endif /* !CONFIG_NSH_DISABLESCRIPT && !CONFIG_NSH_DISABLE_TEST */ diff --git a/nuttx/Documentation/NuttShell.html b/nuttx/Documentation/NuttShell.html index e03aadc7f..d1dd3d922 100644 --- a/nuttx/Documentation/NuttShell.html +++ b/nuttx/Documentation/NuttShell.html @@ -8,7 +8,7 @@ <tr align="center" bgcolor="#e4e4e4"> <td> <h1><big><font color="#3c34ec"><i>NuttShell (NSH)</i></font></big></h1> - <p>Last Updated: March 7, 2011</p> + <p>Last Updated: March 18, 2011</p> </td> </tr> </table> @@ -327,7 +327,9 @@ </table> <p> - The <code>examples/nsh</code> sub-directory contains the NuttShell (NSH). + The <code>apps/nshlib</code> sub-directory contains the NuttShell (NSH) + library. + This library can easily to linked to produce a NSH application (See as an example <code>apps/nshlib</code>). NSH is a simple shell application for NuttX. </p> @@ -511,7 +513,7 @@ fi <p> <b>NSH Start-Up Script</b>. NSH supports options to provide a start up script for NSH. In general - this capability is enabled with <code>CONFIG_EXAMPLES_NSH_ROMFSETC</code>, but has + this capability is enabled with <code>CONFIG_NSH_ROMFSETC</code>, but has several other related configuration options as described with the <a href="#nshconfiguration">NSH-specific configuration settings</a>. This capability also depends on: @@ -530,7 +532,7 @@ fi values. </p> <p> - In this default case, enabling <code>CONFIG_EXAMPLES_NSH_ROMFSETC</code> will cause + In this default case, enabling <code>CONFIG_NSH_ROMFSETC</code> will cause NSH to behave as follows at NSH startup time: <ul> <li> @@ -580,12 +582,12 @@ mount -t vfat /dev/ram1 /tmp </p> <p> <b>Modifying the ROMFS Image</b>. - The contents of the <code>/etc</code> directory are retained in the file <code>examples/nsh/nsh_romfsimg.h</code> OR, if <code>CONFIG_EXAMPLES_NSH_ARCHROMFS</code> is defined, <code>include/arch/board/rcs.template</code>). + The contents of the <code>/etc</code> directory are retained in the file <code>apps/nshlib/nsh_romfsimg.h</code> OR, if <code>CONFIG_NSH_ARCHROMFS</code> is defined, <code>include/arch/board/rcs.template</code>). In order to modify the start-up behavior, there are three things to study: <ol> <li> <b>Configuration Options.</b> - The additional <code>CONFIG_EXAMPLES_NSH_ROMFSETC</code> configuration options + The additional <code>CONFIG_NSH_ROMFSETC</code> configuration options discussed with the other <a href="#nshconfiguration">NSH-specific configuration settings</a>. </li> <li> @@ -602,14 +604,14 @@ mount -t vfat /dev/ram1 /tmp <ul> <li>The configuration settings then installed configuration. <li>The <code>genromfs<code> tool (available from <a href="http://romfs.sourceforge.net">http://romfs.sourceforge.net</a>). - <li>The file <code>examples/nsh/rcS.template</code> - (OR, if <code>CONFIG_EXAMPLES_NSH_ARCHROMFS</code> is defined <code>include/arch/board/rcs.template</code>. + <li>The file <code>apps/nshlib/rcS.template</code> + (OR, if <code>CONFIG_NSH_ARCHROMFS</code> is defined <code>include/arch/board/rcs.template</code>. </ul> </p> </li> <li> <b><code>rcS.template</code></b>. - The file <code>examples/nsh/rcS.template</code> contains the general form + The file <code>apps/nshlib/rcS.template</code> contains the general form of the <code>rcS</code> file; configured values are plugged into this template file to produce the final <code>rcS</code> file. </li> @@ -617,8 +619,8 @@ mount -t vfat /dev/ram1 /tmp </p> <p> <b>NOTE</b>: - <code>examples/nsh/rcS.template</code> generates the standard, default <code>nsh_romfsimg.h</code> file. - If <code>CONFIG_EXAMPLES_NSH_ARCHROMFS<code> is defined in the NuttX configuration file, then a custom, board-specific <code>nsh_romfsimg.h</code> file residing in <code>configs/<board>/include</code> will be used. + <code>apps/nshlib/rcS.template</code> generates the standard, default <code>nsh_romfsimg.h</code> file. + If <code>CONFIG_NSH_ARCHROMFS<code> is defined in the NuttX configuration file, then a custom, board-specific <code>nsh_romfsimg.h</code> file residing in <code>configs/<board>/include</code> will be used. NOTE when the OS is configured, <code>include/arch/board</code> will be linked to <code>configs/<board>/include</code>. </p> <p> @@ -1817,192 +1819,192 @@ nsh> </tr> <tr> <td><b><code>[</code></b></td> - <td>!<code>CONFIG_EXAMPLES_NSH_DISABLESCRIPT</code></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_TEST</code></td> + <td>!<code>CONFIG_NSH_DISABLESCRIPT</code></td> + <td><code>CONFIG_NSH_DISABLE_TEST</code></td> </tr> <tr> <td><b><code>cat</code></b></td> <td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_CAT</code></td> + <td><code>CONFIG_NSH_DISABLE_CAT</code></td> </tr> <tr> <td><b><code>cd</code></b></td> <td>!<code>CONFIG_DISABLE_ENVIRON</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_CD</code></td> + <td><code>CONFIG_NSH_DISABLE_CD</code></td> </tr> <tr> <td><b><code>cp</code></b></td> <td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_CP</code></td> + <td><code>CONFIG_NSH_DISABLE_CP</code></td> </tr> <tr> <td><b><code>dd</code></b></td> <td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_DD</code></td> + <td><code>CONFIG_NSH_DISABLE_DD</code></td> </tr> <tr> <td><b><code>echo</code></b></td> <td><br></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_ECHO</code></td> + <td><code>CONFIG_NSH_DISABLE_ECHO</code></td> </tr> <tr> <td><b><code>exec</code></b></td> <td><br></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_EXEC</code></td> + <td><code>CONFIG_NSH_DISABLE_EXEC</code></td> </tr> <tr> <td><b><code>exit</code></b></td> <td><br></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_EXIT</code></td> + <td><code>CONFIG_NSH_DISABLE_EXIT</code></td> </tr> <tr> <td><b><code>free</code></b></td> <td><br></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_FREE</code></td> + <td><code>CONFIG_NSH_DISABLE_FREE</code></td> </tr> <tr> <td><b><code>get</code></b></td> <td><code>CONFIG_NET</code> && <code>CONFIG_NET_UDP</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_NET_BUFSIZE</code> >= 558<sup>1</sup></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_GET</code></td> + <td><code>CONFIG_NSH_DISABLE_GET</code></td> </tr> <tr> <td><b><code>help</code></b></td> <td><br></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_HELP</code></td> + <td><code>CONFIG_NSH_DISABLE_HELP</code></td> </tr> <tr> <td><b><code>ifconfig</code></b></td> <td><code>CONFIG_NET</code></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_IFCONFIG</code></td> + <td><code>CONFIG_NSH_DISABLE_IFCONFIG</code></td> </tr> <tr> <td><b><code>kill</code></b></td> <td>!<code>CONFIG_DISABLE_SIGNALS</code></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_KILL</code></td> + <td><code>CONFIG_NSH_DISABLE_KILL</code></td> </tr> <tr> <td><b><code>losetup</code></b></td> <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_LOSETUP</code></td> + <td><code>CONFIG_NSH_DISABLE_LOSETUP</code></td> </tr> <tr> <td><b><code>ls</code></b></td> <td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_LS</code></td> + <td><code>CONFIG_NSH_DISABLE_LS</code></td> </tr> <tr> <td><b><code>mb,mh,mw</code></b></td> <td><br></td> <td> - <code>CONFIG_EXAMPLES_NSH_DISABLE_MB</code>,<br> - <code>CONFIG_EXAMPLES_NSH_DISABLE_MH</code>,<br> - <code>CONFIG_EXAMPLES_NSH_DISABLE_MW</code> + <code>CONFIG_NSH_DISABLE_MB</code>,<br> + <code>CONFIG_NSH_DISABLE_MH</code>,<br> + <code>CONFIG_NSH_DISABLE_MW</code> </td> </tr> <tr> <td><b><code>mkdir</code></b></td> <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_WRITABLE</code><sup>4</sup></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_MKDIR</code></td> + <td><code>CONFIG_NSH_DISABLE_MKDIR</code></td> </tr> <tr> <td><b><code>mkfatfs</code></b></td> <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_FAT</code></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_MKFATFS</code></td> + <td><code>CONFIG_NSH_DISABLE_MKFATFS</code></td> </tr> <tr> <td><b><code>mkfifo</code></b></td> <td><code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_MKFIFO</code></td> + <td><code>CONFIG_NSH_DISABLE_MKFIFO</code></td> </tr> <tr> <td><b><code>mkrd</code></b></td> <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_WRITABLE</code><sup>4</sup></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_MKRD</code></td> + <td><code>CONFIG_NSH_DISABLE_MKRD</code></td> </tr> <tr> <td><b><code>mount</code></b></td> <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_READABLE</code><sup>3</sup></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_MOUNT</code></td> + <td><code>CONFIG_NSH_DISABLE_MOUNT</code></td> </tr> <tr> <td><b><code>ping</code></b></td> <td><code>CONFIG_NET</code> && <code>CONFIG_NET_ICMP</code> && <code>CONFIG_NET_ICMP_PING</code> && !<code>CONFIG_DISABLE_CLOCK</code> && !<code>CONFIG_DISABLE_SIGNALS</code></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_PING</code></td> + <td><code>CONFIG_NSH_DISABLE_PING</code></td> </tr> <tr> <td><b><code>ps</code></b></td> <td><br></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_PS</code></td> + <td><code>CONFIG_NSH_DISABLE_PS</code></td> </tr> <tr> <td><b><code>put</code></b></td> <td><code>CONFIG_NET</code> && <code>CONFIG_NET_UDP</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_NET_BUFSIZE</code> >= 558<sup>1,2</sup></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_PUT</code></td> + <td><code>CONFIG_NSH_DISABLE_PUT</code></td> </tr> <tr> <td><b><code>pwd</code></b></td> <td>!<code>CONFIG_DISABLE_ENVIRON</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_PWD</code></td> + <td><code>CONFIG_NSH_DISABLE_PWD</code></td> </tr> <tr> <td><b><code>rm</code></b></td> <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_WRITABLE</code><sup>4</sup></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_RM</code></td> + <td><code>CONFIG_NSH_DISABLE_RM</code></td> </tr> <tr> <td><b><code>rmdir</code></b></td> <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_WRITABLE</code><sup>4</sup></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_RMDIR</code></td> + <td><code>CONFIG_NSH_DISABLE_RMDIR</code></td> </tr> <tr> <td><b><code>set</code></b></td> <td>!<code>CONFIG_DISABLE_ENVIRON</code></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_SET</code></td> + <td><code>CONFIG_NSH_DISABLE_SET</code></td> </tr> <tr> <td><b><code>sh</code></b></td> - <td><code>CONFIG_NFILE_DESCRIPTORS > 0 && <code>CONFIG_NFILE_STREAMS > 0 && !<code>CONFIG_EXAMPLES_NSH_DISABLESCRIPT</code></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_SH</code></td> + <td><code>CONFIG_NFILE_DESCRIPTORS > 0 && <code>CONFIG_NFILE_STREAMS > 0 && !<code>CONFIG_NSH_DISABLESCRIPT</code></td> + <td><code>CONFIG_NSH_DISABLE_SH</code></td> </tr> <tr> <td><b><code>sleep</code></b></td> <td>!<code>CONFIG_DISABLE_SIGNALS</code></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_SLEEP</code></td> + <td><code>CONFIG_NSH_DISABLE_SLEEP</code></td> </tr> <tr> <td><b><code>test</code></b></td> - <td>!<code>CONFIG_EXAMPLES_NSH_DISABLESCRIPT</code></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_TEST</code></td> + <td>!<code>CONFIG_NSH_DISABLESCRIPT</code></td> + <td><code>CONFIG_NSH_DISABLE_TEST</code></td> </tr> <tr> <td><b><code>umount</code></b></td> <td>!<code>CONFIG_DISABLE_MOUNTPOINT</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0 && <code>CONFIG_FS_READABLE</code><sup>3</sup></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_UMOUNT</code></td> + <td><code>CONFIG_NSH_DISABLE_UMOUNT</code></td> </tr> <tr> <td><b><code>unset</code></b></td> <td>!<code>CONFIG_DISABLE_ENVIRON</code></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_UNSET</code></td> + <td><code>CONFIG_NSH_DISABLE_UNSET</code></td> </tr> <tr> <td><b><code>usleep</code></b></td> <td>!<code>CONFIG_DISABLE_SIGNALS</code></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_USLEEP</code></td> + <td><code>CONFIG_NSH_DISABLE_USLEEP</code></td> </tr> <tr> <td><b><code>wget</code></b></td> <td><code>CONFIG_NET</code> && <code>CONFIG_NET_TCP</code> && <code>CONFIG_NFILE_DESCRIPTORS</code> > 0</td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_WGET</code></td> + <td><code>CONFIG_NSH_DISABLE_WGET</code></td> </tr> <tr> <td><b><code>xd</code></b></td> <td><br></td> - <td><code>CONFIG_EXAMPLES_NSH_DISABLE_XD</code></td> + <td><code>CONFIG_NSH_DISABLE_XD</code></td> </tr> </table></center> @@ -2039,28 +2041,28 @@ nsh> <th align="left">Description</th> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_FILEIOSIZE</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_FILEIOSIZE</code></b></td> <td> Size of a static I/O buffer used for file access (ignored if there is no filesystem). Default is 1024. </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_STRERROR</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_STRERROR</code></b></td> <td> strerror(errno) makes more readable output but strerror() is very large and will not be used unless this setting is <i>y</i> </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_LINELEN</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_LINELEN</code></b></td> <td> The maximum length of one command line and of one output line. Default: 80 </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_STACKSIZE</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_STACKSIZE</code></b></td> <td> 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> </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_NESTDEPTH</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_NESTDEPTH</code></b></td> <td> The maximum number of nested <a href="#conditional"><code>if-then[-else]-fi</code></a> sequences that are permissable. Default: 3 </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_DISABLESCRIPT</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_DISABLESCRIPT</code></b></td> <td> This can be set to <i>y</i> to suppress support for scripting. This setting disables the <a href="#cmdsh"><code>sh</code></a>, <a href="#cmdtest"><code>test</code></a>, and <a href="#cmtest"><code>[</code></a> commands and the @@ -2084,7 +2086,7 @@ nsh> </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_DISABLEBG</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_DISABLEBG</code></b></td> <td> This can be set to <i>y</i> to suppress support for background commands. This setting disables the <a href="#cmdoverview"><code>nice</code></a> command prefix and @@ -2093,7 +2095,7 @@ nsh> </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_MMCSDMINOR</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_MMCSDMINOR</code></b></td> <td> 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> </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_ROMFSETC</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_ROMFSETC</code></b></td> <td> Mount a ROMFS filesystem at <code>/etc</code> and provide a startup script at <code>/etc/init.d/rcS</code>. The default startup script will mount @@ -2112,25 +2114,25 @@ nsh> </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_CONSOLE</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_CONSOLE</code></b></td> <td> - If <code>CONFIG_EXAMPLES_NSH_CONSOLE</code>is set to <i>y</i>, then a serial + If <code>CONFIG_NSH_CONSOLE</code>is set to <i>y</i>, then a serial console front-end is selected. </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_TELNET</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_TELNET</code></b></td> <td> - If <code>CONFIG_EXAMPLES_NSH_TELNET</code> is set to <i>y</i>, then a TELENET + If <code>CONFIG_NSH_TELNET</code> is set to <i>y</i>, 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. </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_ARCHINIT</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_ARCHINIT</code></b></td> <td> - Set <code>CONFIG_EXAMPLES_NSH_ARCHINIT</code> if your board provides architecture + Set <code>CONFIG_NSH_ARCHINIT</code> if your board provides architecture specific initialization via the board-specific function <code>nsh_archinitialize()</code>. 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> </table></center> <p> - One or both of <code>CONFIG_EXAMPLES_NSH_CONSOLE</code> and <code>CONFIG_EXAMPLES_NSH_TELNET</code> - must be defined. If <code>CONFIG_EXAMPLES_NSH_TELNET</code> is selected, then there some + One or both of <code>CONFIG_NSH_CONSOLE</code> and <code>CONFIG_NSH_TELNET</code> + must be defined. If <code>CONFIG_NSH_TELNET</code> is selected, then there some other configuration settings that apply: </p> @@ -2167,39 +2169,39 @@ nsh> TCP/IP support is required for telnet (as well as various other TCP-related configuration settings). </td> </tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_IOBUFFER_SIZE</code></b></td> <td> Determines the size of the I/O buffer to use for sending/ receiving TELNET commands/reponses </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_DHCPC</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_DHCPC</code></b></td> <td> Obtain the IP address via DHCP. </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_IPADDR</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_IPADDR</code></b></td> <td> - If <code>CONFIG_EXAMPLES_NSH_DHCPC</code> is NOT set, then the static IP + If <code>CONFIG_NSH_DHCPC</code> is NOT set, then the static IP address must be provided. </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_DRIPADDR</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_DRIPADDR</code></b></td> <td> Default router IP address </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_NETMASK</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_NETMASK</code></b></td> <td> Network mask </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_NOMAC</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_NOMAC</code></b></td> <td> Set if your ethernet hardware has no built-in MAC address. If set, a bogus MAC will be assigned. @@ -2251,7 +2253,7 @@ nsh> </table></center> <p> - If <code>CONFIG_EXAMPLES_NSH_ROMFSETC</code> is selected, then the following additional + If <code>CONFIG_NSH_ROMFSETC</code> is selected, then the following additional configuration setting apply: </p> @@ -2261,13 +2263,13 @@ nsh> <th align="left">Description</th> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_ARCHROMFS</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_ARCHROMFS</code></b></td> <td> May be defined to specify an alternative ROMFS image that can be found at <code>configs/<board>/include/nsh_romfsimg.h</code>. </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_ROMFSMOUNTPT</code></b></td> <td> The default mountpoint for the ROMFS volume is <code>"/etc"</code>, but that can be changed with this setting. This must be a absolute path @@ -2275,7 +2277,7 @@ nsh> </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_INITSCRIPT</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_INITSCRIPT</code></b></td> <td> This is the relative path to the startup script within the mountpoint. The default is <code>"init.d/rcS"</code>. This is a relative path and must not @@ -2283,14 +2285,14 @@ nsh> </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_ROMFSDEVNO</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_ROMFSDEVNO</code></b></td> <td> This is the minor number of the ROMFS block device. The default is '<code>0</code>' corresponding to <code>/dev/ram0</code>. </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_ROMFSSECTSIZE</code></b></td> <td> 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> </table></center> <p> - When the default <code>rcS</code> file used when <code>CONFIG_EXAMPLES_NSH_ROMFSETC</code> is + When the default <code>rcS</code> file used when <code>CONFIG_NSH_ROMFSETC</code> is selected, it will mount a FAT FS under <code>/tmp</code>. The following selections describe that FAT FS. </p> @@ -2312,14 +2314,14 @@ nsh> <th align="left">Description</th> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_FATDEVNO</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_FATDEVNO</code></b></td> <td> This is the minor number of the FAT FS block device. The default is '<code>1</code>' corresponding to <code>/dev/ram1</code>. </td> </tr> <tr> - <td valign="top"><b><code>CONFIG_EXAMPLES_NSH_FATSECTSIZE</code></b></td> + <td valign="top"><b><code>CONFIG_NSH_FATSECTSIZE</code></b></td> <td> This is the sector size use with the FAT FS. Default is 512. </td> @@ -2346,31 +2348,31 @@ nsh> <li><a href="#cmdcd"><code>cd</code></a></li> <li><a href="#commands">Command summaries</a></li> <li><a href="#conditional">Conditional command execution</a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_CONSOLE</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_DHCPC</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_DISABLEBG</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_DISABLESCRIPT</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_DRIPADDR</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_FATDEVNO</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_FATMOUNTPT</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_FATNSECTORS</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_FATSECTSIZE</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_FILEIOSIZE</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_INITSCRIPT</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_IPADDR</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_LINELEN</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_NESTDEPTH</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_NETMASK</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_NOMAC</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_ROMFSDEVNO</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_ROMFSETC</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_ARCHROMFS</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_ROMFSMOUNTPT</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_ROMFSSECTSIZE</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_STACKSIZE</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_STRERROR</code></a></li> - <li><a href="#nshconfiguration"><code>CONFIG_EXAMPLES_NSH_TELNET</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_CONSOLE</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_DHCPC</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_DISABLEBG</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_DISABLESCRIPT</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_DRIPADDR</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_FATDEVNO</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_FATMOUNTPT</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_FATNSECTORS</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_FATSECTSIZE</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_FILEIOSIZE</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_INITSCRIPT</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_IOBUFFER_SIZE</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_IPADDR</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_LINELEN</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_NESTDEPTH</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_NETMASK</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_NOMAC</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_ROMFSDEVNO</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_ROMFSETC</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_ARCHROMFS</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_ROMFSMOUNTPT</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_ROMFSSECTSIZE</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_STACKSIZE</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_STRERROR</code></a></li> + <li><a href="#nshconfiguration"><code>CONFIG_NSH_TELNET</code></a></li> <li><a href="#configuration">Configuration settings</a></li> <li><a href="#cmddependencies">Configuration settings, command dependencies</a></li> <li><a href="#nshconfiguration">Configuration settings, NSH-specific</a></li> diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index 6e5c1d565..ae26bf3a2 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -1847,21 +1847,21 @@ extern void up_ledoff(int led); indirectly through the <code>mount()</code> API. The <code>mount()</code> API binds a block driver instance with a file system and with a mountpoint. Then the user may use the block driver to access the file system on the underlying media. - <i>Example</i>: See the <code>cmd_mount()</code> implementation in <code>examples/nsh/nsh_fscmds.c</code>. + <i>Example</i>: See the <code>cmd_mount()</code> implementation in <code>apps/nshlib/nsh_fscmds.c</code>. </p> </li> <li> <p> <b>Accessing a Character Driver as a Block Device</b>. See the loop device at <code>drivers/loop.c</code>. - <i>Example</i>: See the <code>cmd_losetup()</code> implementation in <code>examples/nsh/nsh_fscmds.c</code>. + <i>Example</i>: See the <code>cmd_losetup()</code> implementation in <code>apps/nshlib/nsh_fscmds.c</code>. </p> </li> <li> <p> <b>Accessing a Block Driver as Character Device</b>. See the Block-to-Character (BCH) conversion logic in <code>drivers/bch/</code>. - <i>Example</i>: See the <code>cmd_dd()</code> implementation in <code>examples/nsh/nsh_ddcmd.c</code>. + <i>Example</i>: See the <code>cmd_dd()</code> implementation in <code>apps/nshlib/nsh_ddcmd.c</code>. </p> </li> <li> diff --git a/nuttx/TODO b/nuttx/TODO index ee9638a0b..b2a3c7317 100644 --- a/nuttx/TODO +++ b/nuttx/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/nuttx/configs/avr32dev1/nsh/defconfig b/nuttx/configs/avr32dev1/nsh/defconfig index cacd37b18..27e791eba 100755 --- a/nuttx/configs/avr32dev1/nsh/defconfig +++ b/nuttx/configs/avr32dev1/nsh/defconfig @@ -670,71 +670,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024 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=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 +# 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=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/nuttx/configs/avr32dev1/ostest/defconfig b/nuttx/configs/avr32dev1/ostest/defconfig index d42dc96dc..58eb351f7 100755 --- a/nuttx/configs/avr32dev1/ostest/defconfig +++ b/nuttx/configs/avr32dev1/ostest/defconfig @@ -670,71 +670,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=1024 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=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/nuttx/configs/c5471evm/defconfig b/nuttx/configs/c5471evm/defconfig index 15d5f7f06..9ecfa331b 100644 --- a/nuttx/configs/c5471evm/defconfig +++ b/nuttx/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/nuttx/configs/c5471evm/dhcpconfig b/nuttx/configs/c5471evm/dhcpconfig index ccfa1e7aa..fcad5b52a 100644 --- a/nuttx/configs/c5471evm/dhcpconfig +++ b/nuttx/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/nuttx/configs/c5471evm/netconfig b/nuttx/configs/c5471evm/netconfig index b28b4c4e9..657c04885 100644 --- a/nuttx/configs/c5471evm/netconfig +++ b/nuttx/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/nuttx/configs/c5471evm/nshconfig b/nuttx/configs/c5471evm/nshconfig index b557874da..7c5ab6fa5 100644 --- a/nuttx/configs/c5471evm/nshconfig +++ b/nuttx/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/nuttx/configs/demo9s12ne64/ostest/defconfig b/nuttx/configs/demo9s12ne64/ostest/defconfig index 21151bb63..c986c1a54 100755 --- a/nuttx/configs/demo9s12ne64/ostest/defconfig +++ b/nuttx/configs/demo9s12ne64/ostest/defconfig @@ -645,71 +645,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=512 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=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 +# 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=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/nuttx/configs/demo9s12ne64/src/Makefile b/nuttx/configs/demo9s12ne64/src/Makefile index 7ae8ccc8a..f63df9719 100755 --- a/nuttx/configs/demo9s12ne64/src/Makefile +++ b/nuttx/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/nuttx/configs/detron/hidkbd/defconfig b/nuttx/configs/detron/hidkbd/defconfig index b0e767579..f432dc2ce 100755 --- a/nuttx/configs/detron/hidkbd/defconfig +++ b/nuttx/configs/detron/hidkbd/defconfig @@ -768,71 +768,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/detron/nsh/defconfig b/nuttx/configs/detron/nsh/defconfig index 3480dd779..af2e99c27 100755 --- a/nuttx/configs/detron/nsh/defconfig +++ b/nuttx/configs/detron/nsh/defconfig @@ -775,71 +775,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/detron/ostest/defconfig b/nuttx/configs/detron/ostest/defconfig index 609071311..9f45c1c05 100755 --- a/nuttx/configs/detron/ostest/defconfig +++ b/nuttx/configs/detron/ostest/defconfig @@ -702,71 +702,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/detron/src/Makefile b/nuttx/configs/detron/src/Makefile index 1d6d01355..dbae83226 100755 --- a/nuttx/configs/detron/src/Makefile +++ b/nuttx/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/nuttx/configs/detron/src/up_nsh.c b/nuttx/configs/detron/src/up_nsh.c index cac549ee7..5a74f8d73 100755 --- a/nuttx/configs/detron/src/up_nsh.c +++ b/nuttx/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/nuttx/configs/detron/wlan/defconfig b/nuttx/configs/detron/wlan/defconfig index 504fe356b..aa298ae0e 100755 --- a/nuttx/configs/detron/wlan/defconfig +++ b/nuttx/configs/detron/wlan/defconfig @@ -774,71 +774,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/ea3131/nsh/defconfig b/nuttx/configs/ea3131/nsh/defconfig index 15bf7abc9..a6f47266e 100755 --- a/nuttx/configs/ea3131/nsh/defconfig +++ b/nuttx/configs/ea3131/nsh/defconfig @@ -654,71 +654,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/ea3131/ostest/defconfig b/nuttx/configs/ea3131/ostest/defconfig index 0688c1e81..2f81e3961 100755 --- a/nuttx/configs/ea3131/ostest/defconfig +++ b/nuttx/configs/ea3131/ostest/defconfig @@ -654,71 +654,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/ea3131/pgnsh/defconfig b/nuttx/configs/ea3131/pgnsh/defconfig index 676e59419..5d4a54ab1 100755 --- a/nuttx/configs/ea3131/pgnsh/defconfig +++ b/nuttx/configs/ea3131/pgnsh/defconfig @@ -799,71 +799,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/ea3131/src/Makefile b/nuttx/configs/ea3131/src/Makefile index d624bd3ea..cb3cc3da8 100755 --- a/nuttx/configs/ea3131/src/Makefile +++ b/nuttx/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/nuttx/configs/ea3131/src/up_nsh.c b/nuttx/configs/ea3131/src/up_nsh.c index 115f59f8b..c0848c9f1 100755 --- a/nuttx/configs/ea3131/src/up_nsh.c +++ b/nuttx/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/nuttx/configs/ea3131/usbserial/defconfig b/nuttx/configs/ea3131/usbserial/defconfig index 6758fcaa0..d4df3b0c5 100755 --- a/nuttx/configs/ea3131/usbserial/defconfig +++ b/nuttx/configs/ea3131/usbserial/defconfig @@ -657,71 +657,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/ea3131/usbstorage/defconfig b/nuttx/configs/ea3131/usbstorage/defconfig index 9ff7a9911..273510689 100755 --- a/nuttx/configs/ea3131/usbstorage/defconfig +++ b/nuttx/configs/ea3131/usbstorage/defconfig @@ -657,71 +657,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/eagle100/httpd/defconfig b/nuttx/configs/eagle100/httpd/defconfig index f9ed12452..110b9c0c8 100644 --- a/nuttx/configs/eagle100/httpd/defconfig +++ b/nuttx/configs/eagle100/httpd/defconfig @@ -520,71 +520,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/eagle100/nettest/defconfig b/nuttx/configs/eagle100/nettest/defconfig index ded9f0f19..07d61b821 100644 --- a/nuttx/configs/eagle100/nettest/defconfig +++ b/nuttx/configs/eagle100/nettest/defconfig @@ -511,71 +511,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/eagle100/nsh/defconfig b/nuttx/configs/eagle100/nsh/defconfig index bb09da1b6..8f2bdfe65 100644 --- a/nuttx/configs/eagle100/nsh/defconfig +++ b/nuttx/configs/eagle100/nsh/defconfig @@ -496,71 +496,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/eagle100/nxflat/defconfig b/nuttx/configs/eagle100/nxflat/defconfig index 50d5e98dc..55edb913b 100644 --- a/nuttx/configs/eagle100/nxflat/defconfig +++ b/nuttx/configs/eagle100/nxflat/defconfig @@ -509,71 +509,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/eagle100/ostest/defconfig b/nuttx/configs/eagle100/ostest/defconfig index a71bf61f4..e2fb3e6fa 100644 --- a/nuttx/configs/eagle100/ostest/defconfig +++ b/nuttx/configs/eagle100/ostest/defconfig @@ -503,71 +503,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/eagle100/src/Makefile b/nuttx/configs/eagle100/src/Makefile index 79fb8a558..df734e7a3 100644 --- a/nuttx/configs/eagle100/src/Makefile +++ b/nuttx/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/nuttx/configs/eagle100/src/up_nsh.c b/nuttx/configs/eagle100/src/up_nsh.c index 184523c92..31d9adebd 100644 --- a/nuttx/configs/eagle100/src/up_nsh.c +++ b/nuttx/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/nuttx/configs/eagle100/thttpd/defconfig b/nuttx/configs/eagle100/thttpd/defconfig index 54ddb6b5b..09abbd97c 100644 --- a/nuttx/configs/eagle100/thttpd/defconfig +++ b/nuttx/configs/eagle100/thttpd/defconfig @@ -607,71 +607,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/ez80f910200kitg/ostest/defconfig b/nuttx/configs/ez80f910200kitg/ostest/defconfig index 7aaabc009..a7ac41c99 100644 --- a/nuttx/configs/ez80f910200kitg/ostest/defconfig +++ b/nuttx/configs/ez80f910200kitg/ostest/defconfig @@ -638,66 +638,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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 -# -# 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=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 +# 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 +# +# 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=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/nuttx/configs/ez80f910200zco/dhcpd/defconfig b/nuttx/configs/ez80f910200zco/dhcpd/defconfig index 7d283d23b..0b9b60c4c 100644 --- a/nuttx/configs/ez80f910200zco/dhcpd/defconfig +++ b/nuttx/configs/ez80f910200zco/dhcpd/defconfig @@ -665,66 +665,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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 -# -# 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=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 +# 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 +# +# 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=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/nuttx/configs/ez80f910200zco/httpd/defconfig b/nuttx/configs/ez80f910200zco/httpd/defconfig index deb71f1a9..d12b966f1 100644 --- a/nuttx/configs/ez80f910200zco/httpd/defconfig +++ b/nuttx/configs/ez80f910200zco/httpd/defconfig @@ -673,66 +673,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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 -# -# 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=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 +# 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 +# +# 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=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/nuttx/configs/ez80f910200zco/nettest/defconfig b/nuttx/configs/ez80f910200zco/nettest/defconfig index 47994153b..22774b4ec 100644 --- a/nuttx/configs/ez80f910200zco/nettest/defconfig +++ b/nuttx/configs/ez80f910200zco/nettest/defconfig @@ -665,66 +665,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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 -# -# 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=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 +# 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 +# +# 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=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/nuttx/configs/ez80f910200zco/nsh/defconfig b/nuttx/configs/ez80f910200zco/nsh/defconfig index f91c216d2..238f9d985 100644 --- a/nuttx/configs/ez80f910200zco/nsh/defconfig +++ b/nuttx/configs/ez80f910200zco/nsh/defconfig @@ -665,66 +665,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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 -# -# 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_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 +# 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 +# +# 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_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/nuttx/configs/ez80f910200zco/ostest/defconfig b/nuttx/configs/ez80f910200zco/ostest/defconfig index 2022ff608..1be716ff8 100644 --- a/nuttx/configs/ez80f910200zco/ostest/defconfig +++ b/nuttx/configs/ez80f910200zco/ostest/defconfig @@ -648,66 +648,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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 -# -# 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=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 +# 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 +# +# 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=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/nuttx/configs/ez80f910200zco/poll/defconfig b/nuttx/configs/ez80f910200zco/poll/defconfig index cdbb56604..755a5c93a 100644 --- a/nuttx/configs/ez80f910200zco/poll/defconfig +++ b/nuttx/configs/ez80f910200zco/poll/defconfig @@ -665,66 +665,66 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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 -# -# 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=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 +# 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 +# +# 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=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/nuttx/configs/lm3s6965-ek/nsh/defconfig b/nuttx/configs/lm3s6965-ek/nsh/defconfig index 3cdb92a69..03b6c3534 100755 --- a/nuttx/configs/lm3s6965-ek/nsh/defconfig +++ b/nuttx/configs/lm3s6965-ek/nsh/defconfig @@ -520,71 +520,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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 +# 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=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/nuttx/configs/lm3s6965-ek/nx/defconfig b/nuttx/configs/lm3s6965-ek/nx/defconfig index a39c01208..f4f7a2353 100755 --- a/nuttx/configs/lm3s6965-ek/nx/defconfig +++ b/nuttx/configs/lm3s6965-ek/nx/defconfig @@ -641,71 +641,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/lm3s6965-ek/ostest/defconfig b/nuttx/configs/lm3s6965-ek/ostest/defconfig index fc17aeb86..13876f7a3 100755 --- a/nuttx/configs/lm3s6965-ek/ostest/defconfig +++ b/nuttx/configs/lm3s6965-ek/ostest/defconfig @@ -517,71 +517,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/lm3s6965-ek/src/Makefile b/nuttx/configs/lm3s6965-ek/src/Makefile index dfb59a4ed..58ea3f351 100755 --- a/nuttx/configs/lm3s6965-ek/src/Makefile +++ b/nuttx/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/nuttx/configs/lm3s6965-ek/src/up_nsh.c b/nuttx/configs/lm3s6965-ek/src/up_nsh.c index b8f13879c..4b0697400 100755 --- a/nuttx/configs/lm3s6965-ek/src/up_nsh.c +++ b/nuttx/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/nuttx/configs/lm3s8962-ek/nsh/defconfig b/nuttx/configs/lm3s8962-ek/nsh/defconfig index 0b6532371..c3718a69a 100755 --- a/nuttx/configs/lm3s8962-ek/nsh/defconfig +++ b/nuttx/configs/lm3s8962-ek/nsh/defconfig @@ -520,71 +520,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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 +# 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=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/nuttx/configs/lm3s8962-ek/nx/defconfig b/nuttx/configs/lm3s8962-ek/nx/defconfig index e386634a7..c34d4440d 100755 --- a/nuttx/configs/lm3s8962-ek/nx/defconfig +++ b/nuttx/configs/lm3s8962-ek/nx/defconfig @@ -640,71 +640,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/lm3s8962-ek/ostest/defconfig b/nuttx/configs/lm3s8962-ek/ostest/defconfig index 7e7c84dda..f434ea835 100755 --- a/nuttx/configs/lm3s8962-ek/ostest/defconfig +++ b/nuttx/configs/lm3s8962-ek/ostest/defconfig @@ -517,71 +517,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/lm3s8962-ek/src/Makefile b/nuttx/configs/lm3s8962-ek/src/Makefile index 8c5d10bc4..fbea519be 100755 --- a/nuttx/configs/lm3s8962-ek/src/Makefile +++ b/nuttx/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/nuttx/configs/lm3s8962-ek/src/up_nsh.c b/nuttx/configs/lm3s8962-ek/src/up_nsh.c index 999013b13..d21edc46b 100755 --- a/nuttx/configs/lm3s8962-ek/src/up_nsh.c +++ b/nuttx/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/nuttx/configs/m68332evb/defconfig b/nuttx/configs/m68332evb/defconfig index db8c91dde..83e09d881 100644 --- a/nuttx/configs/m68332evb/defconfig +++ b/nuttx/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/nuttx/configs/mbed/hidkbd/defconfig b/nuttx/configs/mbed/hidkbd/defconfig index a4e45838f..f66a96fa3 100644 --- a/nuttx/configs/mbed/hidkbd/defconfig +++ b/nuttx/configs/mbed/hidkbd/defconfig @@ -773,71 +773,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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 +# 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=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/nuttx/configs/mbed/nsh/defconfig b/nuttx/configs/mbed/nsh/defconfig index 6e482ff65..1de314b2e 100755 --- a/nuttx/configs/mbed/nsh/defconfig +++ b/nuttx/configs/mbed/nsh/defconfig @@ -702,71 +702,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/mbed/src/Makefile b/nuttx/configs/mbed/src/Makefile index 5bbf1d13c..98b824b66 100755 --- a/nuttx/configs/mbed/src/Makefile +++ b/nuttx/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/nuttx/configs/mbed/src/up_nsh.c b/nuttx/configs/mbed/src/up_nsh.c index 8d0cfd472..f8c46bc81 100755 --- a/nuttx/configs/mbed/src/up_nsh.c +++ b/nuttx/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/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 diff --git a/nuttx/configs/mx1ads/ostest/defconfig b/nuttx/configs/mx1ads/ostest/defconfig index 06ab2a83f..0c63113cc 100644 --- a/nuttx/configs/mx1ads/ostest/defconfig +++ b/nuttx/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/nuttx/configs/ne64badge/ostest/defconfig b/nuttx/configs/ne64badge/ostest/defconfig index b2d74a5e6..87a3ae170 100755 --- a/nuttx/configs/ne64badge/ostest/defconfig +++ b/nuttx/configs/ne64badge/ostest/defconfig @@ -656,71 +656,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=512 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=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 +# 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=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/nuttx/configs/ne64badge/src/Makefile b/nuttx/configs/ne64badge/src/Makefile index 2f8f0b390..07081cd59 100755 --- a/nuttx/configs/ne64badge/src/Makefile +++ b/nuttx/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/nuttx/configs/ntosd-dm320/nettest/defconfig b/nuttx/configs/ntosd-dm320/nettest/defconfig index bb6351bff..d890345b0 100644 --- a/nuttx/configs/ntosd-dm320/nettest/defconfig +++ b/nuttx/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/nuttx/configs/ntosd-dm320/nsh/defconfig b/nuttx/configs/ntosd-dm320/nsh/defconfig index cd0bd274a..e662ff6aa 100644 --- a/nuttx/configs/ntosd-dm320/nsh/defconfig +++ b/nuttx/configs/ntosd-dm320/nsh/defconfig @@ -531,60 +531,60 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100 CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 # -# 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 -# -# 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=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 +# 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 +# +# 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=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/nuttx/configs/ntosd-dm320/ostest/defconfig b/nuttx/configs/ntosd-dm320/ostest/defconfig index 9d4e026c5..48508b03b 100644 --- a/nuttx/configs/ntosd-dm320/ostest/defconfig +++ b/nuttx/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/nuttx/configs/ntosd-dm320/poll/defconfig b/nuttx/configs/ntosd-dm320/poll/defconfig index b0c549897..eb3336715 100644 --- a/nuttx/configs/ntosd-dm320/poll/defconfig +++ b/nuttx/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/nuttx/configs/ntosd-dm320/thttpd/defconfig b/nuttx/configs/ntosd-dm320/thttpd/defconfig index c23e7b89f..06b9a177d 100644 --- a/nuttx/configs/ntosd-dm320/thttpd/defconfig +++ b/nuttx/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_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_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 +# 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_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/nuttx/configs/ntosd-dm320/udp/defconfig b/nuttx/configs/ntosd-dm320/udp/defconfig index 487bed2ab..91b582915 100644 --- a/nuttx/configs/ntosd-dm320/udp/defconfig +++ b/nuttx/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/nuttx/configs/ntosd-dm320/uip/defconfig b/nuttx/configs/ntosd-dm320/uip/defconfig index d78927ed4..8ebe89415 100644 --- a/nuttx/configs/ntosd-dm320/uip/defconfig +++ b/nuttx/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/nuttx/configs/nucleus2g/nsh/defconfig b/nuttx/configs/nucleus2g/nsh/defconfig index 6b0b35559..55e105975 100755 --- a/nuttx/configs/nucleus2g/nsh/defconfig +++ b/nuttx/configs/nucleus2g/nsh/defconfig @@ -767,71 +767,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/nucleus2g/ostest/defconfig b/nuttx/configs/nucleus2g/ostest/defconfig index 78e8e5bb8..537a02607 100755 --- a/nuttx/configs/nucleus2g/ostest/defconfig +++ b/nuttx/configs/nucleus2g/ostest/defconfig @@ -702,71 +702,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/nucleus2g/src/Makefile b/nuttx/configs/nucleus2g/src/Makefile index c54ba8a0a..36415136d 100755 --- a/nuttx/configs/nucleus2g/src/Makefile +++ b/nuttx/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/nuttx/configs/nucleus2g/src/up_nsh.c b/nuttx/configs/nucleus2g/src/up_nsh.c index 10acca85f..faf42bb51 100755 --- a/nuttx/configs/nucleus2g/src/up_nsh.c +++ b/nuttx/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/nuttx/configs/nucleus2g/usbserial/defconfig b/nuttx/configs/nucleus2g/usbserial/defconfig index 71ee3c1eb..2063261a4 100755 --- a/nuttx/configs/nucleus2g/usbserial/defconfig +++ b/nuttx/configs/nucleus2g/usbserial/defconfig @@ -703,71 +703,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/nucleus2g/usbstorage/defconfig b/nuttx/configs/nucleus2g/usbstorage/defconfig index 4a30ba3a8..f02167251 100755 --- a/nuttx/configs/nucleus2g/usbstorage/defconfig +++ b/nuttx/configs/nucleus2g/usbstorage/defconfig @@ -703,71 +703,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig index b57152909..e3267eafe 100755 --- a/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/hidkbd/defconfig @@ -773,71 +773,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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 +# 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=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/nuttx/configs/olimex-lpc1766stk/nettest/defconfig b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig index aa4ed7f7c..0c2c1b0a6 100755 --- a/nuttx/configs/olimex-lpc1766stk/nettest/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nettest/defconfig @@ -726,71 +726,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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 +# 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=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/nuttx/configs/olimex-lpc1766stk/nsh/defconfig b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig index 24239d6ee..1e2c074e8 100755 --- a/nuttx/configs/olimex-lpc1766stk/nsh/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nsh/defconfig @@ -773,71 +773,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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 +# 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=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/nuttx/configs/olimex-lpc1766stk/nx/defconfig b/nuttx/configs/olimex-lpc1766stk/nx/defconfig index d6b3d8279..565337548 100755 --- a/nuttx/configs/olimex-lpc1766stk/nx/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/nx/defconfig @@ -882,71 +882,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/olimex-lpc1766stk/ostest/defconfig b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig index bdca7c32d..561eba638 100755 --- a/nuttx/configs/olimex-lpc1766stk/ostest/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/ostest/defconfig @@ -717,71 +717,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig b/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig index dced6af18..81978e279 100755 --- a/nuttx/configs/olimex-lpc1766stk/slip-httpd/defconfig +++ b/nuttx/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 -# -# 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=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/nuttx/configs/olimex-lpc1766stk/src/Makefile b/nuttx/configs/olimex-lpc1766stk/src/Makefile index aa89ea9ad..ae53d0807 100755 --- a/nuttx/configs/olimex-lpc1766stk/src/Makefile +++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c b/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c index afb6d084e..df51c3cab 100755 --- a/nuttx/configs/olimex-lpc1766stk/src/up_nsh.c +++ b/nuttx/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/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig index b2f1a8232..118444517 100755 --- a/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/thttpd/defconfig @@ -825,71 +825,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig index 48e0f8407..cf7d7cb99 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/usbserial/defconfig @@ -718,71 +718,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig index 7c6795401..85918740c 100755 --- a/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/usbstorage/defconfig @@ -718,71 +718,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/olimex-lpc1766stk/wlan/defconfig b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig index 58105751c..43d281570 100755 --- a/nuttx/configs/olimex-lpc1766stk/wlan/defconfig +++ b/nuttx/configs/olimex-lpc1766stk/wlan/defconfig @@ -773,71 +773,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/olimex-lpc2378/nsh/defconfig b/nuttx/configs/olimex-lpc2378/nsh/defconfig index 73b7fad0b..85c3f3bf0 100755 --- a/nuttx/configs/olimex-lpc2378/nsh/defconfig +++ b/nuttx/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_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 # Stack and heap information diff --git a/nuttx/configs/olimex-lpc2378/ostest/defconfig b/nuttx/configs/olimex-lpc2378/ostest/defconfig index 6f92f2085..f3938a530 100755 --- a/nuttx/configs/olimex-lpc2378/ostest/defconfig +++ b/nuttx/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_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 # Stack and heap information diff --git a/nuttx/configs/olimex-lpc2378/src/Makefile b/nuttx/configs/olimex-lpc2378/src/Makefile index dac27f82a..1319a4915 100755 --- a/nuttx/configs/olimex-lpc2378/src/Makefile +++ b/nuttx/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/nuttx/configs/olimex-lpc2378/src/up_nsh.c b/nuttx/configs/olimex-lpc2378/src/up_nsh.c index 4bf6ac8df..d6b2445ca 100755 --- a/nuttx/configs/olimex-lpc2378/src/up_nsh.c +++ b/nuttx/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/nuttx/configs/olimex-strp711/nettest/defconfig b/nuttx/configs/olimex-strp711/nettest/defconfig index 985f654d6..ed34172d1 100755 --- a/nuttx/configs/olimex-strp711/nettest/defconfig +++ b/nuttx/configs/olimex-strp711/nettest/defconfig @@ -662,70 +662,70 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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/olimex-strp711/nsh/defconfig b/nuttx/configs/olimex-strp711/nsh/defconfig index 87d75418f..27e58db93 100644 --- a/nuttx/configs/olimex-strp711/nsh/defconfig +++ b/nuttx/configs/olimex-strp711/nsh/defconfig @@ -597,69 +597,69 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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/olimex-strp711/ostest/defconfig b/nuttx/configs/olimex-strp711/ostest/defconfig index 9bb56b7c1..0add6394e 100644 --- a/nuttx/configs/olimex-strp711/ostest/defconfig +++ b/nuttx/configs/olimex-strp711/ostest/defconfig @@ -597,70 +597,70 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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/olimex-strp711/src/Makefile b/nuttx/configs/olimex-strp711/src/Makefile index 722d60b7c..761237d85 100644 --- a/nuttx/configs/olimex-strp711/src/Makefile +++ b/nuttx/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/nuttx/configs/olimex-strp711/src/up_nsh.c b/nuttx/configs/olimex-strp711/src/up_nsh.c index cff3129db..e6d2d349e 100644 --- a/nuttx/configs/olimex-strp711/src/up_nsh.c +++ b/nuttx/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/nuttx/configs/pjrc-8051/defconfig b/nuttx/configs/pjrc-8051/defconfig index 1c1340a8a..764ebe1ed 100644 --- a/nuttx/configs/pjrc-8051/defconfig +++ b/nuttx/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/nuttx/configs/qemu-i486/nsh/defconfig b/nuttx/configs/qemu-i486/nsh/defconfig index 91f34e55c..dfe3fb494 100644 --- a/nuttx/configs/qemu-i486/nsh/defconfig +++ b/nuttx/configs/qemu-i486/nsh/defconfig @@ -448,64 +448,64 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100 CONFIG_EXAMPLES_OSTEST_STACKSIZE=4096 # -# 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=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 +# 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=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/nuttx/configs/qemu-i486/ostest/defconfig b/nuttx/configs/qemu-i486/ostest/defconfig index 394761ed2..9695160cf 100644 --- a/nuttx/configs/qemu-i486/ostest/defconfig +++ b/nuttx/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/nuttx/configs/sam3u-ek/nsh/defconfig b/nuttx/configs/sam3u-ek/nsh/defconfig index 61f49da6c..8b2cf20e3 100755 --- a/nuttx/configs/sam3u-ek/nsh/defconfig +++ b/nuttx/configs/sam3u-ek/nsh/defconfig @@ -743,71 +743,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/sam3u-ek/nx/defconfig b/nuttx/configs/sam3u-ek/nx/defconfig index 12ae973c8..42d2dc9b2 100755 --- a/nuttx/configs/sam3u-ek/nx/defconfig +++ b/nuttx/configs/sam3u-ek/nx/defconfig @@ -752,71 +752,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/sam3u-ek/ostest/defconfig b/nuttx/configs/sam3u-ek/ostest/defconfig index cdb31139f..1d5456a9a 100755 --- a/nuttx/configs/sam3u-ek/ostest/defconfig +++ b/nuttx/configs/sam3u-ek/ostest/defconfig @@ -741,71 +741,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/sam3u-ek/src/Makefile b/nuttx/configs/sam3u-ek/src/Makefile index c80b99c8f..9aa681b8b 100755 --- a/nuttx/configs/sam3u-ek/src/Makefile +++ b/nuttx/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/nuttx/configs/sam3u-ek/src/up_nsh.c b/nuttx/configs/sam3u-ek/src/up_nsh.c index cb3665f90..842d8b762 100755 --- a/nuttx/configs/sam3u-ek/src/up_nsh.c +++ b/nuttx/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/nuttx/configs/sim/mount/defconfig b/nuttx/configs/sim/mount/defconfig index 98ac9d119..d8c9870ab 100644 --- a/nuttx/configs/sim/mount/defconfig +++ b/nuttx/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/nuttx/configs/sim/nettest/defconfig b/nuttx/configs/sim/nettest/defconfig index 8c3713207..9e19a3b87 100644 --- a/nuttx/configs/sim/nettest/defconfig +++ b/nuttx/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/nuttx/configs/sim/nsh/defconfig b/nuttx/configs/sim/nsh/defconfig index 9547e45ac..f7611123b 100644 --- a/nuttx/configs/sim/nsh/defconfig +++ b/nuttx/configs/sim/nsh/defconfig @@ -340,60 +340,60 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100 CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 # -# 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 -# -# 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=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 +# 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 +# +# 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=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/nuttx/configs/sim/nx/defconfig b/nuttx/configs/sim/nx/defconfig index 688fb6a66..fa6557d74 100644 --- a/nuttx/configs/sim/nx/defconfig +++ b/nuttx/configs/sim/nx/defconfig @@ -434,60 +434,60 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100 CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 # -# 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 -# -# 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=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 +# 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 +# +# 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=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/nuttx/configs/sim/nx/defconfig-x11 b/nuttx/configs/sim/nx/defconfig-x11 index 3594732cc..5d483ef0a 100644 --- a/nuttx/configs/sim/nx/defconfig-x11 +++ b/nuttx/configs/sim/nx/defconfig-x11 @@ -434,60 +434,60 @@ CONFIG_EXAMPLES_OSTEST_LOOPS=100 CONFIG_EXAMPLES_OSTEST_STACKSIZE=8192 # -# 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 -# -# 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=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 +# 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 +# +# 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=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/nuttx/configs/sim/ostest/defconfig b/nuttx/configs/sim/ostest/defconfig index 625feca2a..87f3c878b 100644 --- a/nuttx/configs/sim/ostest/defconfig +++ b/nuttx/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/nuttx/configs/sim/pashello/defconfig b/nuttx/configs/sim/pashello/defconfig index 5466c71e0..6fdb006ce 100644 --- a/nuttx/configs/sim/pashello/defconfig +++ b/nuttx/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/nuttx/configs/skp16c26/ostest/defconfig b/nuttx/configs/skp16c26/ostest/defconfig index 335337307..3eacda9ce 100644 --- a/nuttx/configs/skp16c26/ostest/defconfig +++ b/nuttx/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/nuttx/configs/stm3210e-eval/RIDE/defconfig b/nuttx/configs/stm3210e-eval/RIDE/defconfig index 7725c6d0a..ce1687172 100755 --- a/nuttx/configs/stm3210e-eval/RIDE/defconfig +++ b/nuttx/configs/stm3210e-eval/RIDE/defconfig @@ -677,71 +677,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/stm3210e-eval/nsh/defconfig b/nuttx/configs/stm3210e-eval/nsh/defconfig index 352133a8c..9f56ba0f8 100755 --- a/nuttx/configs/stm3210e-eval/nsh/defconfig +++ b/nuttx/configs/stm3210e-eval/nsh/defconfig @@ -686,71 +686,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/stm3210e-eval/ostest/defconfig b/nuttx/configs/stm3210e-eval/ostest/defconfig index 7038add28..955a15e71 100755 --- a/nuttx/configs/stm3210e-eval/ostest/defconfig +++ b/nuttx/configs/stm3210e-eval/ostest/defconfig @@ -688,71 +688,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/stm3210e-eval/src/Makefile b/nuttx/configs/stm3210e-eval/src/Makefile index d291a1693..42839b0f4 100755 --- a/nuttx/configs/stm3210e-eval/src/Makefile +++ b/nuttx/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/nuttx/configs/stm3210e-eval/src/up_nsh.c b/nuttx/configs/stm3210e-eval/src/up_nsh.c index db36946bd..ab4b625f0 100755 --- a/nuttx/configs/stm3210e-eval/src/up_nsh.c +++ b/nuttx/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/nuttx/configs/stm3210e-eval/usbserial/defconfig b/nuttx/configs/stm3210e-eval/usbserial/defconfig index 7bef8a50b..46646bc41 100755 --- a/nuttx/configs/stm3210e-eval/usbserial/defconfig +++ b/nuttx/configs/stm3210e-eval/usbserial/defconfig @@ -689,71 +689,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/stm3210e-eval/usbstorage/defconfig b/nuttx/configs/stm3210e-eval/usbstorage/defconfig index ceeabb907..688e99f69 100755 --- a/nuttx/configs/stm3210e-eval/usbstorage/defconfig +++ b/nuttx/configs/stm3210e-eval/usbstorage/defconfig @@ -688,71 +688,71 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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=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/nuttx/configs/us7032evb1/nsh/defconfig b/nuttx/configs/us7032evb1/nsh/defconfig index a5a4bf350..9b4175904 100644 --- a/nuttx/configs/us7032evb1/nsh/defconfig +++ b/nuttx/configs/us7032evb1/nsh/defconfig @@ -518,66 +518,66 @@ 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 -# -# 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_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 +# 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 +# +# 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_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/us7032evb1/ostest/defconfig b/nuttx/configs/us7032evb1/ostest/defconfig index ae8716101..b93973eea 100644 --- a/nuttx/configs/us7032evb1/ostest/defconfig +++ b/nuttx/configs/us7032evb1/ostest/defconfig @@ -518,66 +518,66 @@ 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 -# -# 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_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 +# 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 +# +# 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_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/vsn/nsh/appconfig b/nuttx/configs/vsn/nsh/appconfig index d946c07a3..65e8c220f 100755 --- a/nuttx/configs/vsn/nsh/appconfig +++ b/nuttx/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]=<task name> argument set the option +# CONFIG_TASK_NAME_SIZE=16 +# + +# 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 -CONFIGURED_APPS += hello/.built_always poweroff/.built_always \ - sdcard/.built_always ramtron/.built_always nshlib/.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/nuttx/configs/vsn/nsh/defconfig b/nuttx/configs/vsn/nsh/defconfig index f73401372..1e5f34c2f 100755 --- a/nuttx/configs/vsn/nsh/defconfig +++ b/nuttx/configs/vsn/nsh/defconfig @@ -704,76 +704,76 @@ CONFIG_EXAMPLES_OSTEST_STACKSIZE=2048 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_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/<board>/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_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_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_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/nuttx/configs/vsn/src/Makefile b/nuttx/configs/vsn/src/Makefile index f12a8bcef..6e55c30ca 100644 --- a/nuttx/configs/vsn/src/Makefile +++ b/nuttx/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/nuttx/configs/vsn/src/nsh.c b/nuttx/configs/vsn/src/nsh.c index d29368833..c4e691ba9 100644 --- a/nuttx/configs/vsn/src/nsh.c +++ b/nuttx/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/nuttx/configs/vsn/src/sdcard.c b/nuttx/configs/vsn/src/sdcard.c index 367e4150b..af36062dd 100644 --- a/nuttx/configs/vsn/src/sdcard.c +++ b/nuttx/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/nuttx/configs/xtrs/nsh/defconfig b/nuttx/configs/xtrs/nsh/defconfig index 4026adf6f..83c6498ae 100644 --- a/nuttx/configs/xtrs/nsh/defconfig +++ b/nuttx/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 -# -# 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=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 +# 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_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=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/nuttx/configs/xtrs/ostest/defconfig b/nuttx/configs/xtrs/ostest/defconfig index 21af7f055..aad132b8b 100644 --- a/nuttx/configs/xtrs/ostest/defconfig +++ b/nuttx/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/nuttx/configs/xtrs/pashello/defconfig b/nuttx/configs/xtrs/pashello/defconfig index 017024747..24607207a 100644 --- a/nuttx/configs/xtrs/pashello/defconfig +++ b/nuttx/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/nuttx/configs/z16f2800100zcog/ostest/defconfig b/nuttx/configs/z16f2800100zcog/ostest/defconfig index ea7aa62db..55617bd85 100644 --- a/nuttx/configs/z16f2800100zcog/ostest/defconfig +++ b/nuttx/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/nuttx/configs/z16f2800100zcog/pashello/defconfig b/nuttx/configs/z16f2800100zcog/pashello/defconfig index 10761a6a4..cbe0e1fbf 100644 --- a/nuttx/configs/z16f2800100zcog/pashello/defconfig +++ b/nuttx/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/nuttx/configs/z80sim/nsh/defconfig b/nuttx/configs/z80sim/nsh/defconfig index 38c3c2b41..b6af3aa27 100644 --- a/nuttx/configs/z80sim/nsh/defconfig +++ b/nuttx/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 -# -# 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=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 +# 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_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=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/nuttx/configs/z80sim/ostest/defconfig b/nuttx/configs/z80sim/ostest/defconfig index f978e75b0..78a173af3 100644 --- a/nuttx/configs/z80sim/ostest/defconfig +++ b/nuttx/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/nuttx/configs/z80sim/pashello/defconfig b/nuttx/configs/z80sim/pashello/defconfig index 0fe2828db..c8a99c9bf 100644 --- a/nuttx/configs/z80sim/pashello/defconfig +++ b/nuttx/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/nuttx/configs/z8encore000zco/ostest/defconfig b/nuttx/configs/z8encore000zco/ostest/defconfig index b206996a4..54cc2a863 100644 --- a/nuttx/configs/z8encore000zco/ostest/defconfig +++ b/nuttx/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/nuttx/configs/z8f64200100kit/ostest/defconfig b/nuttx/configs/z8f64200100kit/ostest/defconfig index 34181dd5a..b37b81e34 100644 --- a/nuttx/configs/z8f64200100kit/ostest/defconfig +++ b/nuttx/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/nuttx/examples/nsh/nsh_main.c b/nuttx/examples/nsh/nsh_main.c index fc6c9b0f9..c973530cc 100644 --- a/nuttx/examples/nsh/nsh_main.c +++ b/nuttx/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/nuttx/netutils/README b/nuttx/netutils/README.txt index e4b05eb21..e4b05eb21 100644 --- a/nuttx/netutils/README +++ b/nuttx/netutils/README.txt diff --git a/nuttx/netutils/telnetd/README.txt b/nuttx/netutils/telnetd/README.txt index 14b05236c..24fcba7d5 100644 --- a/nuttx/netutils/telnetd/README.txt +++ b/nuttx/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/nuttx/tools/mkromfsimg.sh b/nuttx/tools/mkromfsimg.sh index 5e742f47d..b628d2419 100755 --- a/nuttx/tools/mkromfsimg.sh +++ b/nuttx/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 |