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 /nuttx | |
| parent | 058e81edfdee203f2143b3f0910aa957a7f8da48 (diff) | |
| download | px4-nuttx-dacf833f9af5137dcad044152b8c75e56ddd0e79.tar.gz px4-nuttx-dacf833f9af5137dcad044152b8c75e56ddd0e79.tar.bz2 px4-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
Diffstat (limited to 'nuttx')
141 files changed, 5140 insertions, 5108 deletions
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 |