Support for the older, manual configurations has been completely removed from the NuttX build system

2 files changed, 4 insertions, 55 deletions

diff --git a/nuttx/Documentation/NuttShell.html b/nuttx/Documentation/NuttShell.html
index 0f90e7610..21facc51a 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: February 20, 2014</p>
+      <p>Last Updated: March 6, 2014</p>
     </td>
   </tr>
 </table>
@@ -3863,32 +3863,6 @@ CONFIG_SCHED_WAITPID=y
   Of course, even with <code>CONFIG_SCHED_WAITPID=y</code> defined, specific applications can still be forced to run asynchronously by adding the ampersand (&amp;) after the NSH command.
 </p>
 
-<h3>4.3.3 Application Configuration File</h3>
-
-<p>
-  <b>The appconfig File</b>.
-  A special configuration file is used to configure which applications are to be included in the build.
-  The source for this file is saved at <code>configs/&lt;board&gt;/&lt;configuration&gt;/appconfig</code>.
-  The existence of the <code>appconfig</code> file in the board configuration directory is sufficient to enable building of applications.
-</p>
-
-<p>
-  The <code>appconfig</code> file is copied into the <code>apps/</code> directory as <code>.config</code> when NuttX is configured.
-  <code>.config</code> is included by the top-level <code>apps/Makefile</code>.
-  As a minimum, this configuration file must define files to add to the <code>CONFIGURED_APPS</code> list like:
-</p>
-<ul><pre>
-CONFIGURED_APPS += examples/hello
-</pre></ul>
-
-<p>
-  <b>Changes in the Works</b>.
-  There are changes in the works that will obsolete the <code>appconfig</code> file.
-  These changes will implement an automated configuration system for NuttX.
-  One consequence of this new configuration system is that the <code>appconfig</code> file will become obsolete and will be replaced by a new mechanism for selecting applications.
-  This new mechanism is not yet available, but is dicussed here: <a href="http://tech.groups.yahoo.com/group/nuttx/message/1604">http://tech.groups.yahoo.com/group/nuttx/message/1604</a>.
-</p>
-
 <table width ="100%">
   <tr bgcolor="#e4e4e4">
   <td>
@@ -4142,8 +4116,6 @@ mount -t vfat /dev/ram1 /tmp
   <li><a href="#cmdtest"><code>[</code></a></li>
   <li><a href="#custoncmds">Adding NSH commands</a></li>
   <li><a href="#cmdaddroute"><code>addroute</code></a></li>
-  <li><a href="#custapps"><code>appconfig</code></a></li>
-  <li><a href="#custapps">Application configuration file (<code>appconfig</code>)</a></li>
   <li><a href="#custapps">Autogenerated header files</a></li>
   <li><a href="#cmdoverview">Background commands</a></li>
   <li><a href="#cmdoverview">Background command priority</a></li>
@@ -4196,10 +4168,10 @@ mount -t vfat /dev/ram1 /tmp
   <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_READLINE</code></a></li>
 </ul></td>
 <td width="33%" valign="top">
 <ul>
-  <li><a href="#nshconfiguration"><code>CONFIG_NSH_READLINE</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="#custinit"><code>CONFIG_NSH_ROMFSETC</code></a></li>
diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html
index 2b9362af5..1f4561325 100644
--- a/nuttx/Documentation/NuttxPortingGuide.html
+++ b/nuttx/Documentation/NuttxPortingGuide.html
@@ -645,20 +645,14 @@
 |-- <i>&lt;config1-dir&gt;</i>
 |   |-- Make.defs
 |   |-- defconfig
-|   |-- appconfig<sup>1</sup>
 |   `-- setenv.sh
 |-- <i>&lt;config2-dir&gt;</i>
 |   |-- Make.defs
 |   |-- defconfig
-|   |-- appconfig<sup>1</sup>
 |   `-- setenv.sh
 |   ...
 `-- <i>(other board-specific configuration sub-directories)</i>/
-</pre>
-<p><small>
-  <sup>1</sup>Optional
-</small></p>
-</ul>
+</pre></ul>
 
 <h3><a name="summaryofconfigfiles">2.4.2 Summary of Files</a></h3>
 <h4><a name="boardlogic">2.4.2.1 Board Specific Logic</a></h4>
@@ -746,13 +740,6 @@
   </li>
   <li>
     <p>
-      <code>appconfig</code>: This is another configuration file that is specific to the
-      application.  This file is copied into the application build directory
-      when NuttX is configured.  See <code>../apps/README.txt</code> for further details.
-    </p>
-  </li>
-  <li>
-    <p>
       <code>setenv.sh</code>: This is a script that you can include that will be installed at
       the top level of the directory structure and can be sourced to set any
       necessary environment variables.
@@ -1462,15 +1449,6 @@ netutils/
 </ul>
 
 <p>
-  And if <code>configs/</code><i>&lt;board-name&gt;</i><code>/[</code><i>&lt;config-dir&gt;</i><code>/appconfig</code> exists in the board configuration directory:
-</p>
-<ul>
-  <li>Copy <code>configs/</code><i>&lt;board-name&gt;</i><code>/[</code><i>&lt;config-dir&gt;</i><code>/appconfig</code> to &lt;app-dir&gt;<code>/.config</code></li>
-  <li><code>echo &quot;APPS_LOC=\"&lt;app-dir&gt;\"" &gt;&gt; "${TOPDIR}/.config&quot;</code></li>
-</ul>
-
-</p>
-<p>
   Where <i>&lt;board-name&gt;</i> is the name of one of the sub-directories of the
   NuttX <a href="#DirStructConfigs"><code>configs/</code></a> directory.
   This sub-directory name corresponds to one of the supported boards
@@ -1500,8 +1478,7 @@ netutils/
 </p>
 
 <p>
-  If <code>configs/</code><i>&lt;board-name&gt;</i><code>/[</code><i>&lt;config-dir&gt;</i>]<code>/appconfig</code>
-  exists and your application directory is not in the standard loction (<config>../apps</config>),
+  If your application directory is not in the standard loction (<code>../apps</code> or <code>../apps-&lt;version&gt</code>),
   then you should also specify the location of the application directory on the command line like:
 </p>
 <ul><pre>