Skip to content

makefiles/mcuboot: prepare for when FLASHFILE is used#11112

Merged
jcarrano merged 1 commit intoRIOT-OS:masterfrom
cladmi:pr/make/mcuboot/prepare_flashfile
Mar 7, 2019
Merged

makefiles/mcuboot: prepare for when FLASHFILE is used#11112
jcarrano merged 1 commit intoRIOT-OS:masterfrom
cladmi:pr/make/mcuboot/prepare_flashfile

Conversation

@cladmi
Copy link
Copy Markdown
Contributor

@cladmi cladmi commented Mar 5, 2019 •
edited
Loading

Contribution description

Prepare to keep working when FLASHFILE is used for the FLASHER.

Limitation

This does not declare the generated file to flash as FLASHFILE as it is currently not a file target.
This would come after #10494

Testing procedure

Nothing broke

The previous behavior did not change:

make -C tests/mcuboot/ mcuboot-flash 

make -C tests/mcuboot/ term
make: Entering directory '/home/harter/work/git/worktree/riot_release/tests/mcuboot'
/home/harter/work/git/worktree/riot_release/dist/tools/pyterm/pyterm -p "/dev/ttyACM0" -b "115200"
Twisted not available, please install it if you want to use pyterm's JSON capabilities
2019-03-05 18:06:21,953 - INFO # Connect to serial port /dev/ttyACM0
Welcome to pyterm!
Type '/exit' to exit.

2019-03-05 18:09:20,682 - INFO # Hello MCUBoot!
2019-03-05 18:09:20,686 - INFO # You are running RIOT on a(n) nrf52dk board.
2019-03-05 18:09:20,689 - INFO # This board features a(n) nrf52 MCU.
2019-03-05 18:09:20,692 - INFO # The startup address is: 0x8200

Future should work

FLASHFILE is indeed given to the flash target.
It can be tested by replacing the flasher with echo $(FLASHFILE) and seeing the file being printed:

RIOT_CI_BUILD=1  make --no-print-directory -C tests/mcuboot mcuboot-flash FLASHER=echo FFLAGS='FLASHFILE: $(FLASHFILE)'
Building application "tests_mcuboot" for "nrf52dk" with MCU "nrf52".

   text    data     bss     dec     hex filename
   8108     136    2604   10848    2a60 /home/harter/work/git/worktree/riot_release/tests/mcuboot/bin/nrf52dk/tests_mcuboot.elf

Re-linking for MCUBoot at 0x8000...


Signed with /home/harter/work/git/worktree/riot_release/tests/mcuboot/bin/nrf52dk/key.pem for version 1.1.1+1\


/home/harter/work/git/worktree/riot_release/dist/tools/dlcache/dlcache.sh: getting "http://download.riot-os.org/mynewt.mcuboot.bin" from cache
echo FLASHFILE: /home/harter/work/git/worktree/riot_release/tests/mcuboot/bin/nrf52dk/mcuboot.bin
FLASHFILE: /home/harter/work/git/worktree/riot_release/tests/mcuboot/bin/nrf52dk/mcuboot.bin
echo FLASHFILE: /home/harter/work/git/worktree/riot_release/tests/mcuboot/bin/nrf52dk/signed-tests_mcuboot.bin
FLASHFILE: /home/harter/work/git/worktree/riot_release/tests/mcuboot/bin/nrf52dk/signed-tests_mcuboot.bin

Issues/PRs references

This is part of #8838

@cladmi cladmi added Area: tests Area: tests and testing framework Area: build system Area: Build system Area: tools Area: Supplementary tools labels Mar 5, 2019
@cladmi cladmi added this to the Release 2019.04 milestone Mar 5, 2019
@cladmi cladmi mentioned this pull request Mar 5, 2019
Merged
49 tasks
@jcarrano jcarrano added the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Mar 6, 2019
@cladmi
makefiles/mcuboot: prepare for when FLASHFILE is used
0514de2 
Prepare to keep working when `FLASHFILE` is used for the FLASHER.
@cladmi cladmi force-pushed the pr/make/mcuboot/prepare_flashfile branch from 2dbe64f to 0514de2 Compare March 6, 2019 16:07
@cladmi
Copy link
Copy Markdown
Contributor Author

cladmi commented Mar 6, 2019

I rebased now that #11110 is merged. I updated the test description since the output changed.

This was referenced Mar 7, 2019
Merged
Merged
jcarrano
jcarrano approved these changes Mar 7, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@jcarrano jcarrano left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is nothing to test here.

@jcarrano jcarrano merged commit f3a3905 into RIOT-OS:master Mar 7, 2019
@danpetry danpetry modified the milestone: Release 2019.04 Mar 11, 2019
@cladmi cladmi deleted the pr/make/mcuboot/prepare_flashfile branch March 11, 2019 11:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@jcarrano jcarrano jcarrano approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

Area: build system Area: Build system Area: tests Area: tests and testing framework Area: tools Area: Supplementary tools CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR

Projects

None yet

Milestone

Release 2019.04

Development

Successfully merging this pull request may close these issues.

3 participants

@cladmi @jcarrano @danpetry