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

git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5496 42af7a65-404d-4744-a932-0658087f49c3

23 files changed, 64 insertions, 64 deletions

diff --git a/nuttx/configs/amber/README.txt b/nuttx/configs/amber/README.txt
index 56e31ba7f..9f40dcdd2 100644
--- a/nuttx/configs/amber/README.txt
+++ b/nuttx/configs/amber/README.txt
@@ -187,7 +187,7 @@ Atmel AVRISP mkII Connection
 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
 the toolchain on the make commandline with CONFIG_AVR_TOOLCHAIN=<toolchain>.
 
diff --git a/nuttx/configs/ea3131/README.txt b/nuttx/configs/ea3131/README.txt
index fcfc0792f..986b7778c 100644
--- a/nuttx/configs/ea3131/README.txt
+++ b/nuttx/configs/ea3131/README.txt
@@ -53,7 +53,7 @@ GNU Toolchain Options
   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 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
   of CODESOURCERYW, CODESOURCERYL, DEVKITARM, BUILDROOT or GNU_EABI as described
   above.
diff --git a/nuttx/configs/ea3152/README.txt b/nuttx/configs/ea3152/README.txt
index da57945bd..4f507e7b0 100644
--- a/nuttx/configs/ea3152/README.txt
+++ b/nuttx/configs/ea3152/README.txt
@@ -52,8 +52,8 @@ GNU Toolchain Options
   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 toolchain may also be set using the mconf utility (make menuconfig) or by
-  passing CONFIG_ARM_TOOLCHAIN=<toolchain> to make, where <toolchain> is one
+  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
   of CODESOURCERYW, CODESOURCERYL, DEVKITARM, BUILDROOT or GNU_EABI as described
   above.
 
diff --git a/nuttx/configs/ez80f910200kitg/README.txt b/nuttx/configs/ez80f910200kitg/README.txt
index e314b0fe1..8d9086b4e 100644
--- a/nuttx/configs/ez80f910200kitg/README.txt
+++ b/nuttx/configs/ez80f910200kitg/README.txt
@@ -88,8 +88,8 @@ available:
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
diff --git a/nuttx/configs/ez80f910200zco/README.txt b/nuttx/configs/ez80f910200zco/README.txt
index 1bc9e56b8..7df503217 100644
--- a/nuttx/configs/ez80f910200zco/README.txt
+++ b/nuttx/configs/ez80f910200zco/README.txt
@@ -102,8 +102,8 @@ ostest
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
diff --git a/nuttx/configs/fire-stm32v2/README.txt b/nuttx/configs/fire-stm32v2/README.txt
index 88b5bf583..d12a9b27d 100644
--- a/nuttx/configs/fire-stm32v2/README.txt
+++ b/nuttx/configs/fire-stm32v2/README.txt
@@ -826,9 +826,9 @@ Where <subdir> is one of the following:
     contains support for some built-in applications that can be enabled by making
     some additional minor change to the configuration file.
 
-    Reconfiguring:  This configuration uses to the mconf configuration tool to control
-    the configuration.  See the section entitled "NuttX Configuration Tool"
-    in the top-level README.txt file.
+    Reconfiguring:  This configuration uses to the kconfig-mconf configuration tool
+    to control the configuration.  See the section entitled "NuttX Configuration
+    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
     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
     enabled by default in this configuration for testing purposes.  To use this
     configuration, the network must currently be disabled.  To do this using
-    the mconf configuration tool:
+    the kconfig-mconf configuration tool:
 
     > make menuconfig
 
diff --git a/nuttx/configs/lm3s6965-ek/README.txt b/nuttx/configs/lm3s6965-ek/README.txt
index 5a9cdbf4e..e0349f5de 100644
--- a/nuttx/configs/lm3s6965-ek/README.txt
+++ b/nuttx/configs/lm3s6965-ek/README.txt
@@ -482,8 +482,8 @@ Where <subdir> is one of the following:
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
@@ -512,8 +512,8 @@ Where <subdir> is one of the following:
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
@@ -532,8 +532,8 @@ Where <subdir> is one of the following:
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
diff --git a/nuttx/configs/mcu123-lpc214x/README.txt b/nuttx/configs/mcu123-lpc214x/README.txt
index 4c7c608b7..1c6c9bde8 100644
--- a/nuttx/configs/mcu123-lpc214x/README.txt
+++ b/nuttx/configs/mcu123-lpc214x/README.txt
@@ -354,8 +354,8 @@ nsh:
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
diff --git a/nuttx/configs/micropendous3/README.txt b/nuttx/configs/micropendous3/README.txt
index 1b0f2c8ce..6b586bd64 100644
--- a/nuttx/configs/micropendous3/README.txt
+++ b/nuttx/configs/micropendous3/README.txt
@@ -200,7 +200,7 @@ There are several toolchain options.  However, testing has been performed
 using *only* the NuttX buildroot toolchain described below.  Therefore,
 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
 the toolchain on the make commandline with CONFIG_AVR_TOOLCHAIN=<toolchain>.
 
diff --git a/nuttx/configs/mirtoo/README.txt b/nuttx/configs/mirtoo/README.txt
index 89c137a03..6d3ea234e 100644
--- a/nuttx/configs/mirtoo/README.txt
+++ b/nuttx/configs/mirtoo/README.txt
@@ -324,7 +324,7 @@ Toolchains
 ==========
 
   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
   <toolchain> is one of GNU_ELF, MICROCHIPL, MICROCHIPW, MICROCHIPL_LITE,
   MICROCHIPW_LITE, MICROCHIPOPENL or PINGUINOW as described below.
diff --git a/nuttx/configs/ntosd-dm320/README.txt b/nuttx/configs/ntosd-dm320/README.txt
index d85e53525..675716154 100644
--- a/nuttx/configs/ntosd-dm320/README.txt
+++ b/nuttx/configs/ntosd-dm320/README.txt
@@ -72,8 +72,8 @@ GNU Toolchain Options
   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 toolchain may also be set using the mconf utility (make menuconfig) or by
-  passing CONFIG_ARM_TOOLCHAIN=<toolchain> to make, where <toolchain> is one
+  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
   of CODESOURCERYW, CODESOURCERYL, DEVKITARM, BUILDROOT or GNU_EABI as described
   above.
 
diff --git a/nuttx/configs/olimex-lpc1766stk/README.txt b/nuttx/configs/olimex-lpc1766stk/README.txt
index 35f00e9f2..13c63d18b 100644
--- a/nuttx/configs/olimex-lpc1766stk/README.txt
+++ b/nuttx/configs/olimex-lpc1766stk/README.txt
@@ -904,8 +904,8 @@ Where <subdir> is one of the following:
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
diff --git a/nuttx/configs/sim/README.txt b/nuttx/configs/sim/README.txt
index ff756fb4b..8abfd9c23 100644
--- a/nuttx/configs/sim/README.txt
+++ b/nuttx/configs/sim/README.txt
@@ -209,8 +209,8 @@ cxxtest
   2. This configuration uses the mconf-based configuration tool.  To
      change this configuration using that tool, you should:
 
-     a. Build and install the mconf tool.  See nuttx/README.txt and
-        misc/tools/
+     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.
@@ -455,8 +455,8 @@ nxlines
   1. This configuration uses the mconf-based configuration tool.  To
      change this configuration using that tool, you should:
 
-     a. Build and install the mconf tool.  See nuttx/README.txt and
-        misc/tools/
+     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.
@@ -481,8 +481,8 @@ nxwm
   1. This configuration uses the mconf-based configuration tool.  To
      change this configuration using that tool, you should:
 
-     a. Build and install the mconf tool.  See nuttx/README.txt and
-        misc/tools/
+     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.
@@ -543,8 +543,8 @@ ostest
   1. This configuration uses the mconf-based configuration tool.  To
      change this configuration using that tool, you should:
 
-     a. Build and install the mconf tool.  See nuttx/README.txt and
-        misc/tools/
+     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.
diff --git a/nuttx/configs/stm3220g-eval/README.txt b/nuttx/configs/stm3220g-eval/README.txt
index e7bdd4de0..40c918582 100644
--- a/nuttx/configs/stm3220g-eval/README.txt
+++ b/nuttx/configs/stm3220g-eval/README.txt
@@ -65,8 +65,8 @@ GNU Toolchain Options
   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 toolchain may also be set using the mconf utility (make menuconfig) or by
-  passing CONFIG_ARMV7M_TOOLCHAIN=<toolchain> to make, where <toolchain> is one
+  The toolchain may also be set using the kconfig-mconf utility (make menuconfig)
+  or by passing CONFIG_ARMV7M_TOOLCHAIN=<toolchain> to make, where <toolchain> is one
   of CODESOURCERYW, CODESOURCERYL, ATOLLOC, DEVKITARM, RAISONANCE, BUILDROOT or
   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
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
diff --git a/nuttx/configs/stm3240g-eval/README.txt b/nuttx/configs/stm3240g-eval/README.txt
index 829f3a777..e8a3c4b25 100644
--- a/nuttx/configs/stm3240g-eval/README.txt
+++ b/nuttx/configs/stm3240g-eval/README.txt
@@ -951,9 +951,9 @@ Where <subdir> is one of the following:
       CONFIG_EXAMPLES_DISCOVER_IPADDR   - (not defined)
       CONFIG_EXAMPLES_DISCOVER_DRIPADDR - Router IP address
 
-    NOTE:  This configuration uses to the mconf configuration tool to control
-    the configuration.  See the section entitled "NuttX Configuration Tool"
-    in the top-level README.txt file.
+    NOTE:  This configuration uses to the kconfig-mconf configuration tool to
+    control the configuration.  See the section entitled "NuttX Configuration
+    Tool" in the top-level README.txt file.
 
   nettest:
   -------
diff --git a/nuttx/configs/stm32f4discovery/README.txt b/nuttx/configs/stm32f4discovery/README.txt
index 28072f44b..ef61b05e6 100644
--- a/nuttx/configs/stm32f4discovery/README.txt
+++ b/nuttx/configs/stm32f4discovery/README.txt
@@ -1038,8 +1038,8 @@ Where <subdir> is one of the following:
   2. This configuration uses the mconf-based configuration tool.  To
      change this configuration using that tool, you should:
 
-     a. Build and install the mconf tool.  See nuttx/README.txt and
-        misc/tools/
+     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.
@@ -1087,8 +1087,8 @@ Where <subdir> is one of the following:
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
@@ -1121,8 +1121,8 @@ Where <subdir> is one of the following:
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
@@ -1350,8 +1350,8 @@ Where <subdir> is one of the following:
   2. This configuration uses the mconf-based configuration tool.  To
      change this configuration using that tool, you should:
 
-     a. Build and install the mconf tool.  See nuttx/README.txt and
-        misc/tools/
+     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.
diff --git a/nuttx/configs/teensy/README.txt b/nuttx/configs/teensy/README.txt
index 951f4a87e..23e7d6c98 100644
--- a/nuttx/configs/teensy/README.txt
+++ b/nuttx/configs/teensy/README.txt
@@ -203,7 +203,7 @@ There are several toolchain options.  However, testing has been performed
 using *only* the NuttX buildroot toolchain described below.  Therefore,
 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
 the toolchain on the make commandline with CONFIG_AVR_TOOLCHAIN=<toolchain>.
 
diff --git a/nuttx/configs/xtrs/README.txt b/nuttx/configs/xtrs/README.txt
index d462dcab1..f8b3d0e73 100644
--- a/nuttx/configs/xtrs/README.txt
+++ b/nuttx/configs/xtrs/README.txt
@@ -165,7 +165,7 @@ Reconfiguring NuttX
 These configurations all use the kconfig-frontends, mconf-based configuration
 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
 
   b. Execute 'make menuconfig' in nuttx/ in order to start the reconfiguration
diff --git a/nuttx/configs/z16f2800100zcog/README.txt b/nuttx/configs/z16f2800100zcog/README.txt
index e12931df2..4d61a41da 100644
--- a/nuttx/configs/z16f2800100zcog/README.txt
+++ b/nuttx/configs/z16f2800100zcog/README.txt
@@ -105,8 +105,8 @@ ostest
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
@@ -154,8 +154,8 @@ pashello
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
diff --git a/nuttx/configs/z80sim/README.txt b/nuttx/configs/z80sim/README.txt
index 595a17783..f4055207c 100644
--- a/nuttx/configs/z80sim/README.txt
+++ b/nuttx/configs/z80sim/README.txt
@@ -112,7 +112,7 @@ Reconfiguring NuttX
 These configurations all use the kconfig-frontends, mconf-based configuration
 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
 
   b. Execute 'make menuconfig' in nuttx/ in order to start the reconfiguration
diff --git a/nuttx/configs/z8encore000zco/README.txt b/nuttx/configs/z8encore000zco/README.txt
index 7ca50db8c..70d62ea80 100644
--- a/nuttx/configs/z8encore000zco/README.txt
+++ b/nuttx/configs/z8encore000zco/README.txt
@@ -73,8 +73,8 @@ available:
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
diff --git a/nuttx/configs/z8f64200100kit/README.txt b/nuttx/configs/z8f64200100kit/README.txt
index b0f224ad8..e3c22d87b 100644
--- a/nuttx/configs/z8f64200100kit/README.txt
+++ b/nuttx/configs/z8f64200100kit/README.txt
@@ -73,8 +73,8 @@ available:
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
diff --git a/nuttx/configs/zp214xpa/README.txt b/nuttx/configs/zp214xpa/README.txt
index 58a2242d0..88d03b9de 100644
--- a/nuttx/configs/zp214xpa/README.txt
+++ b/nuttx/configs/zp214xpa/README.txt
@@ -303,8 +303,8 @@ Configurations:
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.
@@ -327,8 +327,8 @@ Configurations:
     1. This configuration uses the mconf-based configuration tool.  To
        change this configuration using that tool, you should:
 
-       a. Build and install the mconf tool.  See nuttx/README.txt and
-          misc/tools/
+       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.