diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index a424504ad..9aa4e40fa 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1231,3 +1231,19 @@ the arch/arm/src/Makefile for now. * arch/arm/src/lpc17xx/lpc17_internal.h - Add missing parentheses in macros definitions (patch submitted by Tiago Maluta). + * Documents/NuttxPortingGuide.html, configs/README.txt, etc. - + Replaced CONFIG_EXAMPLE with CONFIG_APP_DIR (see documents for + desciption). This allows NuttX application code to be built + outside of the examples/ directory. + + For people who have their own configurations and/or Makefiles, + you will need to make a couple of changes: + + - Replace all occurrences of CONFIG_EXAMPLE=foobar with + CONFIG_APP_DIR=examples/foobar in all of the configuration + files. + - Replace any occurrences of examples/$(CONFIG_EXAMPLE) with + $(CONFIG_APP_DIR) + - Replace any occurrences of lib$(CONFIG_EXAMPLE)$(LIBEXT) + with libapp$(LIBEXT) in your Makefiles. + - Check any other occurrences of CONFIG_EXAMPLE. diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index f7f2e499c..80b7d5bd1 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -8,7 +8,7 @@

NuttX RTOS

-

Last Updated: August 27, 2010

+

Last Updated: August 28, 2010

@@ -1903,8 +1903,22 @@ nuttx-5.10 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> the arch/arm/src/Makefile for now. * arch/arm/src/lpc17xx/lpc17_internal.h - Add missing parentheses in macros definitions (patch submitted by Tiago Maluta). + * Documents/NuttxPortingGuide.html, configs/README.txt, etc. - + Replaced CONFIG_EXAMPLE with CONFIG_APP_DIR (see documents for + desciption). This allows NuttX application code to be built + outside of the examples/ directory. -pascal-2.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> + For people who have their own configurations and/or Makefiles, + you will need to make a couple of changes: + + - Replace all occurrences of CONFIG_EXAMPLE=foobar with + CONFIG_APP_DIR=examples/foobar in all of the configuration + files. + - Replace any occurrences of examples/$(CONFIG_EXAMPLE) with + $(CONFIG_APP_DIR) + - Replace any occurrences of lib$(CONFIG_EXAMPLE)$(LIBEXT) + with libapp$(LIBEXT) in your Makefiles. + - Check any other occurrences of CONFIG_EXAMPLE.pascal-2.1 2010-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> buildroot-1.9 2010-xx-xx diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index 0df789699..2f3d8af8f 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -12,7 +12,7 @@

NuttX RTOS Porting Guide

-

Last Updated: August 27, 2010

+

Last Updated: August 29, 2010

@@ -2178,6 +2178,7 @@ extern void up_ledoff(int led); The start address of DRAM (virtual) +

Build Options

General build options:

@@ -2206,9 +2207,9 @@ extern void up_ledoff(int led); have been defined in the configurations Make.defs file. - -

General OS setup

- +

+ Building application code: +

+

+ Two-pass Build Options. + If the 2 pass build option is selected, then these options configure the make system build a extra link object. + This link object is assumed to be an incremental (relative) link object, but could be a static library (archive) + (some modification to this Makefile would be required if CONFIG_PASS1_OBJECT is an archive). + Pass 1 1ncremental (relative) link objects should be put into the processor-specific source directory + where other link objects will be created - ff the pass1 obect is an archive, it could go anywhere. +

+ +

+ When the two pass build option is enabled, the following also apply: +

+ + +

General OS setup

  • CONFIG_DEBUG: enables built-in debug options
  • @@ -2434,7 +2467,8 @@ build

    - If CONFIG_PAGING is selected, then the following also apply: + If CONFIG_PAGING is selected, then you will probabaly need CONFIG_BUILD_2PASS to correctly position + the code and the following configuration options also apply: