Skip to content

Commit

Permalink
configs: Remove all setenv.bat files. Remove all references to setenv…
Browse files Browse the repository at this point in the history
….sh and setenv.bat from all config README files.
  • Loading branch information
gregory-nutt committed Apr 26, 2017
1 parent 1620ff0 commit 9aac1dd
Show file tree
Hide file tree
Showing 132 changed files with 581 additions and 1,805 deletions.
21 changes: 6 additions & 15 deletions configs/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,10 @@ following characteristics:
| `-- (board-specific source files)
|-- <config1-dir>
| |-- Make.defs
| |-- defconfig
| `-- setenv.sh
| `-- defconfig
|-- <config2-dir>
| |-- Make.defs
| |-- defconfig
| `-- setenv.sh
| `-- defconfig
...

Summary of Files
Expand All @@ -101,10 +99,10 @@ src/Makefile -- This makefile will be invoked to build the board specific
and distclean.

A board may have various different configurations using these common source
files. Each board configuration is described by three files: Make.defs,
defconfig, and setenv.sh. Typically, each set of configuration files is
retained in a separate configuration sub-directory (<config1-dir>,
<config2-dir>, .. in the above diagram).
files. Each board configuration is described by two files: Make.defs and
defconfig. Typically, each set of configuration files is retained in a
separate configuration sub-directory (<config1-dir>, <config2-dir>, .. in
the above diagram).

Make.defs -- This makefile fragment provides architecture and
tool-specific build options. It will be included by all other
Expand Down Expand Up @@ -141,12 +139,6 @@ defconfig -- This is a configuration file similar to the Linux
(2) to generate include/nuttx/config.h which is included by
most C files in the system.

setenv.sh -- This is a script that you can include that will be installed at
the toplevel of the directory structure and can be sourced to set any
necessary environment variables. You will most likely have to customize the
default setenv.sh script in order for it to work correctly in your
environment.

Configuration Variables
^^^^^^^^^^^^^^^^^^^^^^^

Expand Down Expand Up @@ -816,7 +808,6 @@ Configuring NuttX
Configuring NuttX requires only copying

configs/<board-name>/<config-dir>/Make.def to ${TOPDIR}/Make.defs
configs/<board-name>/<config-dir>/setenv.sh to ${TOPDIR}/setenv.sh
configs/<board-name>/<config-dir>/defconfig to ${TOPDIR}/.config

tools/configure.sh
Expand Down
14 changes: 6 additions & 8 deletions configs/amber/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -199,9 +199,8 @@ Buildroot:
http://bitbucket.org/nuttx/buildroot/downloads/. See the
following section for details on building this toolchain.

It is assumed in some places that buildroot toolchain is available
at ../buildroot/build_avr. Edit the setenv.sh file if
this is not the case.
You may also have to modify the PATH environment variable if your make cannot
find the tools.

After configuring NuttX, make sure that CONFIG_AVR_BUILDROOT_TOOLCHAIN=y is set in your
.config file.
Expand All @@ -211,8 +210,8 @@ WinAVR:
For Cygwin development environment on Windows machines, you can use
WinAVR: http://sourceforge.net/projects/winavr/files/

It is assumed in some places that WinAVR is installed at C:/WinAVR. Edit the
setenv.sh file if this is not the case.
You may also have to modify the PATH environment variable if your make cannot
find the tools.

After configuring NuttX, make sure that CONFIG_AVR_WINAVR_TOOLCHAIN=y is set in your
.config file.
Expand Down Expand Up @@ -297,8 +296,8 @@ NuttX buildroot Toolchain

7. make

8. Edit setenv.h, if necessary, so that the PATH variable includes
the path to the newly built binaries.
8. Make sure that the PATH variable includes the path to the newly built
binaries.

See the file configs/README.txt in the buildroot source tree. That has more
detailed PLUS some special instructions that you will need to follow if you
Expand Down Expand Up @@ -493,7 +492,6 @@ Common Configuration Notes
cd tools
./configure.sh amber/<subdir>
cd -
. ./setenv.sh

Where <subdir> is one of the configuration sub-directories described in
the following paragraph.
Expand Down
25 changes: 10 additions & 15 deletions configs/arduino-due/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,8 @@ GNU Toolchain Options
CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIL=y : Generic GCC ARM EABI toolchain for Linux
CONFIG_ARMV7M_TOOLCHAIN_GNU_EABIW=y : Generic GCC ARM EABI toolchain for Windows

If you are not using CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT, then you may also
have to modify the PATH in the setenv.h file if your make cannot find the
tools.
You may also have to modify the PATH environment variable if your make cannot
find the tools.

NOTE about Windows native toolchains
------------------------------------
Expand Down Expand Up @@ -348,7 +347,7 @@ IDEs
NuttX EABI "buildroot" Toolchain
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

A GNU GCC-based toolchain is assumed. The files */setenv.sh should
A GNU GCC-based toolchain is assumed. The PATH environment variable should
be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
different from the default in your PATH variable).

Expand All @@ -375,8 +374,8 @@ NuttX EABI "buildroot" Toolchain

7. make

8. Edit setenv.h, if necessary, so that the PATH variable includes
the path to the newly built binaries.
8. Make sure that the PATH variable includes the path to the newly built
binaries.

See the file configs/README.txt in the buildroot source tree. That has more
details PLUS some special instructions that you will need to follow if you are
Expand Down Expand Up @@ -437,8 +436,8 @@ NXFLAT Toolchain

7. make

8. Edit setenv.h, if necessary, so that the PATH variable includes
the path to the newly builtNXFLAT binaries.
8. Make sure that the PATH variable includes the path to the newly built
NXFLAT binaries.

Buttons and LEDs
^^^^^^^^^^^^^^^^
Expand Down Expand Up @@ -849,11 +848,9 @@ Configurations
cd tools
./configure.sh arduino-due/<subdir>
cd -
. ./setenv.sh

Before sourcing the setenv.sh file above, you should examine it and perform
edits as necessary so that BUILDROOT_BIN is the correct path to the directory
than holds your toolchain binaries.
Before building, make sure the PATH environment variable includes the
correct path to the directory than holds your toolchain binaries.

And then build NuttX by simply typing the following. At the conclusion of
the make, the nuttx binary will reside in an ELF file called, simply, nuttx.
Expand Down Expand Up @@ -930,9 +927,7 @@ Configurations

Also, make sure that your PATH variable has the new path to your
Atmel tools. Try 'which arm-none-eabi-gcc' to make sure that you
are selecting the right tool. setenv.sh is available for you to
use to set or PATH variable. The path in the that file may not,
however, be correct for your installation.
are selecting the right tool.

See also the "NOTE about Windows native toolchains" in the section call
"GNU Toolchain Options" above.
Expand Down
1 change: 0 additions & 1 deletion configs/arduino-mega2560/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ Configurations
cd tools
./configure.sh arduino-mega2560/<subdir>
cd -
. ./setenv.sh

Where <subdir> is one of the configuration sub-directories described in
the following paragraph.
Expand Down
7 changes: 2 additions & 5 deletions configs/avr32dev1/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,8 @@ AVR32 Bootloader
driver in the FLIP usb directory. Then in the bin directory where
you installed FLIP, you will also find batchisp.exe.

NOTE: The AVR32DEV1 setenv.sh files will add the path to the BatchISP
bin directory to the Cygwin PATH variable. If you use a different
version of FLIP or if you install FLIP in a different location, you
will need to modify the setenv.sh files.
NOTE: You will need to set the PATH environment variable to include the
path to the BatchISP bin directory.

Notes from "AVR32 UC3 USB DFU Bootloader" (doc7745.pdf)

Expand Down Expand Up @@ -436,7 +434,6 @@ Common Configuration Notes
cd tools
./configure.sh avr32dev1/<subdir>
cd -
. ./setenv.sh

Where <subdir> is one of the configuration sub-directories described in
the following paragraph.
Expand Down
1 change: 0 additions & 1 deletion configs/bambino-200e/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,6 @@ as follow:
cd tools
./configure.sh bambino-200e/<subdir>
cd -
. ./setenv.sh

Where <subdir> is one of the following:

Expand Down
7 changes: 3 additions & 4 deletions configs/c5471evm/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ README
Toolchain
^^^^^^^^^

A GNU GCC-based toolchain is assumed. The files */setenv.sh should
A GNU GCC-based toolchain is assumed. The PATH environment variable should
be modified to point to the correct path to the SH toolchain (if
different from the default).

Expand All @@ -28,8 +28,8 @@ Toolchain

7. make

8. Edit setenv.h so that the PATH variable includes the path to the
newly built binaries.
8. Make sure that the PATH variable includes the path to the newly built
binaries.

Issues
^^^^^^
Expand Down Expand Up @@ -133,7 +133,6 @@ Common Configuration Notes
cd tools
./configure.sh c5471evm/<subdir>
cd -
. ./setenv.sh

Where <subdir> is one of the configuration sub-directories described in
the following paragraph.
Expand Down
6 changes: 2 additions & 4 deletions configs/clicker2-stm32/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -163,11 +163,9 @@ Configurations
cd tools
./configure.sh clicker2-stm32/<subdir>
cd -
. ./setenv.sh

Before sourcing the setenv.sh file above, you should examine it and
perform edits as necessary so that TOOLCHAIN_BIN is the correct path
to the directory than holds your toolchain binaries.
Before building, make sure the PATH environment variable includes the
correct path to the directory than holds your toolchain binaries.

And then build NuttX by simply typing the following. At the conclusion of
the make, the nuttx binary will reside in an ELF file called, simply, nuttx.
Expand Down
22 changes: 7 additions & 15 deletions configs/cloudctrl/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -202,8 +202,8 @@ GNU Toolchain Options
CONFIG_ARMV7M_TOOLCHAIN_RAISONANCE=y : Raisonance RIDE7 under Windows
CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y : NuttX buildroot under Linux or Cygwin (default)

If you change the default toolchain, then you may also have to modify the PATH in
the setenv.h file if your make cannot find the tools.
You may also have to modify the PATH environment variable if your make cannot
find the tools.

NOTE: the CodeSourcery (for Windows), Atollic, devkitARM, and Raisonance toolchains are
Windows native toolchains. The CodeSourcery (for Linux) and NuttX buildroot
Expand Down Expand Up @@ -304,7 +304,7 @@ IDEs
NuttX EABI buildroot Toolchain
==============================

A GNU GCC-based toolchain is assumed. The files */setenv.sh should
A GNU GCC-based toolchain is assumed. The PATH environment variable should
be modified to point to the correct path to the Cortex-M3 GCC toolchain (if
different from the default in your PATH variable).

Expand Down Expand Up @@ -340,14 +340,8 @@ NuttX EABI buildroot Toolchain
-CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
+CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT=y

9. Edit setenv.h, if necessary, so that the PATH variable includes
the path to the newly built binaries.

-export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
+#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"

-#export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
+export TOOLCHAIN_BIN="${WD}/../buildroot/build_arm_nofpu/staging_dir/bin"
9. Set the the PATH variable so tht it includes the path to the newly built
binaries.

See the file configs/README.txt in the buildroot source tree. That has more
detailed PLUS some special instructions that you will need to follow if you are
Expand Down Expand Up @@ -408,8 +402,8 @@ NXFLAT Toolchain

7. make

8. Edit setenv.h, if necessary, so that the PATH variable includes
the path to the newly builtNXFLAT binaries.
8. Make sure that the PATH variable includes the path to the newly built
NXFLAT binaries.

LEDs
====
Expand Down Expand Up @@ -721,7 +715,6 @@ can be selected as follow:
cd tools
./configure.sh shenzhou/<subdir>
cd -
. ./setenv.sh

Where <subdir> is one of the following:

Expand Down Expand Up @@ -802,7 +795,6 @@ Where <subdir> is one of the following:
2. Make the build context (only)

$ cd ..
$ . ./setenv.sh
$ make context
...

Expand Down
7 changes: 3 additions & 4 deletions configs/demo9s12ne64/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Development Environment
NuttX Buildroot Toolchain
^^^^^^^^^^^^^^^^^^^^^^^^^

A GNU GCC-based toolchain is assumed. The files */setenv.sh should
A GNU GCC-based toolchain is assumed. The PATH environment variable should
be modified to point to the correct path to the HC12 GCC toolchain (if
different from the default in your PATH variable).

Expand Down Expand Up @@ -143,8 +143,8 @@ NuttX Buildroot Toolchain
directory manually. For example, binutils-2.18 can be found here:
http://ftp.gnu.org/gnu/binutils/

8. Edit setenv.h, if necessary, so that the PATH variable includes
the path to the newly built binaries.
8. Make sure that the PATH variable includes the path to the newly built
binaries.

See the file configs/README.txt in the buildroot source tree. That has more
detailed PLUS some special instructions that you will need to follow if you are
Expand Down Expand Up @@ -367,7 +367,6 @@ Common Configuration Notes
cd tools
./configure.sh demo9s12nec64/<subdir>
cd -
. ./setenv.sh

Where <subdir> is one of the configuration sub-directories described in
the following paragraph.
Expand Down
6 changes: 2 additions & 4 deletions configs/dk-tm4c129x/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,8 @@ Using OpenOCD and GDB with ICDI

oocd.sh $PWD

The relative path to the oocd.sh script is configs/dk-tm4c129x/tools,
but that should have been added to your PATH variable when you sourced
the setenv.sh script.
Assuming that you have included the path to the oocd.sh script,
configs/dk-tm4c129x/tools, in PATH variable.

Note that OpenOCD needs to be run with administrator privileges in
some environments (sudo).
Expand Down Expand Up @@ -660,7 +659,6 @@ sub-directory and can be selected as follow:
cd tools
./configure.sh dk-tm4c129x/<subdir>
cd -
. ./setenv.sh

Where <subdir> is one of the following:

Expand Down
Loading

0 comments on commit 9aac1dd

Please sign in to comment.