Use kconfig- prefix to avoid tool name conflicts (from Jose Pablo Carballo)

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5496 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2013-01-09 12:55:13 +00:00
parent 81f7636c2b
commit 6de0a97d9b
23 changed files with 64 additions and 64 deletions

View File

@ -187,7 +187,7 @@ Atmel AVRISP mkII Connection
Toolchains Toolchains
^^^^^^^^^^ ^^^^^^^^^^
The toolchain may be selected using the mconf tool (via 'make menuconfig'), The toolchain may be selected using the kconfig-mconf tool (via 'make menuconfig'),
by editing the existing configuration file (defconfig), or by overriding by editing the existing configuration file (defconfig), or by overriding
the toolchain on the make commandline with CONFIG_AVR_TOOLCHAIN=<toolchain>. the toolchain on the make commandline with CONFIG_AVR_TOOLCHAIN=<toolchain>.

View File

@ -53,7 +53,7 @@ GNU Toolchain Options
If you are not using CONFIG_LPC31_BUILDROOT, then you may also have to modify If you are not using CONFIG_LPC31_BUILDROOT, then you may also have to modify
the PATH in the setenv.h file if your make cannot find the tools. the PATH in the setenv.h file if your make cannot find the tools.
The toolchain may also be set using the mconf utility (make menuconfig) or by The toolchain may also be set using the kconfig-mconf utility (make menuconfig) or by
passing CONFIG_ARM_TOOLCHAIN=<toolchain> to make, where <toolchain> is one passing CONFIG_ARM_TOOLCHAIN=<toolchain> to make, where <toolchain> is one
of CODESOURCERYW, CODESOURCERYL, DEVKITARM, BUILDROOT or GNU_EABI as described of CODESOURCERYW, CODESOURCERYL, DEVKITARM, BUILDROOT or GNU_EABI as described
above. above.

View File

@ -52,8 +52,8 @@ GNU Toolchain Options
If you are not using CONFIG_LPC31_BUILDROOT, then you may also have to modify If you are not using CONFIG_LPC31_BUILDROOT, then you may also have to modify
the PATH in the setenv.h file if your make cannot find the tools. the PATH in the setenv.h file if your make cannot find the tools.
The toolchain may also be set using the mconf utility (make menuconfig) or by The toolchain may also be set using the kconfig-mconf utility (make menuconfig)
passing CONFIG_ARM_TOOLCHAIN=<toolchain> to make, where <toolchain> is one or by passing CONFIG_ARM_TOOLCHAIN=<toolchain> to make, where <toolchain> is one
of CODESOURCERYW, CODESOURCERYL, DEVKITARM, BUILDROOT or GNU_EABI as described of CODESOURCERYW, CODESOURCERYL, DEVKITARM, BUILDROOT or GNU_EABI as described
above. above.

View File

@ -88,8 +88,8 @@ available:
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.

View File

@ -102,8 +102,8 @@ ostest
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.

View File

@ -826,9 +826,9 @@ Where <subdir> is one of the following:
contains support for some built-in applications that can be enabled by making contains support for some built-in applications that can be enabled by making
some additional minor change to the configuration file. some additional minor change to the configuration file.
Reconfiguring: This configuration uses to the mconf configuration tool to control Reconfiguring: This configuration uses to the kconfig-mconf configuration tool
the configuration. See the section entitled "NuttX Configuration Tool" to control the configuration. See the section entitled "NuttX Configuration
in the top-level README.txt file. Tool" in the top-level README.txt file.
Start Delays: If no SD card is present in the slot, or if the network is not Start Delays: If no SD card is present in the slot, or if the network is not
connected, then there will be long start-up delays before you get the NSH connected, then there will be long start-up delays before you get the NSH
@ -842,7 +842,7 @@ Where <subdir> is one of the following:
verified. The ENC28J60 network is not yet functional. Networking is verified. The ENC28J60 network is not yet functional. Networking is
enabled by default in this configuration for testing purposes. To use this enabled by default in this configuration for testing purposes. To use this
configuration, the network must currently be disabled. To do this using configuration, the network must currently be disabled. To do this using
the mconf configuration tool: the kconfig-mconf configuration tool:
> make menuconfig > make menuconfig

View File

@ -482,8 +482,8 @@ Where <subdir> is one of the following:
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.
@ -512,8 +512,8 @@ Where <subdir> is one of the following:
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.
@ -532,8 +532,8 @@ Where <subdir> is one of the following:
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.

View File

@ -354,8 +354,8 @@ nsh:
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.

View File

@ -200,7 +200,7 @@ There are several toolchain options. However, testing has been performed
using *only* the NuttX buildroot toolchain described below. Therefore, using *only* the NuttX buildroot toolchain described below. Therefore,
the NuttX buildroot toolchain is the recommended choice. the NuttX buildroot toolchain is the recommended choice.
The toolchain may be selected using the mconf tool (via 'make menuconfig'), The toolchain may be selected using the kconfig-mconf tool (via 'make menuconfig'),
by editing the existing configuration file (defconfig), or by overriding by editing the existing configuration file (defconfig), or by overriding
the toolchain on the make commandline with CONFIG_AVR_TOOLCHAIN=<toolchain>. the toolchain on the make commandline with CONFIG_AVR_TOOLCHAIN=<toolchain>.

View File

@ -324,7 +324,7 @@ Toolchains
========== ==========
Note that in addition to the configuration options listed below, the Note that in addition to the configuration options listed below, the
toolchain can be configured using the mconf utility ('make menuconfig') toolchain can be configured using the kconfig-mconf utility ('make menuconfig')
or by passing CONFIG_MIPS32_TOOLCHAIN=<toolchain> to make, where or by passing CONFIG_MIPS32_TOOLCHAIN=<toolchain> to make, where
<toolchain> is one of GNU_ELF, MICROCHIPL, MICROCHIPW, MICROCHIPL_LITE, <toolchain> is one of GNU_ELF, MICROCHIPL, MICROCHIPW, MICROCHIPL_LITE,
MICROCHIPW_LITE, MICROCHIPOPENL or PINGUINOW as described below. MICROCHIPW_LITE, MICROCHIPOPENL or PINGUINOW as described below.

View File

@ -72,8 +72,8 @@ GNU Toolchain Options
If you are not using CONFIG_DM320_BUILDROOT, then you may also have to modify If you are not using CONFIG_DM320_BUILDROOT, then you may also have to modify
the PATH in the setenv.h file if your make cannot find the tools. the PATH in the setenv.h file if your make cannot find the tools.
The toolchain may also be set using the mconf utility (make menuconfig) or by The toolchain may also be set using the kconfig-mconf utility (make menuconfig)
passing CONFIG_ARM_TOOLCHAIN=<toolchain> to make, where <toolchain> is one or by passing CONFIG_ARM_TOOLCHAIN=<toolchain> to make, where <toolchain> is one
of CODESOURCERYW, CODESOURCERYL, DEVKITARM, BUILDROOT or GNU_EABI as described of CODESOURCERYW, CODESOURCERYL, DEVKITARM, BUILDROOT or GNU_EABI as described
above. above.

View File

@ -904,8 +904,8 @@ Where <subdir> is one of the following:
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.

View File

@ -209,8 +209,8 @@ cxxtest
2. This configuration uses the mconf-based configuration tool. To 2. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.
@ -455,8 +455,8 @@ nxlines
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.
@ -481,8 +481,8 @@ nxwm
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.
@ -543,8 +543,8 @@ ostest
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.

View File

@ -65,8 +65,8 @@ GNU Toolchain Options
If you change the default toolchain, then you may also have to modify the PATH in If you change the default toolchain, then you may also have to modify the PATH in
the setenv.h file if your make cannot find the tools. the setenv.h file if your make cannot find the tools.
The toolchain may also be set using the mconf utility (make menuconfig) or by The toolchain may also be set using the kconfig-mconf utility (make menuconfig)
passing CONFIG_ARMV7M_TOOLCHAIN=<toolchain> to make, where <toolchain> is one or by passing CONFIG_ARMV7M_TOOLCHAIN=<toolchain> to make, where <toolchain> is one
of CODESOURCERYW, CODESOURCERYL, ATOLLOC, DEVKITARM, RAISONANCE, BUILDROOT or of CODESOURCERYW, CODESOURCERYL, ATOLLOC, DEVKITARM, RAISONANCE, BUILDROOT or
GNU_EABI as described above. GNU_EABI as described above.
@ -1082,8 +1082,8 @@ Where <subdir> is one of the following:
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.

View File

@ -951,9 +951,9 @@ Where <subdir> is one of the following:
CONFIG_EXAMPLES_DISCOVER_IPADDR - (not defined) CONFIG_EXAMPLES_DISCOVER_IPADDR - (not defined)
CONFIG_EXAMPLES_DISCOVER_DRIPADDR - Router IP address CONFIG_EXAMPLES_DISCOVER_DRIPADDR - Router IP address
NOTE: This configuration uses to the mconf configuration tool to control NOTE: This configuration uses to the kconfig-mconf configuration tool to
the configuration. See the section entitled "NuttX Configuration Tool" control the configuration. See the section entitled "NuttX Configuration
in the top-level README.txt file. Tool" in the top-level README.txt file.
nettest: nettest:
------- -------

View File

@ -1038,8 +1038,8 @@ Where <subdir> is one of the following:
2. This configuration uses the mconf-based configuration tool. To 2. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.
@ -1087,8 +1087,8 @@ Where <subdir> is one of the following:
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.
@ -1121,8 +1121,8 @@ Where <subdir> is one of the following:
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.
@ -1350,8 +1350,8 @@ Where <subdir> is one of the following:
2. This configuration uses the mconf-based configuration tool. To 2. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.

View File

@ -203,7 +203,7 @@ There are several toolchain options. However, testing has been performed
using *only* the NuttX buildroot toolchain described below. Therefore, using *only* the NuttX buildroot toolchain described below. Therefore,
the NuttX buildroot toolchain is the recommended choice. the NuttX buildroot toolchain is the recommended choice.
The toolchain may be selected using the mconf tool (via 'make menuconfig'), The toolchain may be selected using the kconfig-mconf tool (via 'make menuconfig'),
by editing the existing configuration file (defconfig), or by overriding by editing the existing configuration file (defconfig), or by overriding
the toolchain on the make commandline with CONFIG_AVR_TOOLCHAIN=<toolchain>. the toolchain on the make commandline with CONFIG_AVR_TOOLCHAIN=<toolchain>.

View File

@ -165,7 +165,7 @@ Reconfiguring NuttX
These configurations all use the kconfig-frontends, mconf-based configuration These configurations all use the kconfig-frontends, mconf-based configuration
tool. To change this configuration using that tool, you should: tool. To change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt and
misc/tools/README.txt misc/tools/README.txt
b. Execute 'make menuconfig' in nuttx/ in order to start the reconfiguration b. Execute 'make menuconfig' in nuttx/ in order to start the reconfiguration

View File

@ -105,8 +105,8 @@ ostest
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.
@ -154,8 +154,8 @@ pashello
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.

View File

@ -112,7 +112,7 @@ Reconfiguring NuttX
These configurations all use the kconfig-frontends, mconf-based configuration These configurations all use the kconfig-frontends, mconf-based configuration
tool. To change this configuration using that tool, you should: tool. To change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt and
misc/tools/README.txt misc/tools/README.txt
b. Execute 'make menuconfig' in nuttx/ in order to start the reconfiguration b. Execute 'make menuconfig' in nuttx/ in order to start the reconfiguration

View File

@ -73,8 +73,8 @@ available:
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.

View File

@ -73,8 +73,8 @@ available:
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.

View File

@ -303,8 +303,8 @@ Configurations:
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.
@ -327,8 +327,8 @@ Configurations:
1. This configuration uses the mconf-based configuration tool. To 1. This configuration uses the mconf-based configuration tool. To
change this configuration using that tool, you should: change this configuration using that tool, you should:
a. Build and install the mconf tool. See nuttx/README.txt and a. Build and install the kconfig-mconf tool. See nuttx/README.txt
misc/tools/ and misc/tools/
b. Execute 'make menuconfig' in nuttx/ in order to start the b. Execute 'make menuconfig' in nuttx/ in order to start the
reconfiguration process. reconfiguration process.