1
0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-01-18 12:52:44 +01:00
Commit Graph

299 Commits

Author SHA1 Message Date
Gaëtan Harter
78fcad5bf3
Merge pull request #11190 from cladmi/pr/make/flashfile/avrdude
tools/avrdude.inc.mk: use FLASHFILE variable
2019-03-15 11:37:01 +01:00
Gaëtan Harter
9bf7d5bb1a
tools/avrdude.inc.mk: use FLASHFILE variable
Update to use FLASHFILE as file to be flashed on the board.
2019-03-14 18:16:43 +01:00
bee2f0bcc7
Merge pull request #11180 from kaspar030/riotboot_use_epoch_as_default_version
riotboot: use epoch as APP_VER default
2019-03-14 16:01:00 +01:00
09a40fb6fc riotboot: use epoch as APP_VER default 2019-03-14 12:04:56 +01:00
Francisco Acosta
0f4e51d543
Merge pull request #11130 from cladmi/pr/make/flashfile/jlink
makefiles/tools/jlink.inc.mk: use FLASHFILE
2019-03-14 12:01:02 +01:00
Francisco Acosta
de720730f6
Merge pull request #11127 from bergzand/pr/nrf52/ref_ldscripts
nrf52: use cortexm.ld script when applicable
2019-03-13 19:41:13 +01:00
Emmanuel Baccelli
8969fd32e9
Merge pull request #11080 from kaspar030/add_pyboard
boards: add pyboard v1.1 support
2019-03-13 17:07:40 +01:00
Gaëtan Harter
a3df00ca17
makefiles/mcuboot.mk: remove compatibility with old ldscript
Linkerscript for `nrf52dk` has been updated to use `cortexm.ld` so does
not need the configuration anymore for the removed
`cpu/nrf52/ldscripts/nrf52832xxaa.ld`.
2019-03-13 11:57:45 +01:00
Gaëtan Harter
1e1611c50a
makefiles/mcuboot.mk: prepare for using cortexm.ld
Prepare mcuboot for changing `nrf52` to use `cortexm.ld`. It sets the
offset for linking the image.
2019-03-13 11:57:40 +01:00
Juan I Carrano
f7cdbdaab0
Merge pull request #11145 from kaspar030/test_newlib_nano_path_empty
make: newlib: check if newlib nano folder was found
2019-03-11 14:55:10 +01:00
Juan I Carrano
265a118841
Merge pull request #11109 from cladmi/pr/make/refactor/modules.inc.mk
makefiles/modules.inc.mk: refactoring
2019-03-11 13:10:18 +01:00
891580aba7
sys/auto_init: add support for periph_temperature 2019-03-08 21:14:22 +01:00
87326c7b77 make: newlib: check if newlib nano folder was found 2019-03-08 18:47:23 +01:00
Kevin "Bear Puncher" Weiss
e33e7bf159
Merge pull request #9646 from cladmi/pr/make/docker/fix_relative_build_directory
makefiles/docker.inc.mk: Use directories in RIOT when possible
2019-03-08 09:48:13 +01:00
Gaëtan Harter
4c860f3218
makefiles/mcuboot: remove compatibility for HEXFILE to flash
JLink flasher used by the only supported board `nrf52dk` has been updated.

FLASHFILE must now be defined by the board to use this in case a new one
wants to be supported.
2019-03-07 16:18:40 +01:00
Gaëtan Harter
034e4ff32c
makefiles/jlink.inc.mk: use FLASHFILE
Update to use FLASHFILE as file to be flashed on the board.
2019-03-07 16:18:38 +01:00
Gaëtan Harter
0514de233d
makefiles/mcuboot: prepare for when FLASHFILE is used
Prepare to keep working when `FLASHFILE` is used for the FLASHER.
2019-03-06 17:07:35 +01:00
Gaëtan Harter
411e98e55e
Merge pull request #11110 from jcarrano/flash_canned_recipe_conversion
riotboot,mcuboot: Use canned recipe for flashing.
2019-03-06 16:50:43 +01:00
Gaëtan Harter
8d58e3bf91
makefiles/modules.inc.mk: refactor, do not overwrite NO_PSEUDOMODULES
Refactor to define REALMODULES incrementally without overwriting
'NO_PSEUDOMODULES'.

This also allows an external makefile to maybe add something there if it really
needs to.
2019-03-05 16:04:20 +01:00
Gaëtan Harter
5453523933
makefiles/modules.inc.mk: group CFLAGS handling
Put all lines related to CFLAGS handling together.
2019-03-05 15:57:18 +01:00
Gaëtan Harter
c2b1995af7
makefiles/modules.inc.mk: factorize in _ALLMODULES
Factorize the reused value in a private variable.

I define it private as somehow 'USEPKG' is supposed to be removed so the
variables can be removed later.
2019-03-05 15:54:05 +01:00
Gaëtan Harter
b6645b531b
makefiles/modules.inc.mk: do not export BASELIBS
BASELIBS is used only in the main Makefile.include or included files.
As it is not used in sub make executions or scripts it does not need to
be exported.
2019-03-05 15:52:38 +01:00
Gaëtan Harter
670a836863
makefiles/modules.inc.mk: do not export USEMODULE
USEMODULE is already exported by `makefiles/vars.inc.mk`.
2019-03-05 15:45:08 +01:00
Juan Carrano
420b2c9220 makefiles/mcuboot: use canned recipe for flashing.
The canned recipe is preferred to using $(FLASHER) $(FFLAGS) as it
allows to specify additional action actions (like what preflash is
currently doing.)
2019-03-05 14:45:48 +01:00
Juan Carrano
748bc6deee makefiles/riotboot: use canned recipe for flashing.
A canned recipe had previously been defined to perform the flashing
procedure. The canned recipe is preferred to calling $(FLASHER) $(FFLAGS)
as there might be additional steps involved in flashing (this is handled by
preflash currently but with the canned recipe we will be able to fix it.)
2019-03-05 14:39:57 +01:00
Benjamin Valentin
6e7414e220 makefiles/tools: Automatically detect gdb-multiarch
Modern versions of GDB support multiple targets with the same gdb binary.
At least Ubuntu and Debian have dropped the gdb-arm-none-eabi package in favour
of gdb-multiarch.
Here, no $(PREFIX)-gdb binary is availiable, instead gdb-multiarch should be used.

This patch tries to automatically detect the presense of gdb-multiarch and uses it
instead of arm-none-eabi-gdb.
2019-03-05 14:31:22 +01:00
Gaëtan Harter
7a88bb4c1f
riotboot: prepare for when FLASHFILE is used
This currently does nothing but setting FLASHFILE when flashing.
This will allow passing the variable when flasher will use the FLASHFILE
variable.
2019-03-05 12:04:15 +01:00
Gaëtan Harter
240e4a3fe2
makefiles/riotboot.mk: slots only need to depend on BASELIBS
Using 'link' was working too but will introduce a circular dependency
when FLASHFILE is one of the slot files.

This trims down to the minimal required dependency to work. It is now
the same as `ELFFILE` dependencies.
2019-03-05 11:22:11 +01:00
5355f6a7be
Merge pull request #11062 from jcarrano/picocom-no-echo
serial.inc.mk: disable local echo in picocom.
2019-03-05 09:58:59 +01:00
Gaëtan Harter
7467d1be75
makefiles/murdock.inc.mk: do not overwrite FLASHFILE if set
If FLASHFILE is set keep the original value.

It changes the variable from an immediate to a deferred variable but if
murdocks keeps working there is no issue.
2019-03-04 15:52:35 +01:00
Kevin "Bear Puncher" Weiss
e3e2b6df15
Merge pull request #11084 from cladmi/pr/make/introduce_flashfile
Makefile.include: introduce FLASHFILE
2019-03-01 14:44:31 +01:00
Sebastian Meiling
d29d336894
Merge pull request #11039 from maribu/avrdude
makefiles/tools: Improved avrdude integration
2019-02-28 22:15:30 +02:00
Marian Buschsieweke
4abc41a227
makefiles/tools: Automatically set avrdude target
The CPU variable in the boards Makefile.include file already contains the target
CPU, so there is no reason to provide it in each board again as avrdude flag.

This commit automatically sets the avrdude target from the CPU variable and
removes the unneeded flags.
2019-02-28 20:55:04 +01:00
Marian Buschsieweke
93cd8a1b04
makefiles/tools: fix avrdude with ICSP programmers
Currently the flag "-P ${PORT}" is added to avrdude regardless of the programmer
used. But this flag should only be set for programmers that operate over a
serial port - e.g. like the various Arduino bootloaders. This commit changes
the behaviour so that the "-P flag" is only set for only of the default
programmers of the various AVR boards supported by RIOT. This allows to use
ICSP programmers (e.g. like the usbtiny) like this:

    make BOARD=arduino-uno PROGRAMMER=usbtiny
2019-02-28 20:55:00 +01:00
Gaëtan Harter
1d268c4cdb
Makefile.include: introduce FLASHFILE
Introduce FLASHFILE variable to start migrating boards to use it.

This is the file that will be used for flashing.
Boards do not currently use it but will migrated in upcoming PRs.
2019-02-28 18:11:49 +01:00
cladmi
3a17ddc43c
makefiles/docker.inc.mk: add support for EXTERNAL_MODULE_DIRS
They are remapped to `$(DOCKER_BUILD_ROOT)/external` if they are not
inside RIOT (usually the case but not for `tests/external_modul_dirs`).

If they are inside 'riotproject' they are currently also remapped to
'external'.

The value of `EXTERNAL_MODULE_DIRS` is then enforced by configuring it on
the command line as the application should not try to set it anymore.

The remapping is done in `external/directory_name` so cannot handle
multiple external directories with the same name.
2019-02-28 15:13:35 +01:00
cladmi
8b54f87fc4
makefiles:docker.inc.mk: add a global documentation on directory mapping 2019-02-28 14:46:43 +01:00
cladmi
3c0ecebb2c
makefiles/docker.inc.mk: use more directories in RIOT
Use the directories from in RIOT if possible for RIOTCPU/RIOTBOARD/RIOTMAKE.
2019-02-28 14:46:43 +01:00
Gaëtan Harter
8687d53c82
makefiles/docker.inc.mk: use BUILD_DIR in RIOT if possible
Use BUILD_DIR from within the riot repository if it is inside.
2019-02-28 14:46:43 +01:00
Gaëtan Harter
a57f141cf6
makefiles/docker.inc.mk: use RIOTPROJECT in the RIOT if possible
Use RIOTPROJECT from within the riot repository if it is inside.

This means when it is the case to use:

 * Not mounting the directory to `riotproject`
 * Use `APPDIR` relative to inside RIOT

If it is not inside, do the same as before:

 * Mount the RIOTPROJECT to `riotproject`
 * Use `APPDIR` relative to RIOTPROJECT
2019-02-28 14:46:43 +01:00
cladmi
e59b77988d
makefiles/docker.inc.mk: add docker_volume_and_env
Add functions to get volume and env arguments for a given directory environment
variable.

It handles:

 * variables with multiple directories like EXTERNAL_MODULE_DIRS
 * relative path
 * if the 'directories' variable is empty, it will not be exported to docker
2019-02-28 14:46:43 +01:00
cladmi
8351b13cc3
makefiles/docker.inc.mk: add path_in_docker function
Return to which directory in the container this directory should be mapped.
2019-02-28 14:46:43 +01:00
cladmi
a462c4aeb9
makefiles/docker.inc.mk: change definition order
Update definition order for DOCKER_VOLUMES_AND_ENV.

* Localtime
* Mapping and env related to `RIOTBASE`
* Build directories
* Project
* CPU/BOARD/make
2019-02-28 14:46:43 +01:00
cladmi
e5871d9deb
makefiles/docker.inc.mk: use a variable for all volumes and environment 2019-02-28 14:46:27 +01:00
cladmi
378f9fd144
makefiles/docker.inc.mk: add DOCKER_APPDIR variable
Prepare for when it can have a different value.
2019-02-28 14:44:53 +01:00
cladmi
a0f25ed47b
makefiles/docker.inc.mk: add DOCKER_RIOTBASE variable
It represents the path of RIOTBASE inside the docker container.
2019-02-28 14:44:49 +01:00
f74b819efe makefiles/tools/dfu: add initial DFU programming support 2019-02-28 13:57:12 +01:00
Juan Carrano
77f3c2d136 serial.inc.mk: disable local echo in picocom.
Due to a recent fix in shell.c, remote echo is now working as originally
intended. Local echo must be disabled or otherwise it will add up to the
remote one, causing a character-by-character double echoing.
2019-02-25 18:08:20 +01:00
Gaëtan Harter
20ce4db753
makefiles/tools/serial.inc.mk: unexport TERM* variables
TERMPROG and TERMFLAGS variables do not need to be exported as they are
used directly by a make receipe.

Exporting them prevents overwriting 'RIOT_TERMINAL' in the test.
2019-02-25 17:15:41 +01:00
Gaëtan Harter
d0cb6d26e1
makefiles/vars.inc.mk: unexport TERM* variables
TERMPROG and TERMFLAGS variables do not need to be exported as they are
used directly by a make receipe.

Exporting them prevents overwriting 'RIOT_TERMINAL' in the test.
2019-02-25 17:15:41 +01:00