diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html index eb9d888bd4e..d02ed1369be 100644 --- a/Documentation/NXGraphicsSubsystem.html +++ b/Documentation/NXGraphicsSubsystem.html @@ -4203,13 +4203,13 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] =

Building apps/examples/nx. NX testing was performed using apps/examples/nx with the Linux/Cygwin-based NuttX simulator. - Configuration files for building this test can be found in boards/sim/nx - and boards/sim/nx11. + Configuration files for building this test can be found in boards/sim/configs/nx + and boards/sim/configs/nx11. There are two alternative configurations for building the simulation:

  1. - The configuration using the configuration file at boards/sim/nx/defconfig. + The configuration using the configuration file at boards/sim/configs/nx/defconfig. This default configuration exercises the NX logic a 8 BPP but provides no visual feedback. In this configuration, a very simple, simulated framebuffer driver is used that is based upon a simple region of memory posing as video memory. @@ -4224,7 +4224,7 @@ make

  2. - The preferred configuration is at boards/sim/nx11/defconfig. + The preferred configuration is at boards/sim/configs/nx11/defconfig. This configuration extends the test with a simulated framebuffer driver that uses an X window as a framebuffer. This is a superior test configuration because the X window appears at your desktop diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index abbbb61dcc5..d98e1edc4fd 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -315,9 +315,10 @@ | | | | `-- (other board-specific header files) | | | |-- src/ | | | | `-- (board-specific source files) -| | | |---<config-name>/ -| | | | `-- (board configuration-specific source files) -| | | `---(other configuration sub-directories for this board)/ +| | | `- configs/ +| | | |---<config-name>/ +| | | | `-- (board configuration-specific source files) +| | | `---(other configuration sub-directories for this board)/ | | `-- <(other board directories)>/ | |-- crypto | | |-- Makefile @@ -812,12 +813,13 @@ |-- src/ | |-- Makefile | `-- (board-specific source files) -|-- <config1-dir> -| |-- Make.defs -| `-- defconfig -|-- <config2-dir> -| |-- Make.defs -| `-- defconfig +|-- configs/ +| |-- <config1-dir> +| | |-- Make.defs (optional) +| | `-- defconfig +| |-- <config2-dir> +| | |-- Make.defs +| | `-- defconfig | ... |-- scripts/ | |-- (linker script files) @@ -850,7 +852,7 @@

    2.5.2.2 Board Specific Configuration Sub-Directories

    - The boards/<board-name>/ sub-directory holds all of the + The boards/<board-name>/configs sub-directory holds all of the files that are necessary to configure NuttX for the particular board. A board may have various different configurations using the common source files. Each board configuration is described by two files: Make.defs and defconfig. @@ -1555,8 +1557,8 @@ tools/ This could be done manually as follows:

    @@ -1567,6 +1569,9 @@ tools/ <config-dir> is the optional, specific configuration directory for the board. And <app-dir> is the location of the optional application directory.

    +

    + NOTE: Recall that the Make.defs file may reside in either the boards/<board-name>/configs/[<config-dir> directory or in the boards/<board-name>/scripts. +

    Automated Configuration. There is a script that automates these steps. The following steps will diff --git a/Documentation/README.html b/Documentation/README.html index 8f12ce61bff..15254dbd5c5 100644 --- a/Documentation/README.html +++ b/Documentation/README.html @@ -96,15 +96,15 @@ nuttx/ | |- ekk-lm3s9b96/ | | `- README.txt | |- ez80f910200kitg/ - | | |- ostest/README.txt + | | |- configs/ostest/README.txt | | `- README.txt | |- ez80f910200zco/ - | | |- dhcpd/README.txt - | | |- httpd/README.txt - | | |- nettest/README.txt - | | |- nsh/README.txt - | | |- ostest/README.txt - | | |- poll/README.txt + | | |- configs/dhcpd/README.txt + | | |- configs/httpd/README.txt + | | |- configs/nettest/README.txt + | | |- configs/nsh/README.txt + | | |- configs/ostest/README.txt + | | |- configs/poll/README.txt | | `- README.txt | |- fire-stm32v2/ | | `- README.txt @@ -125,7 +125,6 @@ nuttx/ | |- gapuino/ | | `- README.txt | |- hymini-stm32v/ - | | |- RIDE/README.txt | | `- README.txt | |- imxrt1050-evk/ | | `- README.txt @@ -158,7 +157,7 @@ nuttx/ | |- lpcxpresso-lpc54628/ | | `- README.txt | |- makerlisp/ - | | |- nsh/README.txt + | | |- configs/nsh/README.txt | | `- README.txt\ | |- maple/ | | `- README.txt\ @@ -298,7 +297,6 @@ nuttx/ | |- spresense/ | | `- README.txt | |- stm3210e-eval/ - | | |- RIDE/README.txt | | `- README.txt | |- stm3220g-eval/ | | `- README.txt @@ -363,16 +361,16 @@ nuttx/ | |- xmc4500-relax/ | | `- README.txt | |- z16f2800100zcog/ - | | |- ostest/README.txt - | | |- pashello/README.txt + | | |- configs/ostest/README.txt + | | |- configs/pashello/README.txt | | `- README.txt | |- z80sim/ | | `- README.txt | |- z8encore000zco/ - | | |- ostest/README.txt + | | |- configs/ostest/README.txt | | `- README.txt | |- z8f64200100kit/ - | | |- ostest/README.txt + | | |- configs/ostest/README.txt | | `- README.txt | |- zkit-arm-1769/ | | `- README.txt diff --git a/README.txt b/README.txt index d03f1dc383a..da7fabb1dc6 100644 --- a/README.txt +++ b/README.txt @@ -679,7 +679,7 @@ Instantiating "Canned" Configurations "Canned" NuttX configuration files are retained in: - boards// + boards//configs/ Where is the name of your development board and is the name of the sub-directory containing a specific configuration for @@ -720,7 +720,7 @@ Instantiating "Canned" Configurations Configuring NuttX requires only copying two files from the to the directory where you installed NuttX (TOPDIR): - Copy boards///Make.def to{TOPDIR}/Make.defs + Copy boards//configs//Make.def to{TOPDIR}/Make.defs OR Copy boards//scripts/Make.def to{TOPDIR}/Make.defs @@ -731,7 +731,7 @@ Instantiating "Canned" Configurations it may use a common Make.defs file for the board in the scripts/ directory. The first takes precedence. - Copy boards///defconfig to{TOPDIR}/.config + Copy boards//configs//defconfig to{TOPDIR}/.config The defconfig file holds the actual build configuration. This file is included by all other make files to determine what is @@ -1792,15 +1792,17 @@ nuttx/ | |- ekk-lm3s9b96/ | | `- README.txt | |- ez80f910200kitg/ - | | |- ostest/README.txt - | | `- README.txt + | | `- configs/ + | | |- ostest/README.txt + | | `- README.txt | |- ez80f910200zco/ - | | |- dhcpd/README.txt - | | |- httpd/README.txt - | | |- nettest/README.txt - | | |- nsh/README.txt - | | |- ostest/README.txt - | | |- poll/README.txt + | | |- configs/ + | | | |- dhcpd/README.txt + | | | |- httpd/README.txt + | | | |- nettest/README.txt + | | | |- nsh/README.txt + | | | |- ostest/README.txt + | | | |- poll/README.txt | | `- README.txt | |- fire-stm32v2/ | | `- README.txt @@ -1853,7 +1855,8 @@ nuttx/ | |- lpcxpresso-lpc54628/ | | `- README.txt | |- makerlisp/ - | | |- nsh/README.txt + | | |-configs/ + | | | `- nsh/README.txt | | `- README.txt | |- maple/ | | `- README.txt @@ -1992,7 +1995,6 @@ nuttx/ | |- spresense/ | | `- README.txt | |- stm3210e-eval/ - | | |- RIDE/README.txt | | `- README.txt | |- stm3220g-eval/ | | `- README.txt @@ -2012,9 +2014,10 @@ nuttx/ | | |- fb/README.txt | | `- README.txt | |- stm32f746g-disco/ - | | _- fb/README.txt - | | _- nxdemo/README.txt - | | _- nxterm/README.txt + | | |- configs/ + | | | |- fb/README.txt + | | | |- nxdemo/README.txt + | | | `- nxterm/README.txt | | `- README.txt | |- stm32f769i-disco/ | | `- README.txt @@ -2057,16 +2060,19 @@ nuttx/ | |- xmc5400-relax/ | | `- README.txt | |- z16f2800100zcog/ - | | |- ostest/README.txt - | | |- pashello/README.txt + | | |- configs/ + | | | |- ostest/README.txt + | | | `- pashello/README.txt | | `- README.txt | |- z80sim/ | | `- README.txt | |- z8encore000zco/ - | | |- ostest/README.txt + | | |- configs/ + | | | `- ostest/README.txt | | `- README.txt | |- z8f64200100kit/ - | | |- ostest/README.txt + | | |- configs/ + | | | `- ostest/README.txt | | `- README.txt | |- zkit-arm-1769/ | | `- README.txt diff --git a/TODO b/TODO index 3a75faa6b16..984673b00a0 100644 --- a/TODO +++ b/TODO @@ -81,7 +81,7 @@ o Task/Scheduler (sched/) As of this writing, the basic feature implementation is complete and much of the logic has been verified. The test harness for the feature exists only for the NXP LPC3131 (see - boards/ea3131/pgnsh and locked directories). There are + boards/ea3131/configs/pgnsh and locked directories). There are some limitations of this testing so I still cannot say that the feature is fully functional. Status: Open. This has been put on the shelf for some time. @@ -1788,7 +1788,7 @@ o USB (drivers/usbdev, drivers/usbhost) Title: USB CDC/ACM HOST CLASS DRIVER Description: A CDC/ACM host class driver has been added. This has been testing by running the USB CDC/ACM host on an Olimex - LPC1766STK and using the boards/stm3210e-eval/usbserial + LPC1766STK and using the boards/stm3210e-eval/configs/usbserial configuration (using the CDC/ACM device side driver). There are several unresolved issues that prevent the host driver from being usable: @@ -2230,7 +2230,7 @@ o File system / Generic drivers (fs/, drivers/) file being read is smaller than number bytes written to the file. That test does write small files continuously until file system is full and even the the error is rare. The - boards/sim/spiffs test can used to demonstrate the error. + boards/sim/configs/spiffs test can used to demonstrate the error. Status: Open Priority: Medium. It is certain a file system failure, but I think that the exposure in real world uses cases is very small. diff --git a/boards/bambino-200e/README.txt b/boards/bambino-200e/README.txt index b172bdbbfee..a24e7e27123 100644 --- a/boards/bambino-200e/README.txt +++ b/boards/bambino-200e/README.txt @@ -126,8 +126,9 @@ the following lines in each Make.defs file: Configuration Changes --------------------- -Below are all of the configuration changes that I had to make to boards/stm3240g-eval/nsh2 -in order to successfully build NuttX using the Atollic toolchain WITH FPU support: +Below are all of the configuration changes that I had to make to +boards/stm3240g-eval/configs/nsh2 in order to successfully build NuttX using +the Atollic toolchain WITH FPU support: -CONFIG_ARCH_FPU=n : Enable FPU support +CONFIG_ARCH_FPU=y diff --git a/boards/bambino-200e/configs/netnsh/Make.defs b/boards/bambino-200e/configs/netnsh/Make.defs index 4f955a81d75..1c077e6404d 100644 --- a/boards/bambino-200e/configs/netnsh/Make.defs +++ b/boards/bambino-200e/configs/netnsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/bambino-200e/nsh/Make.defs +# boards/bambino-200e/configs/nsh/Make.defs # # Copyright (C) 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/imxrt1050-evk/README.txt b/boards/imxrt1050-evk/README.txt index 13628e4b0b8..4217f015541 100644 --- a/boards/imxrt1050-evk/README.txt +++ b/boards/imxrt1050-evk/README.txt @@ -203,7 +203,7 @@ Configuration sub-directories debugger or FLASH utility, then you may need to combine the two hex files into a single .hex file. Here is how you can do that. - a. The 'boards/samv71-xult/knsh/defconfigtail' of the nuttx.hex file should look something like this + a. The 'tail' of the nuttx.hex file should look something like this (with my comments added beginning with #): $ tail nuttx.hex diff --git a/boards/imxrt1050-evk/configs/knsh/Make.defs b/boards/imxrt1050-evk/configs/knsh/Make.defs index 49c50cd1a04..7f6c937d7d0 100644 --- a/boards/imxrt1050-evk/configs/knsh/Make.defs +++ b/boards/imxrt1050-evk/configs/knsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/imxrt1050-evk/knsh/Make.defs +# boards/imxrt1050-evk/configs/knsh/Make.defs # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/imxrt1060-evk/README.txt b/boards/imxrt1060-evk/README.txt index 37ac3f8b6f8..6b7eb7bb3ca 100644 --- a/boards/imxrt1060-evk/README.txt +++ b/boards/imxrt1060-evk/README.txt @@ -221,7 +221,7 @@ Configuration sub-directories debugger or FLASH utility, then you may need to combine the two hex files into a single .hex file. Here is how you can do that. - a. The 'boards/samv71-xult/knsh/defconfigtail' of the nuttx.hex file should look something like this + a. The 'tail' of the nuttx.hex file should look something like this (with my comments added beginning with #): $ tail nuttx.hex diff --git a/boards/nucleo-144/configs/f722-nsh/Make.defs b/boards/nucleo-144/configs/f722-nsh/Make.defs index d443142c840..fac5bcf14e2 100644 --- a/boards/nucleo-144/configs/f722-nsh/Make.defs +++ b/boards/nucleo-144/configs/f722-nsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/nucleo-144/f722-nsh/Make.defs +# boards/nucleo-144/configs/f722-nsh/Make.defs # # Copyright (C) 2017 Gregory Nutt. All rights reserved. # Authors: Gregory Nutt diff --git a/boards/nucleo-144/configs/f746-evalos/Make.defs b/boards/nucleo-144/configs/f746-evalos/Make.defs index 0662ad59861..e5de25a3823 100644 --- a/boards/nucleo-144/configs/f746-evalos/Make.defs +++ b/boards/nucleo-144/configs/f746-evalos/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/nucleo-144/f746-evalos/Make.defs +# boards/nucleo-144/configs/f746-evalos/Make.defs # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Authors: Gregory Nutt diff --git a/boards/nucleo-144/configs/f746-nsh/Make.defs b/boards/nucleo-144/configs/f746-nsh/Make.defs index e38776951f0..a7ad2ad563b 100644 --- a/boards/nucleo-144/configs/f746-nsh/Make.defs +++ b/boards/nucleo-144/configs/f746-nsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/nucleo-144/f746-nsh/Make.defs +# boards/nucleo-144/configs/f746-nsh/Make.defs # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Authors: Gregory Nutt diff --git a/boards/nucleo-144/configs/f767-evalos/Make.defs b/boards/nucleo-144/configs/f767-evalos/Make.defs index 747640bbafd..9351ac8f3f1 100644 --- a/boards/nucleo-144/configs/f767-evalos/Make.defs +++ b/boards/nucleo-144/configs/f767-evalos/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/nucleo-144/f767-evalos/Make.defs +# boards/nucleo-144/configs/f767-evalos/Make.defs # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Authors: Gregory Nutt diff --git a/boards/nucleo-144/configs/f767-netnsh/Make.defs b/boards/nucleo-144/configs/f767-netnsh/Make.defs index 79f19809dd3..53b93079ccf 100644 --- a/boards/nucleo-144/configs/f767-netnsh/Make.defs +++ b/boards/nucleo-144/configs/f767-netnsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/nucleo-144/f767-netnsh/Make.defs +# boards/nucleo-144/configs/f767-netnsh/Make.defs # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Authors: Gregory Nutt diff --git a/boards/nucleo-144/configs/f767-nsh/Make.defs b/boards/nucleo-144/configs/f767-nsh/Make.defs index 42eec4ceaa4..0b0dbfa27a9 100644 --- a/boards/nucleo-144/configs/f767-nsh/Make.defs +++ b/boards/nucleo-144/configs/f767-nsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/nucleo-144/f767-nsh/Make.defs +# boards/nucleo-144/configs/f767-nsh/Make.defs # # Copyright (C) 2016 Gregory Nutt. All rights reserved. # Authors: Gregory Nutt diff --git a/boards/olimex-stm32-p407/configs/kelf/Make.defs b/boards/olimex-stm32-p407/configs/kelf/Make.defs index 93364742f2a..7f6122cc0d0 100644 --- a/boards/olimex-stm32-p407/configs/kelf/Make.defs +++ b/boards/olimex-stm32-p407/configs/kelf/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/olimex-stm32-p407/kelf/Make.defs +# boards/olimex-stm32-p407/configs/kelf/Make.defs # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/olimex-stm32-p407/configs/kmodule/Make.defs b/boards/olimex-stm32-p407/configs/kmodule/Make.defs index e43688bc303..449b67f0fff 100644 --- a/boards/olimex-stm32-p407/configs/kmodule/Make.defs +++ b/boards/olimex-stm32-p407/configs/kmodule/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/olimex-stm32-p407/kmodule/Make.defs +# boards/olimex-stm32-p407/configs/kmodule/Make.defs # # Copyright (C) 2018 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/olimex-stm32-p407/configs/knsh/Make.defs b/boards/olimex-stm32-p407/configs/knsh/Make.defs index ffc6057c9d6..5c2088b1a23 100644 --- a/boards/olimex-stm32-p407/configs/knsh/Make.defs +++ b/boards/olimex-stm32-p407/configs/knsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/olimex-stm32-p407/knsh/Make.defs +# boards/olimex-stm32-p407/configs/knsh/Make.defs # # Copyright (C) 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/open1788/configs/knsh/Make.defs b/boards/open1788/configs/knsh/Make.defs index fdfcafa8b6d..21e2f6f4acc 100644 --- a/boards/open1788/configs/knsh/Make.defs +++ b/boards/open1788/configs/knsh/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/open1788/knsh/Make.defs +# boards/open1788/configs/knsh/Make.defs # # Copyright (C) 2013 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/open1788/configs/knxterm/Make.defs b/boards/open1788/configs/knxterm/Make.defs index a881e0fc9f8..6b1d4520ecc 100644 --- a/boards/open1788/configs/knxterm/Make.defs +++ b/boards/open1788/configs/knxterm/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/open1788/knxterm/Make.defs +# boards/open1788/configs/knxterm/Make.defs # # Copyright (C) 2019 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/stm32f4discovery/configs/cxxtest/Make.defs b/boards/stm32f4discovery/configs/cxxtest/Make.defs index 6e1c75a3699..d81cacb8510 100644 --- a/boards/stm32f4discovery/configs/cxxtest/Make.defs +++ b/boards/stm32f4discovery/configs/cxxtest/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/stm32f4discovery/cxxtest/Make.defs +# boards/stm32f4discovery/configs/cxxtest/Make.defs # # Copyright (C) 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/stm32f4discovery/configs/elf/Make.defs b/boards/stm32f4discovery/configs/elf/Make.defs index b0c3375442a..d59e95d3572 100644 --- a/boards/stm32f4discovery/configs/elf/Make.defs +++ b/boards/stm32f4discovery/configs/elf/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/stm32f4discovery/elf/Make.defs +# boards/stm32f4discovery/configs/elf/Make.defs # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/stm32f4discovery/configs/posix_spawn/Make.defs b/boards/stm32f4discovery/configs/posix_spawn/Make.defs index 04720538d15..a569649eb10 100644 --- a/boards/stm32f4discovery/configs/posix_spawn/Make.defs +++ b/boards/stm32f4discovery/configs/posix_spawn/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/stm32f4discovery/posix_spawn/Make.defs +# boards/stm32f4discovery/configs/posix_spawn/Make.defs # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/stm32f4discovery/configs/testlibcxx/Make.defs b/boards/stm32f4discovery/configs/testlibcxx/Make.defs index 13fe6b596de..40698b8f092 100644 --- a/boards/stm32f4discovery/configs/testlibcxx/Make.defs +++ b/boards/stm32f4discovery/configs/testlibcxx/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/stm32f4discovery/testlibcxx/Make.defs +# boards/stm32f4discovery/configs/testlibcxx/Make.defs # # Copyright (C) 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/stm32f4discovery/configs/winbuild/Make.defs b/boards/stm32f4discovery/configs/winbuild/Make.defs index efba97e27cb..17f8106250a 100644 --- a/boards/stm32f4discovery/configs/winbuild/Make.defs +++ b/boards/stm32f4discovery/configs/winbuild/Make.defs @@ -1,5 +1,5 @@ ############################################################################ -# boards/stm32f4discovery/winbuild/Make.defs +# boards/stm32f4discovery/configs/winbuild/Make.defs # # Copyright (C) 2011-2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt