diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html index 0f90e761099..21facc51ac2 100644 --- a/Documentation/NuttShell.html +++ b/Documentation/NuttShell.html @@ -8,7 +8,7 @@

NuttShell (NSH)

-

Last Updated: February 20, 2014

+

Last Updated: March 6, 2014

@@ -3863,32 +3863,6 @@ CONFIG_SCHED_WAITPID=y Of course, even with CONFIG_SCHED_WAITPID=y defined, specific applications can still be forced to run asynchronously by adding the ampersand (&) after the NSH command.

-

4.3.3 Application Configuration File

- -

- The appconfig File. - 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 configs/<board>/<configuration>/appconfig. - The existence of the appconfig file in the board configuration directory is sufficient to enable building of applications. -

- -

- The appconfig file is copied into the apps/ directory as .config when NuttX is configured. - .config is included by the top-level apps/Makefile. - As a minimum, this configuration file must define files to add to the CONFIGURED_APPS list like: -

- - -

- Changes in the Works. - There are changes in the works that will obsolete the appconfig file. - These changes will implement an automated configuration system for NuttX. - One consequence of this new configuration system is that the appconfig 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: http://tech.groups.yahoo.com/group/nuttx/message/1604. -

-
@@ -4142,8 +4116,6 @@ mount -t vfat /dev/ram1 /tmp
  • [
  • Adding NSH commands
  • addroute
    • -
  • appconfig
    • -
  • Application configuration file (appconfig)
  • Autogenerated header files
  • Background commands
  • Background command priority
    • @@ -4196,10 +4168,10 @@ mount -t vfat /dev/ram1 /tmp
  • CONFIG_NSH_NESTDEPTH
  • CONFIG_NSH_NETMASK
  • CONFIG_NSH_NOMAC
    • +
  • CONFIG_NSH_READLINE
    		•
      -
    • CONFIG_NSH_READLINE
    • CONFIG_NSH_ROMFSDEVNO
    • CONFIG_NSH_ROMFSETC
    • CONFIG_NSH_ROMFSETC
      • diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index 2b9362af522..1f45613255d 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -645,20 +645,14 @@ |-- <config1-dir> | |-- Make.defs | |-- defconfig -| |-- appconfig1 | `-- setenv.sh |-- <config2-dir> | |-- Make.defs | |-- defconfig -| |-- appconfig1 | `-- setenv.sh | ... `-- (other board-specific configuration sub-directories)/ - -

      - 1Optional -

      -
    +

    2.4.2 Summary of Files

    2.4.2.1 Board Specific Logic

    @@ -744,13 +738,6 @@ most C files in the system.

    -
  • -

    - appconfig: 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 ../apps/README.txt for further details. -

    -

  • setenv.sh: This is a script that you can include that will be installed at @@ -1461,15 +1448,6 @@ netutils/

  • Copy configs/<board-name>/[<config-dir>/]defconfig to ${TOPDIR}/.config
    • -

    - And if configs/<board-name>/[<config-dir>/appconfig exists in the board configuration directory: -

    -
      -
    • Copy configs/<board-name>/[<config-dir>/appconfig to <app-dir>/.config
      • -
    • echo "APPS_LOC=\"<app-dir>\"" >> "${TOPDIR}/.config"
      • -
    - -

    Where <board-name> is the name of one of the sub-directories of the NuttX configs/ directory. @@ -1500,8 +1478,7 @@ netutils/

    - If configs/<board-name>/[<config-dir>]/appconfig - exists and your application directory is not in the standard loction (../apps), + If your application directory is not in the standard loction (../apps or ../apps-<version>), then you should also specify the location of the application directory on the command line like: