mirror of
https://github.com/apache/nuttx.git
synced 2026-05-27 11:16:00 +08:00
convert configs/sim/nsh to use kconfig-frontends
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5526 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
@@ -3965,3 +3965,6 @@
|
|||||||
* binfmt/builtin.c and binfmt/libbuiltin: Add a binary "loader"
|
* binfmt/builtin.c and binfmt/libbuiltin: Add a binary "loader"
|
||||||
that can be used to execute builtin programs from the BINFS
|
that can be used to execute builtin programs from the BINFS
|
||||||
file system.
|
file system.
|
||||||
|
* configs/sim/nsh: Convert to use kconfig-frontends configuration
|
||||||
|
tool.
|
||||||
|
|
||||||
|
|||||||
@@ -2518,6 +2518,8 @@ nsh>
|
|||||||
Support external registered, "builtin" applications that can be
|
Support external registered, "builtin" applications that can be
|
||||||
executed from the NSH command line (see apps/README.txt for
|
executed from the NSH command line (see apps/README.txt for
|
||||||
more information).
|
more information).
|
||||||
|
This required <code>CONFIG_BUILTIN</code> to enable NuttX support for
|
||||||
|
"builtin" applications.
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
@@ -3227,8 +3229,20 @@ struct cmdmap_s
|
|||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
These applications are built-into NSH in the sense that they can be executed by simply typing the name of the application at the NSH prompt.
|
These applications are built-into NSH in the sense that they can be executed by simply typing the name of the application at the NSH prompt.
|
||||||
Built-in application support is enabled with the configuration option <code>CONFIG_NSH_BUILTIN_APPS</code>.
|
Built-in application support is enabled with these configuration option:
|
||||||
When this configuration option is set, you will also be able to see the built-in applications if you enter "nsh> help".
|
</p>
|
||||||
|
<ul>
|
||||||
|
<li>
|
||||||
|
<code>CONFIG_BUILTIN</code>:
|
||||||
|
Enable NuttX support for builtin applications.
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<code>CONFIG_NSH_BUILTIN_APPS</code>:
|
||||||
|
Enable NSH support for builtin applications.
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<p>
|
||||||
|
When these configuration options are set, you will also be able to see the built-in applications if you enter "nsh> help".
|
||||||
They will appear at the bottom of the list of NSH commands under:
|
They will appear at the bottom of the list of NSH commands under:
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|||||||
@@ -256,7 +256,7 @@ CONFIG_NSH_BUILTIN_APPS=y
|
|||||||
|
|
||||||
#
|
#
|
||||||
# Settings for examples/hello
|
# Settings for examples/hello
|
||||||
CONFIG_EXAMPLES_HELLO_BUILTIN=y
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
# Settings for examples/wget
|
# Settings for examples/wget
|
||||||
|
|||||||
@@ -224,7 +224,7 @@ CONFIG_NET_RESOLV_ENTRIES=4
|
|||||||
|
|
||||||
#
|
#
|
||||||
# Settings for examples/hello
|
# Settings for examples/hello
|
||||||
CONFIG_EXAMPLES_HELLO_BUILTIN=y
|
#
|
||||||
|
|
||||||
#
|
#
|
||||||
# Settings for examples/uip
|
# Settings for examples/uip
|
||||||
|
|||||||
@@ -260,7 +260,8 @@ CONFIG_NSH_BUILTIN_APPS=y
|
|||||||
|
|
||||||
#
|
#
|
||||||
# Settings for examples/hello
|
# Settings for examples/hello
|
||||||
CONFIG_EXAMPLES_HELLO_BUILTIN=y
|
#
|
||||||
|
|
||||||
CONFIG_EXAMPLES_NXHELLO_BUILTIN=y
|
CONFIG_EXAMPLES_NXHELLO_BUILTIN=y
|
||||||
CONFIG_EXAMPLES_NXTEXT_BUILTIN=y
|
CONFIG_EXAMPLES_NXTEXT_BUILTIN=y
|
||||||
CONFIG_EXAMPLES_NXIMAGE_BUILTIN=y
|
CONFIG_EXAMPLES_NXIMAGE_BUILTIN=y
|
||||||
|
|||||||
+16
-3
@@ -270,13 +270,26 @@ nsh
|
|||||||
|
|
||||||
Description
|
Description
|
||||||
-----------
|
-----------
|
||||||
Configures to use the NuttShell at apps/examples/nsh. This version has
|
Configures to use the NuttShell at apps/examples/nsh. This configuration
|
||||||
one builtin function: This configuration: apps/examples/hello. This
|
may be selected as follows:
|
||||||
configuration may be selected as follows:
|
|
||||||
|
|
||||||
cd <nuttx-directory>/tools
|
cd <nuttx-directory>/tools
|
||||||
./configure.sh sim/nsh
|
./configure.sh sim/nsh
|
||||||
|
|
||||||
|
NOTES:
|
||||||
|
------
|
||||||
|
1. This configuration uses the mconf-based configuration tool. To
|
||||||
|
change this configuration using that tool, you should:
|
||||||
|
|
||||||
|
a. Build and install the kconfig-mconf tool. See nuttx/README.txt
|
||||||
|
and misc/tools/
|
||||||
|
|
||||||
|
b. Execute 'make menuconfig' in nuttx/ in order to start the
|
||||||
|
reconfiguration process.
|
||||||
|
|
||||||
|
2. This version has one builtin function: This configuration:
|
||||||
|
apps/examples/hello.
|
||||||
|
|
||||||
nsh2
|
nsh2
|
||||||
|
|
||||||
Description
|
Description
|
||||||
|
|||||||
@@ -1,47 +0,0 @@
|
|||||||
############################################################################
|
|
||||||
# configs/sim/nsh/appconfig
|
|
||||||
#
|
|
||||||
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
|
|
||||||
# Author: Gregory Nutt <gnutt@nuttx.org>
|
|
||||||
#
|
|
||||||
# Redistribution and use in source and binary forms, with or without
|
|
||||||
# modification, are permitted provided that the following conditions
|
|
||||||
# are met:
|
|
||||||
#
|
|
||||||
# 1. Redistributions of source code must retain the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer.
|
|
||||||
# 2. Redistributions in binary form must reproduce the above copyright
|
|
||||||
# notice, this list of conditions and the following disclaimer in
|
|
||||||
# the documentation and/or other materials provided with the
|
|
||||||
# distribution.
|
|
||||||
# 3. Neither the name NuttX nor the names of its contributors may be
|
|
||||||
# used to endorse or promote products derived from this software
|
|
||||||
# without specific prior written permission.
|
|
||||||
#
|
|
||||||
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
||||||
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
||||||
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
|
||||||
# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
|
|
||||||
# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
||||||
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
||||||
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
||||||
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
|
|
||||||
# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
|
||||||
# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
|
|
||||||
# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
|
|
||||||
# POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
#
|
|
||||||
############################################################################
|
|
||||||
|
|
||||||
# Path to example in apps/examples containing the user_start entry point
|
|
||||||
|
|
||||||
CONFIGURED_APPS += examples/nsh
|
|
||||||
|
|
||||||
# The NSH Library
|
|
||||||
|
|
||||||
CONFIGURED_APPS += system/readline
|
|
||||||
CONFIGURED_APPS += nshlib
|
|
||||||
|
|
||||||
# Example built-in application
|
|
||||||
|
|
||||||
CONFIGURED_APPS += examples/hello
|
|
||||||
+447
-204
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user