RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

tests/riotboot: use FLASHFILE for the generated file

Browse Source 
FLASHFILE is now a generated file when doing `make all`.
This prepares also for when flashers will use `FLASHFILE` as a file to
be flashed.

It currently still needs the hack below for openocd and edbg.

This also fixes the issue when building 'riotboot' in docker that was
being built with the host toolchain.
This commit is contained in:
Gaëtan Harter 2019-03-01 17:36:22 +01:00
parent 240e4a3fe2
commit 13e852c58c
No known key found for this signature in database
GPG Key ID: 76DF6BCF1B1F883B
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/riotboot/Makefile
View File

@ -18,17 +18,15 @@ DEVELHELP ?= 1
# Change this to 0 show compiler invocation lines by default:
QUIET ?= 1
all: riotboot
# Target 'all' will generate the combined file directly.
# It also makes 'flash' and 'flash-only' work without specific command.
FLASHFILE = $(RIOTBOOT_COMBINED_BIN)
include ../Makefile.tests_common
include $(RIOTBASE)/Makefile.include
# Make 'flash' and 'flash-only' work without specific command.
# This is currently hacky as there is no way of specifiying a FLASHFILE
all: riotboot/combined-slot0
# This is currently hacky as the flasher are not using 'FLASHFILE'
# openocd
ELFFILE = $(RIOTBOOT_COMBINED_BIN)
ELFFILE = $(FLASHFILE)
# edbg
HEXFILE = $(RIOTBOOT_COMBINED_BIN)
# murdock uses ':=' to get the flashfile variable so should also be overwritten
FLASHFILE = $(RIOTBOOT_COMBINED_BIN)
HEXFILE = $(FLASHFILE)