Last Updated: May 25, 2019
+Last Updated: August 5, 2019
@@ -309,7 +309,7 @@ | | |-- (binfmt-specific sub-directories)/ | | | `-- (binfmt-specific source files) | | `-- (common binfmt source files) -| |-- configs/ +| |-- boards/ | | |-- <board-name>/ | | | |-- include/ | | | | `-- (other board-specific header files) @@ -527,7 +527,7 @@
These board-specific configuration files can be found in the
boards/<board-name>/ sub-directories and are discussed
- in a paragraph below.
+ in a paragraph below.
The directory boards/stm32f4disovery/, as an example, holds board-specific logic for the STM32F4 Discovery board and is selected via the CONFIG_ARCH_BOARD="stm32f4discovery" configuration setting.
@@ -791,16 +791,16 @@
The audio/ subdirectory contains the NuttX audio sub-system.
The boards/ subdirectory contains configuration data for each board.
These board-specific configurations plus the architecture-specific configurations in
the arch/ subdirectory complete define a customized port of NuttX.
- The configs directory contains board specific configuration files. Each board must
+ The boards/ directory contains board specific configuration files. Each board must
provide a subdirectory <board-name> under boards/ with the following characteristics:
@@ -1600,7 +1600,7 @@ Where: -n selects the Windows host and Windows native (n) environment. Default: Use host setup in the defconfig file Default Windows: Cygwin - <board-name> is the name of the board in the configs directory + <board-name> is the name of the board in theboards/directory <config-name> is the name of the board configuration sub-directory <app-dir> is the path to the apps/ directory, relative to the nuttx directory diff --git a/boards/README.txt b/boards/README.txt index 0edebef95c2..e8b75eb64b3 100644 --- a/boards/README.txt +++ b/boards/README.txt @@ -3,10 +3,10 @@ Board-Specific Configurations This directory contains the board support for logic for all boards supported by NuttX. This directory is retained in a separate repository and is a Sub- -Module of NuttX and will appear as nuttx/configs when the NuttX repository +Module of NuttX and will appear as nuttx/boards when the NuttX repository is cloned. -The nuttx/configs directory is a part of the internal OS. It should contain +The nuttx/boards directory is a part of the internal OS. It should contain only OS bring-up logic and driver initialization logic. THERE SHOULD BE NO APPLICATION CALLABLE LOGIC IN THIS DIRECTORY. @@ -58,7 +58,7 @@ the arch/ subdirectory completely define a customized port of NuttX. Directory Structure ^^^^^^^^^^^^^^^^^^^ -The configs directory contains board specific configuration logic. Each +The boards/ directory contains board specific configuration logic. Each board must provide a subdirectoryunder boards/ with the following characteristics: @@ -200,12 +200,12 @@ boards/c5471evm NuttX runs on the ARM core and is built with a GNU arm-nuttx-elf toolchain*. This port is complete and verified. -configs launchxl_cc1310 +boards/launchxl_cc1310 Port to the TI SimpleLink CC1310 LaunchPad Evaluation Kit (LAUNCHXL-CC1310) featuring the SimpleLinkCC1310 chip. This board features the CC1310F128 part with 128Kb of FLASH and 20Kb of SRAM. -configs launchxl_cc1312r1 +boards/launchxl_cc1312r1 Port to the TI SimpleLink CC1312R1 LaunchPad Evaluation Kit (LAUNCHXL-CC1312R1) featuring the SimpleLinkCC1312R1 chip. diff --git a/boards/metro-m4/README.txt b/boards/metro-m4/README.txt index 6432791dee1..16918cd95b1 100644 --- a/boards/metro-m4/README.txt +++ b/boards/metro-m4/README.txt @@ -192,8 +192,8 @@ Unlocking FLASH J-Link>mem8 804000,10 00804000 = 39 92 9A F6 80 FF EC AE FF FF FF FF FF FF FF FF - J-Link>loadfile D:\Spuda\Documents\projects\nuttx\master\nuttx\configs\metro-m4\scripts\nvm.srec - Downloading file [D:\Spuda\Documents\projects\nuttx\master\nuttx\configs\metro-m4\scripts\nvm.srec]... + J-Link>loadfile D:\Spuda\Documents\projects\nuttx\master\nuttx\boards\metro-m4\scripts\nvm.srec + Downloading file [D:\Spuda\Documents\projects\nuttx\master\nuttx\boards\metro-m4\scripts\nvm.srec]... J-Link: Flash download: Bank 1 @ 0x00804000: 1 range affected (16 bytes) J-Link: Flash download: Total time needed: 0.089s (Prepare: 0.035s, Compare: 0.011s, Erase: 0.000s, Program: 0.019s, Verify: 0.011s, Restore: 0.011s) O.K. diff --git a/tools/README.txt b/tools/README.txt index 7c54ed29dce..a8e8ba5ef0a 100644 --- a/tools/README.txt +++ b/tools/README.txt @@ -805,7 +805,7 @@ refresh.sh --help Show this help message and exit - The board directory under nuttx/configs + The board directory under nuttx/boards The board configuration directory under nuttx/boards/ @@ -944,7 +944,7 @@ testbuild.sh The first value is the usual configuration description of the form form / and must correspond to a - configuration in the nuttx/configs directory. + configuration in the nuttx/boards directory. The second value is valid name for a toolchain configuration to use when building the configuration. The set of valid toolchain diff --git a/tools/configure.c b/tools/configure.c index 629157b5297..10a3945151a 100644 --- a/tools/configure.c +++ b/tools/configure.c @@ -171,11 +171,11 @@ static void show_usage(const char *progname, int exitcode) fprintf(stderr, " ..%capps-xx.yy where xx.yy is the NuttX version number.\n", g_delim); fprintf(stderr, " :\n"); fprintf(stderr, " Identifies the board. This must correspond to a board directory\n"); - fprintf(stderr, " under nuttx%cconfigs%c.\n", g_delim, g_delim); + fprintf(stderr, " under nuttx%cboards%c.\n", g_delim, g_delim); fprintf(stderr, " :\n"); fprintf(stderr, " Identifies the specific configuration for the selected .\n"); fprintf(stderr, " This must correspond to a sub-directory under the board directory at\n"); - fprintf(stderr, " under nuttx%cconfigs%c %c.\n", g_delim, g_delim, g_delim); + fprintf(stderr, " under nuttx%cboards%c %c.\n", g_delim, g_delim, g_delim); fprintf(stderr, " -h:\n"); fprintf(stderr, " Prints this message and exits.\n"); exit(exitcode); @@ -552,7 +552,7 @@ static void check_configdir(void) { /* Get the path to the top level configuration directory */ - snprintf(g_buffer, BUFFER_SIZE, "%s%cconfigs", g_topdir, g_delim); + snprintf(g_buffer, BUFFER_SIZE, "%s%cboards", g_topdir, g_delim); debug("check_configdir: Checking configtop=%s\n", g_buffer); verify_directory(g_buffer); @@ -560,7 +560,7 @@ static void check_configdir(void) /* Get and verify the path to the selected configuration */ - snprintf(g_buffer, BUFFER_SIZE, "%s%cconfigs%c%s%c%s", + snprintf(g_buffer, BUFFER_SIZE, "%s%cboards%c%s%c%s", g_topdir, g_delim, g_delim, g_boarddir, g_delim, g_configdir); debug("check_configdir: Checking configpath=%s\n", g_buffer); @@ -573,7 +573,7 @@ static void check_configdir(void) g_configpath = strdup(g_buffer); - snprintf(g_buffer, BUFFER_SIZE, "%s%cconfigs%c%s%cscripts", + snprintf(g_buffer, BUFFER_SIZE, "%s%cboards%c%s%cscripts", g_topdir, g_delim, g_delim, g_boarddir, g_delim); debug("check_configdir: Checking scriptspath=%s\n", g_buffer); diff --git a/tools/initialconfig.c b/tools/initialconfig.c index 4c8111522e9..b1745a9783d 100644 --- a/tools/initialconfig.c +++ b/tools/initialconfig.c @@ -74,7 +74,7 @@ static char g_delim = '/'; /* Delimiter to use when forming p #endif static const char g_archdir[] = "arch"; /* Architecture directory */ -static const char g_configdir[] = "configs"; /* Board configuration directory */ +static const char g_configdir[] = "boards"; /* Board configuration directory */ static char *g_arch[MAX_ARCHITECTURES]; /* List of architecture names */ static int g_narch; /* Number of architecture names */