From 721994846c90f7c49e3a7a3c5530f8b454eee0b0 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Mon, 5 Aug 2019 16:53:39 -0600 Subject: [PATCH] tools/: Change preferred argument of configurations tools to use ':' as the delimiter between and . This is to emphasize that this is not a path; it is configuration specification. The legacy '/' delimiter is still supported but not recommend and not advertised. Squashed commit of the following: Update configurations instructions in more README.txt files to show ':' delimiter vs '/' delimiter. Update configurations instructions in various README.txt file to show ':' delimiter vs '/' delimiter. tools: Update all configuration-related tools to accept ':' separator between board and configuration name. --- Documentation/NXGraphicsSubsystem.html | 8 ++--- Documentation/NuttxPortingGuide.html | 10 +++--- README.txt | 10 +++--- binfmt/libpcode/README.txt | 2 +- boards/README.txt | 8 ++--- boards/amber/README.txt | 4 +-- boards/arduino-due/README.txt | 2 +- boards/arduino-mega2560/README.txt | 2 +- boards/avr32dev1/README.txt | 2 +- boards/b-l475e-iot01a/README.txt | 2 +- boards/bambino-200e/README.txt | 2 +- boards/beaglebone-black/README.txt | 2 +- boards/c5471evm/README.txt | 4 +-- boards/clicker2-stm32/README.txt | 2 +- boards/cloudctrl/README.txt | 2 +- boards/demo9s12ne64/README.txt | 4 +-- boards/dk-tm4c129x/README.txt | 2 +- boards/ea3131/README.txt | 6 ++-- boards/ea3152/README.txt | 6 ++-- boards/eagle100/README.txt | 2 +- boards/efm32-g8xx-stk/README.txt | 2 +- boards/efm32gg-stk3700/README.txt | 2 +- boards/ekk-lm3s9b96/README.txt | 2 +- boards/esp32-core/README.txt | 2 +- boards/ez80f910200kitg/README.txt | 2 +- boards/ez80f910200zco/README.txt | 2 +- boards/fire-stm32v2/README.txt | 2 +- boards/flipnclick-pic32mz/README.txt | 2 +- boards/flipnclick-sam3x/README.txt | 2 +- boards/freedom-k64f/README.txt | 2 +- boards/freedom-k66f/README.txt | 2 +- boards/freedom-kl25z/README.txt | 4 +-- boards/freedom-kl26z/README.txt | 4 +-- boards/gapuino/README.txt | 2 +- boards/hymini-stm32v/README.txt | 2 +- boards/imxrt1050-evk/README.txt | 2 +- boards/imxrt1060-evk/README.txt | 2 +- boards/kwikstik-k40/README.txt | 2 +- boards/launchxl-tms57004/README.txt | 2 +- boards/lc823450-xgevk/README.txt | 4 +-- boards/lincoln60/README.txt | 2 +- boards/lm3s6432-s2e/README.txt | 2 +- boards/lm3s6965-ek/README.txt | 2 +- boards/lm3s8962-ek/README.txt | 2 +- boards/lm4f120-launchpad/README.txt | 2 +- boards/lpc4330-xplorer/README.txt | 2 +- boards/lpc4337-ws/README.txt | 2 +- boards/lpc4357-evb/README.txt | 2 +- boards/lpc4370-link2/README.txt | 2 +- boards/lpcxpresso-lpc1768/README.txt | 2 +- boards/lpcxpresso-lpc54628/README.txt | 2 +- boards/makerlisp/README.txt | 2 +- boards/maple/README.txt | 2 +- boards/mbed/README.txt | 2 +- boards/mcb1700/README.txt | 2 +- boards/mcu123-lpc214x/README.txt | 4 +-- boards/metro-m4/README.txt | 2 +- boards/micropendous3/README.txt | 4 +-- boards/mikroe-stm32f4/README.txt | 2 +- boards/mirtoo/README.txt | 2 +- boards/misoc/README.txt | 2 +- boards/moteino-mega/README.txt | 2 +- boards/ne64badge/README.txt | 4 +-- boards/nr5m100-nexys4/README.txt | 2 +- boards/nrf52-generic/README.txt | 2 +- boards/ntosd-dm320/README.txt | 4 +-- boards/ntosd-dm320/doc/README.txt | 2 +- boards/nucleo-144/README.txt | 6 ++-- boards/nucleo-f072rb/README.txt | 2 +- boards/nucleo-f091rc/README.txt | 2 +- boards/nucleo-f446re/README.txt | 4 +-- boards/nucleo-f4x1re/README.txt | 4 +-- boards/nucleo-h743zi/README.txt | 2 +- boards/nucleo-l432kc/README.txt | 4 +-- boards/nucleo-l452re/README.txt | 2 +- boards/nucleo-l476rg/README.txt | 4 +-- boards/nucleo-l496zg/README.txt | 2 +- boards/nutiny-nuc120/README.txt | 4 +-- boards/olimex-efm32g880f128-stk/README.txt | 2 +- boards/olimex-lpc-h3131/README.txt | 6 ++-- boards/olimex-lpc1766stk/README.txt | 2 +- boards/olimex-stm32-e407/README.txt | 2 +- boards/olimex-stm32-p407/README.txt | 2 +- boards/olimex-strp711/README.txt | 4 +-- boards/pcduino-a10/README.txt | 2 +- boards/photon/README.txt | 2 +- boards/pic32mx-starterkit/README.txt | 2 +- boards/pic32mx7mmb/README.txt | 2 +- boards/pic32mz-starterkit/README.txt | 2 +- boards/pnev5180b/README.txt | 2 +- boards/qemu-i486/README.txt | 4 +-- boards/sabre-6quad/README.txt | 2 +- boards/sam3u-ek/README.txt | 2 +- boards/sam4e-ek/README.txt | 2 +- boards/sam4l-xplained/README.txt | 2 +- boards/sam4s-xplained-pro/README.txt | 2 +- boards/sam4s-xplained/README.txt | 2 +- boards/sama5d2-xult/README.txt | 2 +- boards/sama5d3-xplained/README.txt | 6 ++-- boards/sama5d3x-ek/README.txt | 8 ++--- boards/sama5d4-ek/README.txt | 14 ++++---- boards/samd20-xplained/README.txt | 4 +-- boards/samd21-xplained/README.txt | 2 +- boards/same70-xplained/README.txt | 2 +- boards/saml21-xplained/README.txt | 4 +-- boards/samv71-xult/README.txt | 2 +- boards/shenzhou/README.txt | 2 +- boards/sim/README.txt | 2 +- boards/stm3210e-eval/README.txt | 2 +- boards/stm3220g-eval/README.txt | 2 +- boards/stm3240g-eval/README.txt | 2 +- boards/stm32_tiny/README.txt | 2 +- boards/stm32f103-minimum/README.txt | 2 +- boards/stm32f3discovery/README.txt | 2 +- boards/stm32f429i-disco/README.txt | 2 +- boards/stm32f4discovery/README.txt | 6 ++-- boards/stm32f746g-disco/README.txt | 2 +- boards/stm32f746g-disco/configs/fb/README.txt | 2 +- .../configs/nxdemo/README.txt | 2 +- .../configs/nxterm/README.txt | 2 +- boards/stm32f769i-disco/README.txt | 2 +- boards/stm32ldiscovery/README.txt | 2 +- boards/stm32vldiscovery/README.txt | 2 +- boards/sure-pic32mx/README.txt | 2 +- boards/teensy-2.0/README.txt | 4 +-- boards/teensy-3.x/README.txt | 2 +- boards/tm4c123g-launchpad/README.txt | 2 +- boards/tm4c1294-launchpad/README.txt | 2 +- boards/tms570ls31x-usb-kit/README.txt | 2 +- boards/twr-k60n512/README.txt | 2 +- boards/twr-k64f120m/README.txt | 2 +- boards/ubw32/README.txt | 2 +- boards/us7032evb1/README.txt | 4 +-- boards/viewtool-stm32f107/README.txt | 2 +- boards/xmc4500-relax/README.txt | 2 +- boards/z16f2800100zcog/README.txt | 4 +-- boards/z80sim/README.txt | 6 ++-- boards/z8encore000zco/README.txt | 2 +- boards/z8f64200100kit/README.txt | 2 +- boards/zkit-arm-1769/README.txt | 2 +- boards/zp214xpa/README.txt | 2 +- libs/libc/zoneinfo/README.txt | 4 +-- tools/README.txt | 4 +-- tools/configure.c | 27 +++++++++------- tools/configure.sh | 32 +++++++++++++------ tools/refresh.sh | 19 +++++++++-- tools/testbuild.sh | 16 ++++++++-- 147 files changed, 266 insertions(+), 236 deletions(-) diff --git a/Documentation/NXGraphicsSubsystem.html b/Documentation/NXGraphicsSubsystem.html index d02ed1369b..27ef359b4a 100644 --- a/Documentation/NXGraphicsSubsystem.html +++ b/Documentation/NXGraphicsSubsystem.html @@ -4215,9 +4215,7 @@ static FAR const struct nx_fontpackage_s *g_fontpackages[] = based upon a simple region of memory posing as video memory. That default configuration can be built as follows:
    -cd <NuttX-Directory>/tools
    -./configure sim/nx
    -cd  <NuttX-Directory>
    +tools/configure.sh sim:nx
     make
     ./nuttx
     
@@ -4232,9 +4230,7 @@ make This preferred configuration can be built as follows:

    -cd <NuttX-Directory>/tools
    -./configure sim/nx11
    -cd  <NuttX-Directory>
    +tools/configure sim:nx11
     make
     ./nuttx
     
diff --git a/Documentation/NuttxPortingGuide.html b/Documentation/NuttxPortingGuide.html index d98e1edc4f..4eca560235 100644 --- a/Documentation/NuttxPortingGuide.html +++ b/Documentation/NuttxPortingGuide.html @@ -1488,7 +1488,7 @@ tools/ |-- cfgparser.h |-- cmpconfig.c |-- cnvwindeps.c -|-- configure.sh / configure.bat +|-- configure.sh / configure.bat / configure.c |-- copydir.sh / copydir.bat |-- define.sh / define.bat |-- discovery.py @@ -1578,14 +1578,14 @@ tools/ accomplish the same configuration:

    -  tools/configure.sh [OPTIONS] <board-name>[/<config-dir>]
    +  tools/configure.sh [OPTIONS] <board-name>:<config-dir>
     

There is an alternative Windows batch file, configure.bat, that can be used instead of configure.sh in the windows native environment like:

    -  tools\configure.bat <board-name>[\<config-dir>]
    +  tools\configure.bat <board-name>:<config-dir>
     

See tools/README.txt for more information about these scripts. @@ -1594,7 +1594,7 @@ tools/

     $ tools/configure.sh -h
     
    -USAGE: tools/configure.sh [-d] [-l|m|c|u|g|n] [-a <app-dir>] <board-name>/<config-name>
    +USAGE: tools/configure.sh [-d] [-l|m|c|u|g|n] [-a <app-dir>] <board-name>:<config-name>
     
     Where:
       -l selects the Linux (l) host environment.
    @@ -1616,7 +1616,7 @@ Where:
       then you should also specify the location of the application directory on the command line like:
     

      -  tools/configure.sh -a <app-dir> <board-name>[/<config-dir>]
      +  tools/configure.sh -a <app-dir> <board-name>:<config-dir>
       

    diff --git a/README.txt b/README.txt index da7fabb1dc..0b22e987f9 100644 --- a/README.txt +++ b/README.txt @@ -691,12 +691,12 @@ Instantiating "Canned" Configurations There is one tool for use with any Bash-like shell that does configuration steps. It is used as follows: - tools/configure.sh / + tools/configure.sh : There is an alternative Windows batch file that can be used in the windows native environment like: - tools\configure.bat \ + tools\configure.bat : And, to make sure that other platforms are supported, there is also a C program at tools/configure.c that can be compiled to establish the @@ -939,7 +939,7 @@ Make Sure that You are on the Right Platform configurations. For example, if you are running on Linux and you configure like this: - tools/configure.sh board/configuration + tools/configure.sh board:configuration The you can use the following command to both (1) make sure that the configuration is up to date, AND (2) the configuration is set up @@ -965,11 +965,11 @@ Make Sure that You are on the Right Platform platform that you use, and uncompress and refresh the defconfig file all in one command like: - tools/configure.sh -l board/configuration + tools/configure.sh -l board:configuration For a Linux host or for a Windows/Cygwin host: - tools/configure.sh -h board/configuration + tools/configure.sh -h board:configuration Other options are available from the help option built into the script. You can see all options with: diff --git a/binfmt/libpcode/README.txt b/binfmt/libpcode/README.txt index 8b1b374009..2da26d9cfd 100644 --- a/binfmt/libpcode/README.txt +++ b/binfmt/libpcode/README.txt @@ -59,7 +59,7 @@ Here is a simple test configuration using the NuttX simulator: 1. Install the sim/nsh configuration: cd tools - ./configure.sh sim/nsh + ./configure.sh sim:nsh cd .. 2. Install p-code virtual machine as described above. diff --git a/boards/README.txt b/boards/README.txt index e8b75eb64b..568e0ee763 100644 --- a/boards/README.txt +++ b/boards/README.txt @@ -881,14 +881,12 @@ tools/configure.sh There is a script that automates these steps. The following steps will accomplish the same configuration: - cd tools - ./configure.sh / + tools/configure.sh : There is an alternative Windows batch file that can be used in the windows native enironment like: - cd ${TOPDIR}\tools - configure.bat \ + tools\configure.bat : See tools/README.txt for more information about these scripts. @@ -897,7 +895,7 @@ tools/configure.sh application directory on the command line like: cd tools - ./configure.sh -a / + ./configure.sh -a : Building Symbol Tables ^^^^^^^^^^^^^^^^^^^^^^ diff --git a/boards/amber/README.txt b/boards/amber/README.txt index 50a23cac48..8728b4cf9d 100644 --- a/boards/amber/README.txt +++ b/boards/amber/README.txt @@ -274,7 +274,7 @@ NuttX buildroot Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh amber/ + tools/configure.sh amber: NOTE: you also must copy avr-libc header files into the NuttX include directory with command perhaps like: @@ -481,7 +481,7 @@ Common Configuration Notes 1. Each Amber Web Server configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh amber/ + tools/configure.sh amber: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/arduino-due/README.txt b/boards/arduino-due/README.txt index 9209746ab2..e6506b981d 100644 --- a/boards/arduino-due/README.txt +++ b/boards/arduino-due/README.txt @@ -637,7 +637,7 @@ Configurations Each Arduino Due configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh [OPTIONS] arduino-due/ + tools/configure.sh [OPTIONS] arduino-due: Where typical options are -l to configure to build on Linux or -c to configure for Cygwin under Linux. 'tools/configure.sh -h' will show diff --git a/boards/arduino-mega2560/README.txt b/boards/arduino-mega2560/README.txt index 3a7f629343..7cf4aaa0f1 100644 --- a/boards/arduino-mega2560/README.txt +++ b/boards/arduino-mega2560/README.txt @@ -48,7 +48,7 @@ Configurations 1. Each Arduino MEGA2560 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh arduino-mega2560/ + tools/configure.sh arduino-mega2560: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/avr32dev1/README.txt b/boards/avr32dev1/README.txt index f96a534274..9656eb75e1 100644 --- a/boards/avr32dev1/README.txt +++ b/boards/avr32dev1/README.txt @@ -424,7 +424,7 @@ Common Configuration Notes 1. Each Atmel AVR32DEV configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh avr32dev1/ + tools/configure.sh avr32dev1: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/b-l475e-iot01a/README.txt b/boards/b-l475e-iot01a/README.txt index d74b66da6a..0cfb1ca9dc 100644 --- a/boards/b-l475e-iot01a/README.txt +++ b/boards/b-l475e-iot01a/README.txt @@ -190,7 +190,7 @@ Configurations Each B-L475E-IOT01A configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh [-l|c|u|n] /b-l475e-iot01a/ + tools/configure.sh [-l|c|u|n] /b-l475e-iot01a: Where: -l selects the Linux (l) host environment. The [-c|u|n] options diff --git a/boards/bambino-200e/README.txt b/boards/bambino-200e/README.txt index a24e7e2712..cc129387aa 100644 --- a/boards/bambino-200e/README.txt +++ b/boards/bambino-200e/README.txt @@ -340,7 +340,7 @@ Configurations Each Bambino-200e configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh bambino-200e/ + tools/configure.sh bambino-200e: Where is one of the following: diff --git a/boards/beaglebone-black/README.txt b/boards/beaglebone-black/README.txt index ece8a7cc3c..fc6238fd30 100644 --- a/boards/beaglebone-black/README.txt +++ b/boards/beaglebone-black/README.txt @@ -169,7 +169,7 @@ Configurations Each Beaglebone Black configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh [OPTIONS] beaglebone-black/ + tools/configure.sh [OPTIONS] beaglebone-black: Where [OPTIONS] include -l to configure for a Linux host platform and -c means to configure for a Windows Cygwin host platform. -h will give diff --git a/boards/c5471evm/README.txt b/boards/c5471evm/README.txt index a8ea362900..6e4dd5f3fc 100644 --- a/boards/c5471evm/README.txt +++ b/boards/c5471evm/README.txt @@ -13,7 +13,7 @@ Toolchain 1. You must have already configured Nuttx in nuttx. - tools/configure.sh c5471evm/ + tools/configure.sh c5471evm: 2. Download the latest buildroot package into @@ -122,7 +122,7 @@ Common Configuration Notes 1. Each C5471 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh c5471evm/ + tools/configure.sh c5471evm: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/clicker2-stm32/README.txt b/boards/clicker2-stm32/README.txt index c294914eba..425a050367 100644 --- a/boards/clicker2-stm32/README.txt +++ b/boards/clicker2-stm32/README.txt @@ -160,7 +160,7 @@ Configurations Each Clicker2 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh clicker2-stm32/ + tools/configure.sh clicker2-stm32: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/cloudctrl/README.txt b/boards/cloudctrl/README.txt index 1417a6e619..f283ac6343 100644 --- a/boards/cloudctrl/README.txt +++ b/boards/cloudctrl/README.txt @@ -465,7 +465,7 @@ Configurations Each Cloudctrl configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh shenzhou/ + tools/configure.sh shenzhou: Where is one of the following: diff --git a/boards/demo9s12ne64/README.txt b/boards/demo9s12ne64/README.txt index 76be2562cf..f365801584 100644 --- a/boards/demo9s12ne64/README.txt +++ b/boards/demo9s12ne64/README.txt @@ -121,7 +121,7 @@ NuttX Buildroot Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh demo9s12nec64/ + tools/configure.sh demo9s12nec64: 2. Download the latest buildroot package into @@ -356,7 +356,7 @@ Common Configuration Notes 1. Each Freescale HCS12 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh demo9s12nec64/ + tools/configure.sh demo9s12nec64: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/dk-tm4c129x/README.txt b/boards/dk-tm4c129x/README.txt index b757749dcb..f12aedd1ca 100644 --- a/boards/dk-tm4c129x/README.txt +++ b/boards/dk-tm4c129x/README.txt @@ -647,7 +647,7 @@ Configurations Each DK-TM4C129X configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh dk-tm4c129x/ + tools/configure.sh dk-tm4c129x: Where is one of the following: diff --git a/boards/ea3131/README.txt b/boards/ea3131/README.txt index e85ffb20c8..b9f1f9ca7d 100644 --- a/boards/ea3131/README.txt +++ b/boards/ea3131/README.txt @@ -150,7 +150,7 @@ NuttX buildroot Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh ea3131/ + tools/configure.sh ea3131: 2. Download the latest buildroot package into @@ -205,7 +205,7 @@ Image Format Then, to build the NuttX binary ready to load with the bootloader, just following these steps: - - tools/configure.sh ea3131/nsh # (using the nsh configuration for this example) + - tools/configure.sh ea3131:nsh # (using the nsh configuration for this example) - cd .. # Set up environment - make # Make NuttX. This will produce nuttx.bin - mklpc.sh # Make the bootloader binary (nuttx.lpc) @@ -591,7 +591,7 @@ Common Configuration Notes 1. Each EA3131 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh ea3131/ + tools/configure.sh ea3131: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/ea3152/README.txt b/boards/ea3152/README.txt index 33c1b3c1af..7e0655dc2f 100644 --- a/boards/ea3152/README.txt +++ b/boards/ea3152/README.txt @@ -149,7 +149,7 @@ NuttX buildroot Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh ea3152/ + tools/configure.sh ea3152: 2. Download the latest buildroot package into @@ -204,7 +204,7 @@ Image Format Then, to build the NuttX binary ready to load with the bootloader, just following these steps: - - tools/configure.sh ea3152/ostest # (using the ostest configuration for this example) + - tools/configure.sh ea3152:ostest # (using the ostest configuration for this example) - cd .. # Set up environment - make # Make NuttX. This will produce nuttx.bin - mklpc.sh # Make the bootloader binary (nuttx.lpc) @@ -394,7 +394,7 @@ Configurations Each EA3152 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh ea3152/ + tools/configure.sh ea3152: Where is one of the following: diff --git a/boards/eagle100/README.txt b/boards/eagle100/README.txt index 65ea1c3827..6f6e996d26 100644 --- a/boards/eagle100/README.txt +++ b/boards/eagle100/README.txt @@ -186,7 +186,7 @@ Common Configuration Notes 1. Each Eagle-100 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh eagle100/ + tools/configure.sh eagle100: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/efm32-g8xx-stk/README.txt b/boards/efm32-g8xx-stk/README.txt index 60df7277f8..5d70ce5293 100644 --- a/boards/efm32-g8xx-stk/README.txt +++ b/boards/efm32-g8xx-stk/README.txt @@ -231,7 +231,7 @@ CONFIGURATIONS Each EFM32 Gecko Starter Kit configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh efm32-g8xx-stk/ + tools/configure.sh efm32-g8xx-stk: If this is a Windows native build, then configure.bat should be used instead of configure.sh: diff --git a/boards/efm32gg-stk3700/README.txt b/boards/efm32gg-stk3700/README.txt index 8d7d6fc56e..65d688f11d 100644 --- a/boards/efm32gg-stk3700/README.txt +++ b/boards/efm32gg-stk3700/README.txt @@ -183,7 +183,7 @@ Configurations Each EFM32 Giant Gecko Starter Kit configuration is maintained in a sub- directory and can be selected as follow: - tools/configure.sh efm32gg-stk3700/ + tools/configure.sh efm32gg-stk3700: If this is a Windows native build, then configure.bat should be used instead of configure.sh: diff --git a/boards/ekk-lm3s9b96/README.txt b/boards/ekk-lm3s9b96/README.txt index 1ef16dd975..0f14eee8d2 100644 --- a/boards/ekk-lm3s9b96/README.txt +++ b/boards/ekk-lm3s9b96/README.txt @@ -190,7 +190,7 @@ Configurations Each Stellaris EKK-LM3S9b96 Evaluation Kit configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh ekk-lm3s9b96/ + tools/configure.sh ekk-lm3s9b96: Where is one of the following: diff --git a/boards/esp32-core/README.txt b/boards/esp32-core/README.txt index 9a0799229c..2683eafed8 100644 --- a/boards/esp32-core/README.txt +++ b/boards/esp32-core/README.txt @@ -577,7 +577,7 @@ Configurations Each ESP32 core configuration is maintained in sub-directories and can be selected as follow: - tools/configure.sh esp32-core/ + tools/configure.sh esp32-core: make oldconfig Before building, make sure the PATH environment variable includes the diff --git a/boards/ez80f910200kitg/README.txt b/boards/ez80f910200kitg/README.txt index 1b1be5d890..eee27469d5 100644 --- a/boards/ez80f910200kitg/README.txt +++ b/boards/ez80f910200kitg/README.txt @@ -85,7 +85,7 @@ Variations on the basic ez80f910200kitg configuration are maintained in subdirectories. To configure any specific configuration, do the following steps: - tools/configure.sh ez80f910200kitg/ + tools/configure.sh ez80f910200kitg: make Where is the specific board configuration that you diff --git a/boards/ez80f910200zco/README.txt b/boards/ez80f910200zco/README.txt index 300bdb2125..5a6360e233 100644 --- a/boards/ez80f910200zco/README.txt +++ b/boards/ez80f910200zco/README.txt @@ -89,7 +89,7 @@ Common Configuration Notes in subdirectories. To configure any specific configuration, do the following steps: - tools/configure.sh ez80f910200zco/ + tools/configure.sh ez80f910200zco: make Where is the specific board configuration that you diff --git a/boards/fire-stm32v2/README.txt b/boards/fire-stm32v2/README.txt index ad6e09d964..6bb3ca6e97 100644 --- a/boards/fire-stm32v2/README.txt +++ b/boards/fire-stm32v2/README.txt @@ -560,7 +560,7 @@ Configurations Each M3 Wildfire configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh fire-stm32v2/ + tools/configure.sh fire-stm32v2: Where is one of the following: diff --git a/boards/flipnclick-pic32mz/README.txt b/boards/flipnclick-pic32mz/README.txt index 64a128da30..0033c544b5 100644 --- a/boards/flipnclick-pic32mz/README.txt +++ b/boards/flipnclick-pic32mz/README.txt @@ -356,7 +356,7 @@ Information Common to All Configurations 1. Each PIC32MZ configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh flipnclick-pic32mz/ + tools/configure.sh flipnclick-pic32mz: Where typical options are -l to configure to build on Linux or -c to configure for Cygwin under Linux. 'tools/configure.sh -h' will show diff --git a/boards/flipnclick-sam3x/README.txt b/boards/flipnclick-sam3x/README.txt index 2d4afaf2dd..9845067780 100644 --- a/boards/flipnclick-sam3x/README.txt +++ b/boards/flipnclick-sam3x/README.txt @@ -546,7 +546,7 @@ Configurations Each Flip&Click SAM3X configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh [OPTIONS] flipnclick-sam3x/ + tools/configure.sh [OPTIONS] flipnclick-sam3x: Where typical options are -l to configure to build on Linux or -c to configure for Cygwin under Linux. 'tools/configure.sh -h' will show diff --git a/boards/freedom-k64f/README.txt b/boards/freedom-k64f/README.txt index 657b65729e..49b208191a 100644 --- a/boards/freedom-k64f/README.txt +++ b/boards/freedom-k64f/README.txt @@ -809,7 +809,7 @@ Configurations Each Freedom K64F configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh freedom-k64f/ + tools/configure.sh freedom-k64f: Where is one of the following: diff --git a/boards/freedom-k66f/README.txt b/boards/freedom-k66f/README.txt index 7135f79877..7c5cc5bb75 100644 --- a/boards/freedom-k66f/README.txt +++ b/boards/freedom-k66f/README.txt @@ -816,7 +816,7 @@ Configurations Each Freedom K66F configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh freedom-K66F/ + tools/configure.sh freedom-K66F: Where is one of the following: diff --git a/boards/freedom-kl25z/README.txt b/boards/freedom-kl25z/README.txt index 92e9c01cc0..6c2e91211c 100644 --- a/boards/freedom-kl25z/README.txt +++ b/boards/freedom-kl25z/README.txt @@ -44,7 +44,7 @@ NuttX Buildroot Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh freedom-kl25z/ + tools/configure.sh freedom-kl25z: 2. Download the latest buildroot package into @@ -274,7 +274,7 @@ Configurations Each FREEDOM-KL25Z configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh freedom-kl25z/ + tools/configure.sh freedom-kl25z: If this is a Windows native build, then configure.bat should be used instead of configure.sh: diff --git a/boards/freedom-kl26z/README.txt b/boards/freedom-kl26z/README.txt index d9bcdeec4f..409d04b83f 100644 --- a/boards/freedom-kl26z/README.txt +++ b/boards/freedom-kl26z/README.txt @@ -44,7 +44,7 @@ NuttX Buildroot Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh freedom-kl26z/ + tools/configure.sh freedom-kl26z: 2. Download the latest buildroot package into @@ -252,7 +252,7 @@ Configurations Each FREEDOM-KL26Z configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh freedom-kl26z/ + tools/configure.sh freedom-kl26z: If this is a Windows native build, then configure.bat should be used instead of configure.sh: diff --git a/boards/gapuino/README.txt b/boards/gapuino/README.txt index 1667b7aa9c..1eca85fa49 100644 --- a/boards/gapuino/README.txt +++ b/boards/gapuino/README.txt @@ -46,7 +46,7 @@ Configurations Each gapuino configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh gapuino/ + tools/configure.sh gapuino: Where is one of the following: diff --git a/boards/hymini-stm32v/README.txt b/boards/hymini-stm32v/README.txt index 97a6501b4a..22751f9585 100644 --- a/boards/hymini-stm32v/README.txt +++ b/boards/hymini-stm32v/README.txt @@ -354,7 +354,7 @@ NOTES: Each HY-MiniSTM32V configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh hymini-stm32v/ + tools/configure.sh hymini-stm32v: Where is one of the following: diff --git a/boards/imxrt1050-evk/README.txt b/boards/imxrt1050-evk/README.txt index 4217f01554..0d4fbec889 100644 --- a/boards/imxrt1050-evk/README.txt +++ b/boards/imxrt1050-evk/README.txt @@ -116,7 +116,7 @@ Configurations Each i.MX RT 10050 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh [OPTIONS] imxrt1050-evk/ + tools/configure.sh [OPTIONS] imxrt1050-evk: Where typical options are -l to configure to build on Linux or -c to configure for Cygwin under Linux. 'tools/configure.sh -h' will show diff --git a/boards/imxrt1060-evk/README.txt b/boards/imxrt1060-evk/README.txt index 6b7eb7bb3c..d0651c12f0 100644 --- a/boards/imxrt1060-evk/README.txt +++ b/boards/imxrt1060-evk/README.txt @@ -134,7 +134,7 @@ Configurations Each i.MX RT 1060 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh [OPTIONS] imxrt1060-evk/ + tools/configure.sh [OPTIONS] imxrt1060-evk: Where typical options are -l to configure to build on Linux or -c to configure for Cygwin under Linux. 'tools/configure.sh -h' will show diff --git a/boards/kwikstik-k40/README.txt b/boards/kwikstik-k40/README.txt index 28f313ad1e..da97e7bb5f 100644 --- a/boards/kwikstik-k40/README.txt +++ b/boards/kwikstik-k40/README.txt @@ -306,7 +306,7 @@ Configurations Each KwikStik-K40 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh kwikstik-k40/ + tools/configure.sh kwikstik-k40: Where is one of the following: diff --git a/boards/launchxl-tms57004/README.txt b/boards/launchxl-tms57004/README.txt index 63e9f42746..79fdf2970f 100644 --- a/boards/launchxl-tms57004/README.txt +++ b/boards/launchxl-tms57004/README.txt @@ -172,7 +172,7 @@ Configurations Each LaunchXL-TMS50704 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh launchxl-tms57004/ + tools/configure.sh launchxl-tms57004: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/lc823450-xgevk/README.txt b/boards/lc823450-xgevk/README.txt index 27b8839d41..c78ec15364 100644 --- a/boards/lc823450-xgevk/README.txt +++ b/boards/lc823450-xgevk/README.txt @@ -163,7 +163,7 @@ nsh> wdog IPL2 is the 2nd boot loader based on NuttX and can be built as follows. $ make distclean - $ ./tools/configure.sh lc823450-xgevk/ipl2 + $ ./tools/configure.sh lc823450-xgevk:ipl2 $ make V=1 $ MakeIPL2 ./nuttx.bin 0 2 0 0 0 $ cp LC8234xx_17S_start_data.boot_bin /tmp/ @@ -172,7 +172,7 @@ To write the IPL2 (LC8234xx_17S_start_data.boot_bin), firstly build USB configuration image. $ make distclean - $ ./tools/configure.sh lc823450-xgevk/usb + $ ./tools/configure.sh lc823450-xgevk:usb $ make V=1 Load the nuttx.bin with openocd + gdb diff --git a/boards/lincoln60/README.txt b/boards/lincoln60/README.txt index d008450ec8..f69fe0049f 100644 --- a/boards/lincoln60/README.txt +++ b/boards/lincoln60/README.txt @@ -272,7 +272,7 @@ Configurations Each Lincoln 60 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh lincoln60/ + tools/configure.sh lincoln60: Where is one of the following: diff --git a/boards/lm3s6432-s2e/README.txt b/boards/lm3s6432-s2e/README.txt index 81dc598cc1..d69414fa90 100644 --- a/boards/lm3s6432-s2e/README.txt +++ b/boards/lm3s6432-s2e/README.txt @@ -195,7 +195,7 @@ Configurations Each Stellaris MDL-S2E Reference Design configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh lm3s6432-s2e/ + tools/configure.sh lm3s6432-s2e: Where is one of the following: diff --git a/boards/lm3s6965-ek/README.txt b/boards/lm3s6965-ek/README.txt index ef648e972d..6a96746a17 100644 --- a/boards/lm3s6965-ek/README.txt +++ b/boards/lm3s6965-ek/README.txt @@ -333,7 +333,7 @@ Configurations Each Stellaris LM3S6965 Evaluation Kit configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh lm3s6965-ek/ + tools/configure.sh lm3s6965-ek: Where is one of the following: diff --git a/boards/lm3s8962-ek/README.txt b/boards/lm3s8962-ek/README.txt index 0e14387f8f..a0a29d040f 100644 --- a/boards/lm3s8962-ek/README.txt +++ b/boards/lm3s8962-ek/README.txt @@ -253,7 +253,7 @@ Configurations Each Stellaris LM3S8962 Evaluation Kit configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh lm3s8962-ek/ + tools/configure.sh lm3s8962-ek: Where is one of the following: diff --git a/boards/lm4f120-launchpad/README.txt b/boards/lm4f120-launchpad/README.txt index 323639c731..1e8e6a5165 100644 --- a/boards/lm4f120-launchpad/README.txt +++ b/boards/lm4f120-launchpad/README.txt @@ -462,7 +462,7 @@ Configurations Each LM4F120 LaunchPad configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh lm4f120-launchpad/ + tools/configure.sh lm4f120-launchpad: Where is one of the following: diff --git a/boards/lpc4330-xplorer/README.txt b/boards/lpc4330-xplorer/README.txt index 509e6f999d..2625307d3d 100644 --- a/boards/lpc4330-xplorer/README.txt +++ b/boards/lpc4330-xplorer/README.txt @@ -591,7 +591,7 @@ Configurations Each LPC4330-Xplorer configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh lpc4330-xplorer/ + tools/configure.sh lpc4330-xplorer: Where is one of the following: diff --git a/boards/lpc4337-ws/README.txt b/boards/lpc4337-ws/README.txt index 82a53d6839..fa6e4bd1a1 100644 --- a/boards/lpc4337-ws/README.txt +++ b/boards/lpc4337-ws/README.txt @@ -630,7 +630,7 @@ Configurations Each LPC4337-ws configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh LPC4337-ws/ + tools/configure.sh LPC4337-ws: Where is one of the following: diff --git a/boards/lpc4357-evb/README.txt b/boards/lpc4357-evb/README.txt index 5c046f357b..f5c8b05ddd 100644 --- a/boards/lpc4357-evb/README.txt +++ b/boards/lpc4357-evb/README.txt @@ -627,7 +627,7 @@ Configurations Each LPC4357-EVB configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh lpc4357-evb/ + tools/configure.sh lpc4357-evb: Where is one of the following: diff --git a/boards/lpc4370-link2/README.txt b/boards/lpc4370-link2/README.txt index fdcf89ac0a..35a837c4ef 100644 --- a/boards/lpc4370-link2/README.txt +++ b/boards/lpc4370-link2/README.txt @@ -630,7 +630,7 @@ Configurations Each LPC4370-Link2 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh LPC4370-Link2/ + tools/configure.sh LPC4370-Link2: Where is one of the following: diff --git a/boards/lpcxpresso-lpc1768/README.txt b/boards/lpcxpresso-lpc1768/README.txt index c43a5b3eda..b641854219 100644 --- a/boards/lpcxpresso-lpc1768/README.txt +++ b/boards/lpcxpresso-lpc1768/README.txt @@ -557,7 +557,7 @@ Configurations Each LPCXpresso configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh lpcxpresso-lpc1768/ + tools/configure.sh lpcxpresso-lpc1768: Where is one of the following: diff --git a/boards/lpcxpresso-lpc54628/README.txt b/boards/lpcxpresso-lpc54628/README.txt index 08ef714b0a..1f0eb5fec7 100644 --- a/boards/lpcxpresso-lpc54628/README.txt +++ b/boards/lpcxpresso-lpc54628/README.txt @@ -135,7 +135,7 @@ Configurations Each LPCXpresso-LPC54628 configuration is maintained in a sub-directory and can be selected as follow: - .tools/configure.sh [OPTIONS] lpcxpresso-lpc54628/ + .tools/configure.sh [OPTIONS] lpcxpresso-lpc54628: See '.tools/configure.sh -h' for a list of all options. The most typical are -l to select the Linux host or -c to select the Windows Cygwin host. diff --git a/boards/makerlisp/README.txt b/boards/makerlisp/README.txt index b983985673..eaaf74d3d1 100644 --- a/boards/makerlisp/README.txt +++ b/boards/makerlisp/README.txt @@ -218,7 +218,7 @@ Common Configuration Notes in subdirectories. To configure any specific configuration, do the following steps: - tools/configure.sh [OPTIONS] makerlisp/ + tools/configure.sh [OPTIONS] makerlisp: make Where is the specific board configuration that you diff --git a/boards/maple/README.txt b/boards/maple/README.txt index 6e3fe9f7ec..5e7ce3052c 100644 --- a/boards/maple/README.txt +++ b/boards/maple/README.txt @@ -108,7 +108,7 @@ Configurations Each Maple configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh maple/ + tools/configure.sh maple: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/mbed/README.txt b/boards/mbed/README.txt index 27f16dceea..8bec411b47 100644 --- a/boards/mbed/README.txt +++ b/boards/mbed/README.txt @@ -245,7 +245,7 @@ Configurations Each mbed configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh mbed/ + tools/configure.sh mbed: Where is one of the mbed subdirectories described in the following paragraph. diff --git a/boards/mcb1700/README.txt b/boards/mcb1700/README.txt index 1685fabdd3..57166a6b04 100644 --- a/boards/mcb1700/README.txt +++ b/boards/mcb1700/README.txt @@ -246,7 +246,7 @@ Configurations Each mcb1700 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh mcb1700/ + tools/configure.sh mcb1700: Where is one of the mcb1700 subdirectories described in the following paragraph. diff --git a/boards/mcu123-lpc214x/README.txt b/boards/mcu123-lpc214x/README.txt index 7461fb66e4..e5cf9dedf5 100644 --- a/boards/mcu123-lpc214x/README.txt +++ b/boards/mcu123-lpc214x/README.txt @@ -89,7 +89,7 @@ NuttX buildroot Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh eagle100/ + tools/configure.sh eagle100: 2. Download the latest buildroot package into @@ -308,7 +308,7 @@ Configurations 1. Each NXP LPC214x configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh mcu123-lpc214x/ + tools/configure.sh mcu123-lpc214x: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/metro-m4/README.txt b/boards/metro-m4/README.txt index 16918cd95b..74e0444e3a 100644 --- a/boards/metro-m4/README.txt +++ b/boards/metro-m4/README.txt @@ -277,7 +277,7 @@ Configurations Each Adafruit Metro M4 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh [OPTIONS] metro-m4/ + tools/configure.sh [OPTIONS] metro-m4: Do 'tools/configure.sh -h' for the list of options. If you are building under Windows with Cygwin, you would need the -c option, for example. diff --git a/boards/micropendous3/README.txt b/boards/micropendous3/README.txt index 26cbbd616c..a3de52a06e 100644 --- a/boards/micropendous3/README.txt +++ b/boards/micropendous3/README.txt @@ -287,7 +287,7 @@ NuttX buildroot Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh micropendous3/ + tools/configure.sh micropendous3: NOTE: you also must copy avr-libc header files into the NuttX include directory with command perhaps like: @@ -501,7 +501,7 @@ Common Configuration Notes 1. Each Micropendous3 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh micropendous3/ + tools/configure.sh micropendous3: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/mikroe-stm32f4/README.txt b/boards/mikroe-stm32f4/README.txt index 1f29a76188..98e6026d57 100644 --- a/boards/mikroe-stm32f4/README.txt +++ b/boards/mikroe-stm32f4/README.txt @@ -466,7 +466,7 @@ Configurations Each Mikroe-STM32F4 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh mikroe-stm32f4/ + tools/configure.sh mikroe-stm32f4: If this is a Windows native build, then configure.bat should be used instead of configure.sh: diff --git a/boards/mirtoo/README.txt b/boards/mirtoo/README.txt index 97ca5b9574..c2fc4db601 100644 --- a/boards/mirtoo/README.txt +++ b/boards/mirtoo/README.txt @@ -831,7 +831,7 @@ Configurations Each PIC32MX configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh mirtoo/ + tools/configure.sh mirtoo: Where is one of the following: diff --git a/boards/misoc/README.txt b/boards/misoc/README.txt index c1d0848457..cec3e9bd4c 100644 --- a/boards/misoc/README.txt +++ b/boards/misoc/README.txt @@ -20,7 +20,7 @@ Buildroot Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh misoc/ + tools/configure.sh misoc: make oldconfig context 2. Clone the latest buildroot package into /buildroot diff --git a/boards/moteino-mega/README.txt b/boards/moteino-mega/README.txt index 2a6888ddd0..c4eee8758b 100644 --- a/boards/moteino-mega/README.txt +++ b/boards/moteino-mega/README.txt @@ -241,7 +241,7 @@ Common Configuration Notes 1. Each MoteinoMEGA configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh moteino-mega/ + tools/configure.sh moteino-mega: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/ne64badge/README.txt b/boards/ne64badge/README.txt index 7b2f45ff5e..567f1a197c 100644 --- a/boards/ne64badge/README.txt +++ b/boards/ne64badge/README.txt @@ -228,7 +228,7 @@ NuttX Buildroot Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh ne64badge/ + tools/configure.sh ne64badge: 2. Download the latest buildroot package into @@ -463,7 +463,7 @@ Common Configuration Notes 1. Each Freescale HCS12 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh ne64badge/ + tools/configure.sh ne64badge: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/nr5m100-nexys4/README.txt b/boards/nr5m100-nexys4/README.txt index b88fa15618..4b8d68711b 100644 --- a/boards/nr5m100-nexys4/README.txt +++ b/boards/nr5m100-nexys4/README.txt @@ -232,7 +232,7 @@ Configurations Each nr5m100-nexys4 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh nr5m100-nexys4/ + tools/configure.sh nr5m100-nexys4: Where is one of the following: diff --git a/boards/nrf52-generic/README.txt b/boards/nrf52-generic/README.txt index 22ae73e45d..504facebe7 100644 --- a/boards/nrf52-generic/README.txt +++ b/boards/nrf52-generic/README.txt @@ -94,7 +94,7 @@ Configurations Each configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh nrf52-generic/ + tools/configure.sh nrf52-generic: Where is one of the following: diff --git a/boards/ntosd-dm320/README.txt b/boards/ntosd-dm320/README.txt index 359171919b..bba18e028a 100644 --- a/boards/ntosd-dm320/README.txt +++ b/boards/ntosd-dm320/README.txt @@ -166,7 +166,7 @@ NuttX buildroot Toolchain 1. You must have already configured Nuttx in nuttx. - tools/configure.sh ntosd-dm320/ + tools/configure.sh ntosd-dm320: 2. Download the latest buildroot package into @@ -271,7 +271,7 @@ Common Configuration Notes 1. Each Neuros OSD configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh ntosd-dm320/ + tools/configure.sh ntosd-dm320: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/ntosd-dm320/doc/README.txt b/boards/ntosd-dm320/doc/README.txt index 3f8f4fa517..c85854103d 100644 --- a/boards/ntosd-dm320/doc/README.txt +++ b/boards/ntosd-dm320/doc/README.txt @@ -38,7 +38,7 @@ General instructions. 4. Configure NuttX: cd /nuttx/tools - ./configure.sh ntosd-dm320 + ./configure.sh ntosd-dm320:nsh 5. Build the toolchain: diff --git a/boards/nucleo-144/README.txt b/boards/nucleo-144/README.txt index ee29095997..09ea7fe912 100644 --- a/boards/nucleo-144/README.txt +++ b/boards/nucleo-144/README.txt @@ -207,7 +207,7 @@ Basic configuration & build steps different from the default in your PATH variable). - Configures nuttx creating .config file in the nuttx directory. - $ tools/configure.sh nucleo-f746zg/nsh + $ tools/configure.sh nucleo-f746zg:nsh - Refreshes the .config file with the latest available configurations. $ make oldconfig - Select the features you want in the build. @@ -514,7 +514,7 @@ f7xx-nsh: b. If this is the initial configuration then execute - ./tools/configure.sh nucleo-144/nsh + ./tools/configure.sh nucleo-144:nsh in nuttx/ in order to start configuration process. Caution: Doing this step more than once will overwrite .config with @@ -579,7 +579,7 @@ f7xx-evalos: b. If this is the initial configuration then execute - ./tools/configure.sh nucleo-144/evalos + ./tools/configure.sh nucleo-144:evalos in nuttx/ in order to start configuration process. Caution: Doing this step more than once will overwrite .config with diff --git a/boards/nucleo-f072rb/README.txt b/boards/nucleo-f072rb/README.txt index 75e5caca23..8d2bc9a174 100644 --- a/boards/nucleo-f072rb/README.txt +++ b/boards/nucleo-f072rb/README.txt @@ -209,7 +209,7 @@ Configurations Each configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh nucleo-f072rb/ + tools/configure.sh nucleo-f072rb: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/nucleo-f091rc/README.txt b/boards/nucleo-f091rc/README.txt index ad3c68ed89..2c86521aad 100644 --- a/boards/nucleo-f091rc/README.txt +++ b/boards/nucleo-f091rc/README.txt @@ -195,7 +195,7 @@ Configurations Each configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh nucleo-f091rc/ + tools/configure.sh nucleo-f091rc: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/nucleo-f446re/README.txt b/boards/nucleo-f446re/README.txt index 508db2f112..555f68a188 100644 --- a/boards/nucleo-f446re/README.txt +++ b/boards/nucleo-f446re/README.txt @@ -237,7 +237,7 @@ NuttX EABI "buildroot" Toolchain 1. You must have already configured Nuttx in /nuttx. - $ tools/configure.sh nucleo-f446re/nsh + $ tools/configure.sh nucleo-f446re:nsh $ make qconfig $ V=1 make context all 2>&1 | tee mout @@ -280,7 +280,7 @@ NXFLAT Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh lpcxpresso-lpc1768/ + tools/configure.sh lpcxpresso-lpc1768: 2. Download the latest buildroot package into diff --git a/boards/nucleo-f4x1re/README.txt b/boards/nucleo-f4x1re/README.txt index 6993616d42..b3fd01f945 100644 --- a/boards/nucleo-f4x1re/README.txt +++ b/boards/nucleo-f4x1re/README.txt @@ -260,7 +260,7 @@ NuttX EABI "buildroot" Toolchain 1. You must have already configured Nuttx in /nuttx. - $ tools/configure.sh nucleo-f4x1re/f401-nsh + $ tools/configure.sh nucleo-f4x1re:f401-nsh $ make qconfig $ V=1 make context all 2>&1 | tee mout @@ -305,7 +305,7 @@ NXFLAT Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh lpcxpresso-lpc1768/ + tools/configure.sh lpcxpresso-lpc1768: 2. Download the latest buildroot package into diff --git a/boards/nucleo-h743zi/README.txt b/boards/nucleo-h743zi/README.txt index 18681a9212..c15c37604b 100644 --- a/boards/nucleo-h743zi/README.txt +++ b/boards/nucleo-h743zi/README.txt @@ -105,7 +105,7 @@ Configurations Each Nucleo-H743ZI configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh [options] viewtool-stm32f107/ + tools/configure.sh [options] viewtool-stm32f107: Where options should specify the host build platform (-l for Linux, -c for Cygwin under Windows, etc.). Try 'tools/configure.sh -h' for the complete diff --git a/boards/nucleo-l432kc/README.txt b/boards/nucleo-l432kc/README.txt index 94a202e241..40b273701a 100644 --- a/boards/nucleo-l432kc/README.txt +++ b/boards/nucleo-l432kc/README.txt @@ -230,7 +230,7 @@ NuttX EABI "buildroot" Toolchain 1. You must have already configured Nuttx in /nuttx. - $ tools/configure.sh nucleo-l432kc/nsh + $ tools/configure.sh nucleo-l432kc:nsh $ make qconfig $ V=1 make context all 2>&1 | tee mout @@ -273,7 +273,7 @@ NXFLAT Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh lpcxpresso-lpc1768/ + tools/configure.sh lpcxpresso-lpc1768: 2. Download the latest buildroot package into diff --git a/boards/nucleo-l452re/README.txt b/boards/nucleo-l452re/README.txt index 8ac1c7ac48..58b3612924 100644 --- a/boards/nucleo-l452re/README.txt +++ b/boards/nucleo-l452re/README.txt @@ -201,7 +201,7 @@ Configurations Each configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh nucleo-l452re/ + tools/configure.sh nucleo-l452re: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/nucleo-l476rg/README.txt b/boards/nucleo-l476rg/README.txt index a4310dc11d..77e313d118 100644 --- a/boards/nucleo-l476rg/README.txt +++ b/boards/nucleo-l476rg/README.txt @@ -243,7 +243,7 @@ NuttX EABI "buildroot" Toolchain 1. You must have already configured Nuttx in /nuttx. - $ tools/configure.sh nucleo-l476rg/nsh + $ tools/configure.sh nucleo-l476rg:nsh $ make qconfig $ V=1 make context all 2>&1 | tee mout @@ -286,7 +286,7 @@ NXFLAT Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh lpcxpresso-lpc1768/ + tools/configure.sh lpcxpresso-lpc1768: 2. Download the latest buildroot package into diff --git a/boards/nucleo-l496zg/README.txt b/boards/nucleo-l496zg/README.txt index 48b355c256..3215b38180 100644 --- a/boards/nucleo-l496zg/README.txt +++ b/boards/nucleo-l496zg/README.txt @@ -318,7 +318,7 @@ nsh: b. If this is the initial configuration then execute - ./tools/configure.sh nucleo-l496zg/nsh + ./tools/configure.sh nucleo-l496zg:nsh in nuttx/ in order to start configuration process. Caution: Doing this step more than once will overwrite .config with diff --git a/boards/nutiny-nuc120/README.txt b/boards/nutiny-nuc120/README.txt index 7c8ffd130a..6732e511dc 100644 --- a/boards/nutiny-nuc120/README.txt +++ b/boards/nutiny-nuc120/README.txt @@ -45,7 +45,7 @@ NuttX Buildroot Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh nutiny-nuc120/ + tools/configure.sh nutiny-nuc120: 2. Download the latest buildroot package into @@ -260,7 +260,7 @@ Configurations Each NuTiny-SDK-NUC120 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh nutiny-nuc120/ + tools/configure.sh nutiny-nuc120: Where is one of the following: diff --git a/boards/olimex-efm32g880f128-stk/README.txt b/boards/olimex-efm32g880f128-stk/README.txt index b861b2459f..acd485535b 100644 --- a/boards/olimex-efm32g880f128-stk/README.txt +++ b/boards/olimex-efm32g880f128-stk/README.txt @@ -134,7 +134,7 @@ Configurations Each EFM32G880F128-STK configuration is maintained in a sub-director and can be selected as follow: - tools/configure.sh olimex-efm32g880f128-stk/ + tools/configure.sh olimex-efm32g880f128-stk: Where is one of the following: diff --git a/boards/olimex-lpc-h3131/README.txt b/boards/olimex-lpc-h3131/README.txt index b28e5242bc..c725df5f23 100644 --- a/boards/olimex-lpc-h3131/README.txt +++ b/boards/olimex-lpc-h3131/README.txt @@ -152,7 +152,7 @@ NuttX buildroot Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh olimex-lpc-h3131/ + tools/configure.sh olimex-lpc-h3131: 2. Download the latest buildroot package into @@ -253,7 +253,7 @@ Image Format Then, to build the NuttX binary ready to load with the bootloader, just following these steps: - - tools/configure.sh olimex-lpc-h3131/ostest # (using the ostest configuration for this example) + - tools/configure.sh olimex-lpc-h3131:ostest # (using the ostest configuration for this example) - cd .. # Set up environment - make # Make NuttX. This will produce nuttx.bin - mklpc.sh # Make the bootloader binary (nuttx.lpc) @@ -488,7 +488,7 @@ Configurations Each LPC-H3131 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh olimex-lpc-h3131/ + tools/configure.sh olimex-lpc-h3131: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/olimex-lpc1766stk/README.txt b/boards/olimex-lpc1766stk/README.txt index ddc5f8fd68..96acf30aff 100644 --- a/boards/olimex-lpc1766stk/README.txt +++ b/boards/olimex-lpc1766stk/README.txt @@ -682,7 +682,7 @@ Common Configuration Notes 1. Each Olimex LPC1766-STK configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh olimex-lpc1766stk/ + tools/configure.sh olimex-lpc1766stk: Where is one of the sub-directories identified in the following paragraphs. diff --git a/boards/olimex-stm32-e407/README.txt b/boards/olimex-stm32-e407/README.txt index 5461a3bc19..1ccf0d7136 100644 --- a/boards/olimex-stm32-e407/README.txt +++ b/boards/olimex-stm32-e407/README.txt @@ -11,7 +11,7 @@ Configurations Each Olimex-STM32-E407 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh [OPTIONS] olimex-stm32-e407/ + tools/configure.sh [OPTIONS] olimex-stm32-e407: Typical options include -l for a Linux host platform or -c for Cygwin host platform. See 'tools/configure.sh -h' for other options. And diff --git a/boards/olimex-stm32-p407/README.txt b/boards/olimex-stm32-p407/README.txt index b179f37e06..0bf8465173 100644 --- a/boards/olimex-stm32-p407/README.txt +++ b/boards/olimex-stm32-p407/README.txt @@ -327,7 +327,7 @@ Information Common to All Configurations Each Olimex STM32-P407 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh olimex-stm32-p407/ + tools/configure.sh olimex-stm32-p407: Where is one of the configuration sub-directories listed in the following section. diff --git a/boards/olimex-strp711/README.txt b/boards/olimex-strp711/README.txt index 6cfa9dabc7..78ed58cf37 100644 --- a/boards/olimex-strp711/README.txt +++ b/boards/olimex-strp711/README.txt @@ -173,7 +173,7 @@ NuttX buildroot Toolchain 1. You must have already configured Nuttx in nuttx. - tools/configure.sh olimex-strp711/ + tools/configure.sh olimex-strp711: 2. Download the latest buildroot package into @@ -370,7 +370,7 @@ Common Configuration Notes: 1. Each Olimex STRP711 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh olimex-strp711/ + tools/configure.sh olimex-strp711: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/pcduino-a10/README.txt b/boards/pcduino-a10/README.txt index 6f1d226f7a..160a872cbc 100644 --- a/boards/pcduino-a10/README.txt +++ b/boards/pcduino-a10/README.txt @@ -326,7 +326,7 @@ Configurations Each pcDuino configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh [OPTIONS] pcduino-a10/ + tools/configure.sh [OPTIONS] pcduino-a10: Where [OPTIONS] include -l to configure for a Linux host platform and -c means to configure for a Windows Cygwin host platform. -h will give diff --git a/boards/photon/README.txt b/boards/photon/README.txt index 4d10743c74..312440ccf5 100644 --- a/boards/photon/README.txt +++ b/boards/photon/README.txt @@ -32,7 +32,7 @@ Selecting the Photon board on NuttX 2) Enter inside nuttx/tools and configure to use the Photon board: $ cd nuttx - $ tools/configure.sh photon/wlan + $ tools/configure.sh photon:wlan Configuring NuttX to use your Wireless Router (aka Access Point) ================================================================ diff --git a/boards/pic32mx-starterkit/README.txt b/boards/pic32mx-starterkit/README.txt index 09e01a17e1..802e091ebb 100644 --- a/boards/pic32mx-starterkit/README.txt +++ b/boards/pic32mx-starterkit/README.txt @@ -1003,7 +1003,7 @@ Configurations Each PIC32MX configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh pic32mx-starterkit/ + tools/configure.sh pic32mx-starterkit: Where is one of the following: diff --git a/boards/pic32mx7mmb/README.txt b/boards/pic32mx7mmb/README.txt index 125cfa9f5a..e420bb6f8e 100644 --- a/boards/pic32mx7mmb/README.txt +++ b/boards/pic32mx7mmb/README.txt @@ -585,7 +585,7 @@ Configurations Each PIC32MX configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh pic32mx7mmb/ + tools/configure.sh pic32mx7mmb: Where is one of the following: diff --git a/boards/pic32mz-starterkit/README.txt b/boards/pic32mz-starterkit/README.txt index e2c7e65a32..e68110e3c9 100644 --- a/boards/pic32mz-starterkit/README.txt +++ b/boards/pic32mz-starterkit/README.txt @@ -363,7 +363,7 @@ Information Common to All Configurations Each PIC32MZ configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh [OPTIONS] pic32mz-starterkit/ + tools/configure.sh [OPTIONS] pic32mz-starterkit: Where typical options are -l to configure to build on Linux or -c to configure for Cygwin under Linux. 'tools/configure.sh -h' will show diff --git a/boards/pnev5180b/README.txt b/boards/pnev5180b/README.txt index 8a71ebaa6e..f40367e571 100644 --- a/boards/pnev5180b/README.txt +++ b/boards/pnev5180b/README.txt @@ -79,7 +79,7 @@ Each PNEV5180B configuration is maintained in a sub-directory and can be selected as follow: cd tools - ./configure.sh pnev5180b/ + ./configure.sh pnev5180b: cd - Where is one of the following: diff --git a/boards/qemu-i486/README.txt b/boards/qemu-i486/README.txt index 43fc507cb6..8c203276ce 100644 --- a/boards/qemu-i486/README.txt +++ b/boards/qemu-i486/README.txt @@ -118,7 +118,7 @@ Buildroot Instructions 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh qemu-i486/ + tools/configure.sh qemu-i486: 2. Download the latest buildroot package into @@ -160,7 +160,7 @@ Common Configuration Notes 1. Each Qemu-i486 Web Server configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh qemu-i486/ + tools/configure.sh qemu-i486: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/sabre-6quad/README.txt b/boards/sabre-6quad/README.txt index 192593f3a7..ccf047af55 100644 --- a/boards/sabre-6quad/README.txt +++ b/boards/sabre-6quad/README.txt @@ -674,7 +674,7 @@ Information Common to All Configurations Each Sabre-6Quad configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh sabre-6quad/ + tools/configure.sh sabre-6quad: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/sam3u-ek/README.txt b/boards/sam3u-ek/README.txt index 31ac2d1724..359fe00451 100644 --- a/boards/sam3u-ek/README.txt +++ b/boards/sam3u-ek/README.txt @@ -205,7 +205,7 @@ Configurations Each SAM3U-EK configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh sam3u-ek/ + tools/configure.sh sam3u-ek: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/sam4e-ek/README.txt b/boards/sam4e-ek/README.txt index 342c6ab281..c78b42fef2 100644 --- a/boards/sam4e-ek/README.txt +++ b/boards/sam4e-ek/README.txt @@ -1025,7 +1025,7 @@ Configurations Each SAM4E-EK configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh sam4e-ek/ + tools/configure.sh sam4e-ek: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/sam4l-xplained/README.txt b/boards/sam4l-xplained/README.txt index e34461d230..e4d75b675e 100644 --- a/boards/sam4l-xplained/README.txt +++ b/boards/sam4l-xplained/README.txt @@ -382,7 +382,7 @@ Configurations Each SAM4L Xplained Pro configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh sam4l-xplained/ + tools/configure.sh sam4l-xplained: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/sam4s-xplained-pro/README.txt b/boards/sam4s-xplained-pro/README.txt index 939d0e6942..192cf157de 100644 --- a/boards/sam4s-xplained-pro/README.txt +++ b/boards/sam4s-xplained-pro/README.txt @@ -273,7 +273,7 @@ Configurations Each SAM4S Xplained configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.shsam4s-xplained-pro/ + tools/configure.shsam4s-xplained-pro: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/sam4s-xplained/README.txt b/boards/sam4s-xplained/README.txt index 38788c476b..347c8d5fa1 100644 --- a/boards/sam4s-xplained/README.txt +++ b/boards/sam4s-xplained/README.txt @@ -268,7 +268,7 @@ Configurations Each SAM4S Xplained configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.shsam4s-xplained/ + tools/configure.shsam4s-xplained: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/sama5d2-xult/README.txt b/boards/sama5d2-xult/README.txt index 883941c62f..d37be580bc 100644 --- a/boards/sama5d2-xult/README.txt +++ b/boards/sama5d2-xult/README.txt @@ -720,7 +720,7 @@ Configurations Each SAMA5D2-XULT configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh sama5d2-xult/ + tools/configure.sh sama5d2-xult: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/sama5d3-xplained/README.txt b/boards/sama5d3-xplained/README.txt index 2614a6cbe5..f439b7e15c 100644 --- a/boards/sama5d3-xplained/README.txt +++ b/boards/sama5d3-xplained/README.txt @@ -189,7 +189,7 @@ NuttX EABI "buildroot" Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh sama5d3-xplained/ + tools/configure.sh sama5d3-xplained: 2. Download the latest buildroot package into @@ -239,7 +239,7 @@ NXFLAT Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh sama5d3-xplained/ + tools/configure.sh sama5d3-xplained: 2. Download the latest buildroot package into @@ -2967,7 +2967,7 @@ Configurations Each SAMA5D3-Xplained configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh sama5d3-xplained/ + tools/configure.sh sama5d3-xplained: Before building, make sure that the PATH environment variable include the correct path to the directory than holds your toolchain binaries. diff --git a/boards/sama5d3x-ek/README.txt b/boards/sama5d3x-ek/README.txt index 94a7c70cbe..4c99e91c7d 100644 --- a/boards/sama5d3x-ek/README.txt +++ b/boards/sama5d3x-ek/README.txt @@ -211,7 +211,7 @@ NuttX EABI "buildroot" Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh sama5d3x-ek/ + tools/configure.sh sama5d3x-ek: 2. Download the latest buildroot package into @@ -261,7 +261,7 @@ NXFLAT Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh sama5d3x-ek/ + tools/configure.sh sama5d3x-ek: 2. Download the latest buildroot package into @@ -367,7 +367,7 @@ Creating and Using NORBOOT the norboot configuration and setup the PATH variable in order to do the build: - tools/configure.sh sama5d3x-ek/ + tools/configure.sh sama5d3x-ek: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. @@ -3290,7 +3290,7 @@ Configurations Each SAMA5D3x-EK configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh sama5d3x-ek/ + tools/configure.sh sama5d3x-ek: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/sama5d4-ek/README.txt b/boards/sama5d4-ek/README.txt index a306eddfc3..a895480fef 100644 --- a/boards/sama5d4-ek/README.txt +++ b/boards/sama5d4-ek/README.txt @@ -205,7 +205,7 @@ NuttX EABI "buildroot" Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh sama5d4-ek/ + tools/configure.sh sama5d4-ek: 2. Download the latest buildroot package into @@ -255,7 +255,7 @@ NXFLAT Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh sama5d4-ek/ + tools/configure.sh sama5d4-ek: 2. Download the latest buildroot package into @@ -354,7 +354,7 @@ Creating and Using DRAMBOOT the dramboot configuration and setup the PATH variable in order to do the build: - tools/configure.sh sama5d4-ek/dramboot + tools/configure.sh sama5d4-ek:dramboot Before building, make sure that the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. @@ -457,7 +457,7 @@ Creating and Using AT25BOOT the AT25BOOT configuration and setup the PATH variable in order to do the build: - tools/configure.sh sama5d4-ek/at25boot + tools/configure.sh sama5d4-ek:at25boot Before building, make sure that the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. @@ -3569,7 +3569,7 @@ Configurations Each SAMA4D4-EK configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh sama5d4-ek/ + tools/configure.sh sama5d4-ek: Before building, make sure that the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. @@ -4158,7 +4158,7 @@ Configurations the board $ cd nuttx : Go to the NuttX build directory - $ tools/configure.sh sama5d4-ek/knsh : Establish this configuration + $ tools/configure.sh sama5d4-ek:knsh : Establish this configuration $ export PATH=???:$PATH : Set up the PATH variable $ make : Build the kerne with a dummy ROMFS image : This should create the nuttx ELF @@ -4192,7 +4192,7 @@ Configurations Enable the ROMFS file system and board-specific "ROMFS boot mount" support to auto-mount the ROMFS file system on bootup. - $ tools/configure.sh sama5d4-ek/knsh : Establish this configuration + $ tools/configure.sh sama5d4-ek:knsh : Establish this configuration $ export PATH=???:$PATH : Set up the PATH variable $ touch boards/sama5d4-ek/include/boot_romfsimg.h $ make : Build the kernel with a dummy ROMFS image diff --git a/boards/samd20-xplained/README.txt b/boards/samd20-xplained/README.txt index f8e36c7c9f..5934d4776d 100644 --- a/boards/samd20-xplained/README.txt +++ b/boards/samd20-xplained/README.txt @@ -366,7 +366,7 @@ NuttX EABI "buildroot" Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh samd20-xplained/ + tools/configure.sh samd20-xplained: 2. Download the latest buildroot package into @@ -590,7 +590,7 @@ Configurations Each SAMD20 Xplained Pro configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh samd20-xplained/ + tools/configure.sh samd20-xplained: Before building, make sure that the PATH environment variable include the correct path to the directory than holds your toolchain binaries. diff --git a/boards/samd21-xplained/README.txt b/boards/samd21-xplained/README.txt index c69922756c..ad20fa56bc 100644 --- a/boards/samd21-xplained/README.txt +++ b/boards/samd21-xplained/README.txt @@ -456,7 +456,7 @@ Configurations Each SAMD21 Xplained Pro configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh samd21-xplained/ + tools/configure.sh samd21-xplained: Before building, make sure the PATH environment varaible include the correct path to the directory than holds your toolchain binaries. diff --git a/boards/same70-xplained/README.txt b/boards/same70-xplained/README.txt index ca03587ad6..279a9753d8 100644 --- a/boards/same70-xplained/README.txt +++ b/boards/same70-xplained/README.txt @@ -1231,7 +1231,7 @@ Information Common to All Configurations Each SAME70-XPLD configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh same70-xplained/ + tools/configure.sh same70-xplained: Before building, make sure that the PATH environment variable include the correct path to the directory than holds your toolchain binaries. diff --git a/boards/saml21-xplained/README.txt b/boards/saml21-xplained/README.txt index 0a3f1c2747..9f13e4d9a7 100644 --- a/boards/saml21-xplained/README.txt +++ b/boards/saml21-xplained/README.txt @@ -347,7 +347,7 @@ NuttX EABI "buildroot" Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh saml21-xplained/ + tools/configure.sh saml21-xplained: 2. Download the latest buildroot package into @@ -628,7 +628,7 @@ Configurations Each SAML21 Xplained Pro configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh saml21-xplained/ + tools/configure.sh saml21-xplained: Before building, make sure that the PATH environmental variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/samv71-xult/README.txt b/boards/samv71-xult/README.txt index e6baa89799..b3aa50f848 100644 --- a/boards/samv71-xult/README.txt +++ b/boards/samv71-xult/README.txt @@ -1657,7 +1657,7 @@ Information Common to All Configurations Each SAMV71-XULT configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh [OPTIONS] samv71-xult/ + tools/configure.sh [OPTIONS] samv71-xult: Where typical options are -l to configure to build on Linux or -c to configure for Cygwin under Linux. 'tools/configure.sh -h' will show diff --git a/boards/shenzhou/README.txt b/boards/shenzhou/README.txt index d6457a253a..7e70d18340 100644 --- a/boards/shenzhou/README.txt +++ b/boards/shenzhou/README.txt @@ -482,7 +482,7 @@ Configurations Each Shenzhou configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh shenzhou/ + tools/configure.sh shenzhou: Where is one of the following: diff --git a/boards/sim/README.txt b/boards/sim/README.txt index cbdfddacae..0a263bfea8 100644 --- a/boards/sim/README.txt +++ b/boards/sim/README.txt @@ -422,7 +422,7 @@ Common Configuration Information 1. Each configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh sim/ + tools/configure.sh sim: Where is one of the following sub-directories. diff --git a/boards/stm3210e-eval/README.txt b/boards/stm3210e-eval/README.txt index b97f4d3ab8..4268973ddd 100644 --- a/boards/stm3210e-eval/README.txt +++ b/boards/stm3210e-eval/README.txt @@ -498,7 +498,7 @@ Configurations Each STM3210E-EVAL configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh stm3210e-eval/ + tools/configure.sh stm3210e-eval: Where is one of the following: diff --git a/boards/stm3220g-eval/README.txt b/boards/stm3220g-eval/README.txt index b57561b8d2..301aebffe9 100644 --- a/boards/stm3220g-eval/README.txt +++ b/boards/stm3220g-eval/README.txt @@ -505,7 +505,7 @@ Configurations Each STM3220G-EVAL configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh stm3220g-eval/ + tools/configure.sh stm3220g-eval: Where is one of the following: diff --git a/boards/stm3240g-eval/README.txt b/boards/stm3240g-eval/README.txt index d0ab0a070d..07e8c1a827 100644 --- a/boards/stm3240g-eval/README.txt +++ b/boards/stm3240g-eval/README.txt @@ -639,7 +639,7 @@ Configurations Each STM3240G-EVAL configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh stm3240g-eval/ + tools/configure.sh stm3240g-eval: Where is one of the following: diff --git a/boards/stm32_tiny/README.txt b/boards/stm32_tiny/README.txt index 25d808cd10..d8a1579049 100644 --- a/boards/stm32_tiny/README.txt +++ b/boards/stm32_tiny/README.txt @@ -269,7 +269,7 @@ Configurations Each STM32Tiny configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh STM32Tiny/ + tools/configure.sh STM32Tiny: Where is one of the following: diff --git a/boards/stm32f103-minimum/README.txt b/boards/stm32f103-minimum/README.txt index efe5cd49e5..1fee775f7a 100644 --- a/boards/stm32f103-minimum/README.txt +++ b/boards/stm32f103-minimum/README.txt @@ -711,7 +711,7 @@ Configurations Each STM32F103 Minimum configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh STM32F103 Minimum/ + tools/configure.sh STM32F103 Minimum: Where is one of the following: diff --git a/boards/stm32f3discovery/README.txt b/boards/stm32f3discovery/README.txt index 89acbdb6b1..101e92bcbc 100644 --- a/boards/stm32f3discovery/README.txt +++ b/boards/stm32f3discovery/README.txt @@ -407,7 +407,7 @@ Configurations Each STM32F3Discovery configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh STM32F3Discovery/ + tools/configure.sh STM32F3Discovery: Where is one of the following: diff --git a/boards/stm32f429i-disco/README.txt b/boards/stm32f429i-disco/README.txt index 2d6ad02587..1a40829811 100644 --- a/boards/stm32f429i-disco/README.txt +++ b/boards/stm32f429i-disco/README.txt @@ -638,7 +638,7 @@ Configurations Each STM32F429I-DISCO configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh stm32f429i-disco/ + tools/configure.sh stm32f429i-disco: Where is one of the following: diff --git a/boards/stm32f4discovery/README.txt b/boards/stm32f4discovery/README.txt index 7c05910c54..5ff84a3c75 100644 --- a/boards/stm32f4discovery/README.txt +++ b/boards/stm32f4discovery/README.txt @@ -1097,7 +1097,7 @@ Enter inside NuttX and compile it: $ cd ../nuttx - $ tools/configure.sh stm32f4discovery/testlibcxx + $ tools/configure.sh stm32f4discovery:testlibcxx Copy files Refreshing... @@ -1161,7 +1161,7 @@ Common Information Each STM32F4Discovery configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh STM32F4Discovery/ + tools/configure.sh STM32F4Discovery: Where is one of the sub-directories listed in the next paragraph @@ -1269,7 +1269,7 @@ Configuration Sub-directories test is used to verify the uClibc++ port to NuttX. This configuration may be selected as follows: - tools/configure.sh sim/cxxtest + tools/configure.sh sim:cxxtest NOTES: diff --git a/boards/stm32f746g-disco/README.txt b/boards/stm32f746g-disco/README.txt index 72ca8badb7..0a3bf41f6d 100644 --- a/boards/stm32f746g-disco/README.txt +++ b/boards/stm32f746g-disco/README.txt @@ -451,7 +451,7 @@ Configurations Each STM32F746G-DISCO configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh stm32f746g-disco/ + tools/configure.sh stm32f746g-disco: Where is one of the sub-directories listed below. diff --git a/boards/stm32f746g-disco/configs/fb/README.txt b/boards/stm32f746g-disco/configs/fb/README.txt index ae58cf4deb..544f9bc259 100644 --- a/boards/stm32f746g-disco/configs/fb/README.txt +++ b/boards/stm32f746g-disco/configs/fb/README.txt @@ -6,7 +6,7 @@ STM32F746G-DISCO LTDC Framebuffer demo example Configure and build ------------------- -tools/configure.sh stm32f746g-disco/fb +tools/configure.sh stm32f746g-disco:fb make diff --git a/boards/stm32f746g-disco/configs/nxdemo/README.txt b/boards/stm32f746g-disco/configs/nxdemo/README.txt index ded83917fe..d23b0da7c7 100644 --- a/boards/stm32f746g-disco/configs/nxdemo/README.txt +++ b/boards/stm32f746g-disco/configs/nxdemo/README.txt @@ -6,7 +6,7 @@ STM32F746G-DISCO NX demo example Configure and build ------------------- -tools/configure.sh stm32f746g-disco/nxdemo +tools/configure.sh stm32f746g-disco:nxdemo make diff --git a/boards/stm32f746g-disco/configs/nxterm/README.txt b/boards/stm32f746g-disco/configs/nxterm/README.txt index 244a40d932..bb0e8dce16 100644 --- a/boards/stm32f746g-disco/configs/nxterm/README.txt +++ b/boards/stm32f746g-disco/configs/nxterm/README.txt @@ -6,7 +6,7 @@ STM32F746G-DISCO NX Terminal example Configure and build ------------------- -tools/configure.sh stm32f746g-disco/nxterm +tools/configure.sh stm32f746g-disco:nxterm make diff --git a/boards/stm32f769i-disco/README.txt b/boards/stm32f769i-disco/README.txt index 7261b007a3..23beed00b4 100644 --- a/boards/stm32f769i-disco/README.txt +++ b/boards/stm32f769i-disco/README.txt @@ -105,7 +105,7 @@ Configurations Each STM32F769I-DISCO configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh stm32f769i-disco/ + tools/configure.sh stm32f769i-disco: Where is one of the sub-directories listed below. diff --git a/boards/stm32ldiscovery/README.txt b/boards/stm32ldiscovery/README.txt index de795acbfe..0e6570254d 100644 --- a/boards/stm32ldiscovery/README.txt +++ b/boards/stm32ldiscovery/README.txt @@ -483,7 +483,7 @@ Configurations Each STM32L-Discovery configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh STM32L-Discovery/ + tools/configure.sh STM32L-Discovery: Where is one of the following sub-directories. diff --git a/boards/stm32vldiscovery/README.txt b/boards/stm32vldiscovery/README.txt index 1cabfaa74c..8f532ddb19 100644 --- a/boards/stm32vldiscovery/README.txt +++ b/boards/stm32vldiscovery/README.txt @@ -204,7 +204,7 @@ Configurations Each STMicro STM32F100RB generic configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh stm32vldiscovery/ + tools/configure.sh stm32vldiscovery: Where is one of the following: diff --git a/boards/sure-pic32mx/README.txt b/boards/sure-pic32mx/README.txt index bd16e5012b..9ebebff763 100644 --- a/boards/sure-pic32mx/README.txt +++ b/boards/sure-pic32mx/README.txt @@ -621,7 +621,7 @@ Configurations Each PIC32MX configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh sure-pic32mx/ + tools/configure.sh sure-pic32mx: Where is one of the following sub-directories. diff --git a/boards/teensy-2.0/README.txt b/boards/teensy-2.0/README.txt index 1603e6a7ab..a4967c758f 100644 --- a/boards/teensy-2.0/README.txt +++ b/boards/teensy-2.0/README.txt @@ -296,7 +296,7 @@ NuttX buildroot Toolchain 1. You must have already configured Nuttx in /nuttx. - tools/configure.sh Teensy++/ + tools/configure.sh Teensy++: NOTE: you also must copy avr-libc header files into the NuttX include directory with command perhaps like: @@ -510,7 +510,7 @@ Common Configuration Notes 1. Each Teensy++ configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh teensy-2.0/ + tools/configure.sh teensy-2.0: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/teensy-3.x/README.txt b/boards/teensy-3.x/README.txt index 8711ab325e..d70667b8c9 100644 --- a/boards/teensy-3.x/README.txt +++ b/boards/teensy-3.x/README.txt @@ -217,7 +217,7 @@ Configurations Each Teensy-3.x configurations are maintained in sub-directories and can be selected as follow: - tools/configure.sh teensy-3.x/ + tools/configure.sh teensy-3.x: make oldconfig Before building, make sure that your PATH environment variable includes diff --git a/boards/tm4c123g-launchpad/README.txt b/boards/tm4c123g-launchpad/README.txt index 8252de0167..7f31ba5b7a 100644 --- a/boards/tm4c123g-launchpad/README.txt +++ b/boards/tm4c123g-launchpad/README.txt @@ -554,7 +554,7 @@ Configurations Each TM4C123G LaunchPad configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh tm4c123g-launchpad/ + tools/configure.sh tm4c123g-launchpad: Where is one of the following: diff --git a/boards/tm4c1294-launchpad/README.txt b/boards/tm4c1294-launchpad/README.txt index c218ca19cf..a09845b89b 100644 --- a/boards/tm4c1294-launchpad/README.txt +++ b/boards/tm4c1294-launchpad/README.txt @@ -25,7 +25,7 @@ Configurations Each EK-TM4C1294XL configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh tm4c1294-launchpad/ + tools/configure.sh tm4c1294-launchpad: Where is one of the following: diff --git a/boards/tms570ls31x-usb-kit/README.txt b/boards/tms570ls31x-usb-kit/README.txt index cf919c3cc4..9600c1ffdb 100644 --- a/boards/tms570ls31x-usb-kit/README.txt +++ b/boards/tms570ls31x-usb-kit/README.txt @@ -79,7 +79,7 @@ Configurations Each TMS570LS31X Usb Kit configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh tms570ls31x-usb-kit/ + tools/configure.sh tms570ls31x-usb-kit: Before building, make sure the PATH environment variable includes the correct path to the directory than holds your toolchain binaries. diff --git a/boards/twr-k60n512/README.txt b/boards/twr-k60n512/README.txt index 5c99b7e065..39cd5834e4 100644 --- a/boards/twr-k60n512/README.txt +++ b/boards/twr-k60n512/README.txt @@ -442,7 +442,7 @@ Configurations Each TWR-K60N512 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh twr-k60n512/ + tools/configure.sh twr-k60n512: Where is one of the following: diff --git a/boards/twr-k64f120m/README.txt b/boards/twr-k64f120m/README.txt index 9658ce9aa9..f1b5a113bf 100644 --- a/boards/twr-k64f120m/README.txt +++ b/boards/twr-k64f120m/README.txt @@ -565,7 +565,7 @@ Configurations Each TWR-K64F120M configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh twr-k64f120m/ + tools/configure.sh twr-k64f120m: Where is one of the following: diff --git a/boards/ubw32/README.txt b/boards/ubw32/README.txt index 5379094935..b5679e1fbf 100644 --- a/boards/ubw32/README.txt +++ b/boards/ubw32/README.txt @@ -555,7 +555,7 @@ Configurations Each PIC32MX configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh ubw32/ + tools/configure.sh ubw32: Where is one of the following: diff --git a/boards/us7032evb1/README.txt b/boards/us7032evb1/README.txt index 3ee8243539..3a6ffc089b 100644 --- a/boards/us7032evb1/README.txt +++ b/boards/us7032evb1/README.txt @@ -23,7 +23,7 @@ Toolchain 1. You must have already configured Nuttx in nuttx. - tools/configure.sh us7032evb1/ + tools/configure.sh us7032evb1: 2. Download the latest buildroot package into @@ -60,7 +60,7 @@ Common Configuration Notes 1. Each SH-1 configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh us7032evb1/ + tools/configure.sh us7032evb1: Where is one of the configuration sub-directories described in the following paragraph. diff --git a/boards/viewtool-stm32f107/README.txt b/boards/viewtool-stm32f107/README.txt index ac8234ae68..2f38ea7e35 100644 --- a/boards/viewtool-stm32f107/README.txt +++ b/boards/viewtool-stm32f107/README.txt @@ -817,7 +817,7 @@ Configurations Each SAM3U-EK configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh viewtool-stm32f107/ + tools/configure.sh viewtool-stm32f107: Before starting the build, make sure that your PATH environment variable includes the correct path to your toolchain. diff --git a/boards/xmc4500-relax/README.txt b/boards/xmc4500-relax/README.txt index 73b46be94b..1b0357ebaf 100644 --- a/boards/xmc4500-relax/README.txt +++ b/boards/xmc4500-relax/README.txt @@ -81,7 +81,7 @@ Configurations Each XMC4500 Relax configuration is maintained in a sub-directory and can be selected as follow: - .tools/configure.sh xmc5400-relax/ + .tools/configure.sh xmc5400-relax: See '.tools/configure.sh -h' for a list of all options. The most typical are -l to select the Linux host or -c to select the Windows Cygwin host. diff --git a/boards/z16f2800100zcog/README.txt b/boards/z16f2800100zcog/README.txt index f6c59193bf..0bf04a2bf0 100644 --- a/boards/z16f2800100zcog/README.txt +++ b/boards/z16f2800100zcog/README.txt @@ -135,7 +135,7 @@ that directory is also a bash script that will apply that patch for you. The patch would be applied when NuttX is configured as follows: - tools/configure.sh z16f2800100zcog/nsh + tools/configure.sh z16f2800100zcog:nsh dopatch.sh make @@ -166,7 +166,7 @@ Variations on the basic z8f162800100zcog configuration are maintained in subdirectories. To configure any specific configuration, do the following steps: - tools/configure.sh z16f2800100zcog/ + tools/configure.sh z16f2800100zcog: make Where is the specific board configuration that you diff --git a/boards/z80sim/README.txt b/boards/z80sim/README.txt index 8fdf9caa55..78db5b0be2 100644 --- a/boards/z80sim/README.txt +++ b/boards/z80sim/README.txt @@ -26,7 +26,7 @@ Configuring NuttX 1) From a POSIX window: - tools/configure.sh [OPTIONS] z80sim/ostest + tools/configure.sh [OPTIONS] z80sim:ostest where you need to select the right [OPTIONS] for your build environment. Do: @@ -68,7 +68,7 @@ Configuring NuttX 1) From a POSIX window: - tools/configure.sh [OPTIONS] z80sim/nsh + tools/configure.sh [OPTIONS] z80sim:nsh where you need to select the right [OPTIONS] for your build environment. Do: @@ -112,7 +112,7 @@ Configuring NuttX 1) From a POSIX window: - tools/configure.sh [OPTIONS] z80sim/pashello + tools/configure.sh [OPTIONS] z80sim:pashello where you need to select the right [OPTIONS] for your build environment. Do: diff --git a/boards/z8encore000zco/README.txt b/boards/z8encore000zco/README.txt index 375361a7a2..6ebc209d08 100644 --- a/boards/z8encore000zco/README.txt +++ b/boards/z8encore000zco/README.txt @@ -55,7 +55,7 @@ Variations on the basic z8encore000zco configuration are maintained in subdirectories. To configure any specific configuration, do the following steps: - tools/configure.sh z8encore000zco/ + tools/configure.sh z8encore000zco: make Where is the specific board configuration that you diff --git a/boards/z8f64200100kit/README.txt b/boards/z8f64200100kit/README.txt index 0d3a764766..9d669d26d7 100644 --- a/boards/z8f64200100kit/README.txt +++ b/boards/z8f64200100kit/README.txt @@ -59,7 +59,7 @@ Variations on the basic z8f64200100kit configuration are maintained in subdirectories. To configure any specific configuration, do the following steps: - tools/configure.sh z8f64200100kit/ + tools/configure.sh z8f64200100kit: make Where is the specific board configuration that you diff --git a/boards/zkit-arm-1769/README.txt b/boards/zkit-arm-1769/README.txt index 2f030be84e..64f5d6c31f 100644 --- a/boards/zkit-arm-1769/README.txt +++ b/boards/zkit-arm-1769/README.txt @@ -370,7 +370,7 @@ Configurations Each ZKit-ARM configuration is maintained in a sudirectory and can be selected as follow: - tools/configure.sh zkit-arm-1769/ + tools/configure.sh zkit-arm-1769: Where is one of the following: diff --git a/boards/zp214xpa/README.txt b/boards/zp214xpa/README.txt index bf30d7f0f8..e58b37800a 100644 --- a/boards/zp214xpa/README.txt +++ b/boards/zp214xpa/README.txt @@ -284,7 +284,7 @@ Configurations: Each NXP LPC214x configuration is maintained in a sub-directory and can be selected as follow: - tools/configure.sh zp214xpa/ + tools/configure.sh zp214xpa: Where is one of the following: diff --git a/libs/libc/zoneinfo/README.txt b/libs/libc/zoneinfo/README.txt index 2e452807fb..6f7953264a 100644 --- a/libs/libc/zoneinfo/README.txt +++ b/libs/libc/zoneinfo/README.txt @@ -61,9 +61,7 @@ NOTE: The full TZ database is quite large. To create a reasonable sized ROMFS image, I had to trim some of the files like this: cd nuttx - cd tools - ./configure.sh sim/nsh - cd .. + tools/configure.sh sim:nsh make menuconfig Select the above localtime() and nuttx/zoneinfo configuration settings. diff --git a/tools/README.txt b/tools/README.txt index a8e8ba5ef0..348b6893d3 100644 --- a/tools/README.txt +++ b/tools/README.txt @@ -861,9 +861,7 @@ sethost.sh configurations. For example, if you are running on Linux and you configure like this: - $ cd tools - $ ./configure.sh board/configuration - $ cd .. + $ tools/configure.sh board:configuration The you can use the following command to both (1) make sure that the configuration is up to date, AND (2) the configuration is set up diff --git a/tools/configure.c b/tools/configure.c index beb51f8c22..ca231bbcc0 100644 --- a/tools/configure.c +++ b/tools/configure.c @@ -129,8 +129,8 @@ static const char *g_optfiles[] = static void show_usage(const char *progname, int exitcode) { - fprintf(stderr, "\nUSAGE: %s [-d] [-b] [-f] [-l|m|c|u|g|n] [-a ] [%c]\n", progname, g_delim); - fprintf(stderr, "\nUSAGE: %s [-h]\n\n", progname); + fprintf(stderr, "\nUSAGE: %s [-d] [-b] [-f] [-l|m|c|u|g|n] [-a ] :\n", progname); + fprintf(stderr, "\nUSAGE: %s [-h]\n", progname); fprintf(stderr, "\nWhere:\n"); fprintf(stderr, " -d:\n"); fprintf(stderr, " Enables debug output\n"); @@ -175,7 +175,8 @@ static void show_usage(const char *progname, int exitcode) 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%cboards%c%c.\n", g_delim, g_delim, g_delim); + fprintf(stderr, " under nuttx%cboards%c%cconfigs%c.\n", + g_delim, g_delim, g_delim, g_delim); fprintf(stderr, " -h:\n"); fprintf(stderr, " Prints this message and exits.\n"); exit(exitcode); @@ -278,22 +279,26 @@ static void parse_args(int argc, char **argv) } /* The required option should be the board directory name and the - * configuration directory name separated by '/' or '\'. Either is + * configuration directory name separated by ':', '/' or '\'. Any are * acceptable in this context. */ g_boarddir = argv[optind]; optind++; - ptr = strchr(g_boarddir, '/'); - if (!ptr) + ptr = strchr(g_boarddir, ':'); + if (ptr == NULL) { - ptr = strchr(g_boarddir, '\\'); + ptr = strchr(g_boarddir, '/'); + if (!ptr) + { + ptr = strchr(g_boarddir, '\\'); + } } - if (!ptr) + if (ptr == NULL) { - fprintf(stderr, "ERROR: Invalid %c\n", g_delim); + fprintf(stderr, "ERROR: Invalid :\n"); show_usage(argv[0], EXIT_FAILURE); } @@ -558,7 +563,7 @@ static void config_search(const char *boarddir) } } - fprintf(stderr, " %s/%s\n", boardname, configname); + fprintf(stderr, " %s:%s\n", boardname, configname); } free(child); @@ -570,7 +575,7 @@ static void config_search(const char *boarddir) static void enumerate_configs(void) { - fprintf(stderr, "Options for [%c] include:\n\n", g_delim); + fprintf(stderr, "Options for : include:\n\n"); config_search(""); } diff --git a/tools/configure.sh b/tools/configure.sh index 89487b7ed0..c1e43452e5 100755 --- a/tools/configure.sh +++ b/tools/configure.sh @@ -37,7 +37,7 @@ WD=`test -d ${0%/*} && cd ${0%/*}; pwd` TOPDIR="${WD}/.." USAGE=" -USAGE: ${0} [-d] [-l|m|c|u|g|n] [-a ] / +USAGE: ${0} [-d] [-l|m|c|u|g|n] [-a ] : Where: -l selects the Linux (l) host environment. @@ -127,8 +127,20 @@ if [ -z "${boardconfig}" ]; then exit 2 fi -boarddir=`echo ${boardconfig} | cut -d'/' -f1` -configdir=`echo ${boardconfig} | cut -d'/' -f2` +configdir=`echo ${boardconfig} | cut -s -d':' -f2` +if [ -z "${configdir}" ]; then + configdir=`echo ${boardconfig} | cut -s -d'/' -f2` + if [ -z "${configdir}" ]; then + echo "" + echo "Unrecognizable argument: ${boardconfig}" + echo "$USAGE" + exit 3 + else + boarddir=`echo ${boardconfig} | cut -d'/' -f1` + fi +else + boarddir=`echo ${boardconfig} | cut -d':' -f1` +fi configpath=${TOPDIR}/boards/${boarddir}/configs/${configdir} if [ ! -d "${configpath}" ]; then @@ -141,12 +153,12 @@ if [ ! -d "${configpath}" ]; then echo "Select one of the following options for :" configlist=`find ${TOPDIR}/boards -name defconfig` for defconfig in ${configlist}; do - config=`dirname ${defconfig} | sed -e "s,${TOPDIR}/boards/,,g" | sed -e "s,configs/,,g"` + config=`dirname ${defconfig} | sed -e "s,${TOPDIR}/boards/,,g" | sed -e "s,configs/,,g" | sed -e "s,/,:,g"` echo " ${config}" done echo "" echo "$USAGE" - exit 3 + exit 4 fi fi @@ -158,7 +170,7 @@ if [ ! -r "${src_makedefs}" ]; then if [ ! -r "${src_makedefs}" ]; then echo "File Make.defs could not be found" - exit 4 + exit 5 fi fi @@ -244,16 +256,16 @@ winappdir=`echo "${appdir}" | sed -e 's/\\//\\\\\\\/g'` if [ ! -z "${appdir}" -a ! -d "${TOPDIR}/${posappdir}" ]; then echo "Directory \"${TOPDIR}/${posappdir}\" does not exist" - exit 7 + exit 8 fi # Okay... Everything looks good. Setup the configuration echo " Copy files" install -m 644 "${src_makedefs}" "${dest_makedefs}" || \ - { echo "Failed to copy \"${src_makedefs}\"" ; exit 7 ; } + { echo "Failed to copy \"${src_makedefs}\"" ; exit 9 ; } install -m 644 "${src_config}" "${dest_config}" || \ - { echo "Failed to copy \"${src_config}\"" ; exit 9 ; } + { echo "Failed to copy \"${src_config}\"" ; exit 10 ; } # Install any optional files @@ -337,7 +349,7 @@ fi # reconstitued before they can be used. echo " Refreshing..." -cd ${TOPDIR} || { echo "Failed to cd to ${TOPDIR}"; exit 1; } +cd ${TOPDIR} || { echo "Failed to cd to ${TOPDIR}"; exit 11; } MAKE_BIN=make if [ ! -z `which gmake 2>/dev/null` ]; then diff --git a/tools/refresh.sh b/tools/refresh.sh index 9d1bf3d702..db33cd962b 100755 --- a/tools/refresh.sh +++ b/tools/refresh.sh @@ -32,7 +32,7 @@ # POSSIBILITY OF SUCH DAMAGE. # -USAGE="USAGE: $0 [options] /" +USAGE="USAGE: $0 [options] :" ADVICE="Try '$0 --help' for more information" unset CONFIG @@ -97,8 +97,21 @@ if [ -z "$1" ]; then exit 1 fi -BOARDSUBDIR=`echo $1 | cut -d'/' -f1` -CONFIGSUBDIR=`echo $1 | cut -d'/' -f2` +CONFIGSUBDIR=`echo ${CONFIG} | cut -s -d':' -f2` +if [ -z "${CONFIGSUBDIR}" ]; then + CONFIGSUBDIR=`echo ${CONFIG} | cut -s -d'/' -f2` + if [ -z "${CONFIGSUBDIR}" ]; then + echo "ERROR: Malformed configuration: ${CONFIG}" + echo $USAGE + echo $ADVICE + exit 1 + else + BOARDSUBDIR=`echo ${CONFIG} | cut -d'/' -f1` + fi +else + BOARDSUBDIR=`echo ${CONFIG} | cut -d':' -f1` +fi + # Where are we diff --git a/tools/testbuild.sh b/tools/testbuild.sh index 2e2e57de3e..799f84830d 100755 --- a/tools/testbuild.sh +++ b/tools/testbuild.sh @@ -1,7 +1,7 @@ #!/bin/bash # testbuild.sh # -# Copyright (C) 2016-2018 Gregory Nutt. All rights reserved. +# Copyright (C) 2016-2019 Gregory Nutt. All rights reserved. # Author: Gregory Nutt # # Redistribution and use in source and binary forms, with or without @@ -277,8 +277,18 @@ for line in $testlist; do # Parse the next line config=`echo $line | cut -d',' -f1` - boarddir=`echo $config | cut -d'/' -f1` - configdir=`echo $config | cut -d'/' -f2` + configdir=`echo $config | cut -s -d':' -f2` + if [ -z "${configdir}" ]; then + configdir=`echo $config | cut -s -d'/' -f2` + if [ -z "${configdir}" ]; then + echo "ERROR: Malformed configuration: ${config}" + showusage + else + boarddir=`echo $config | cut -d'/' -f1` + fi + else + boarddir=`echo $config | cut -d':' -f1` + fi path=$nuttx/boards/$boarddir/configs/$configdir if [ ! -r "$path/defconfig" ]; then