makefiles/openocd.inc.mk: use FLASHFILE#11254
Merged
cladmi merged 3 commits intoRIOT-OS:masterfrom Mar 28, 2019
Merged
Conversation
cladmi
added
Area: build system
Contributor
Author
|
I just noticed that I did not give any procedure to test that "FLASHFILE" can be changed. I will give a way to show this. |
Contributor
Author
|
When setting FLASHFILE to another value from environment, like wdiff output_master output_pr
|
49 tasks
Contributor
MrKevinWeiss
left a comment
MrKevinWeiss
left a comment
There was a problem hiding this comment.
Tested flashing on different boards with PROGRAMMER=openocd make flash term -C tests/shell/
samr21-xpro, nucleo-l073rz, nucleo-f411re, remote-revb, nucleo-f103rb, frdm-k22f and updated the tracking list.
I am not an mcu_boot guy so I cannot comment but all other makefile changes seem to make sense.
cladmi
force-pushed
the
pr/make/openocd/flashfile
branch
from
411b1fe to
fc2897d
Compare
Contributor
Author
|
@MrKevinWeiss Thank you for the review. Maybe some of the maintainer working on |
Contributor
|
Tested with samr21-xpro test results
|
Contributor
|
Tested with nucleo-l073rz test results
|
cladmi
force-pushed
the
pr/make/openocd/flashfile
branch
from
fc2897d to
3e7e23e
Compare
5 tasks
Contributor
Author
cladmi
force-pushed
the
pr/make/openocd/flashfile
branch
from
3e7e23e to
fc752ab
Compare
Update to use FLASHFILE as file to be flashed on the board.
Update to use FLASHFILE as file to be flashed on the board. openocd.inc.mk now uses FLASHFILE variable so does not need to overwrite FFLAGS anymore.
Openocd boards are now updated.
cladmi
force-pushed
the
pr/make/openocd/flashfile
branch
from
fc752ab to
ff13208
Compare
Contributor
Author
|
Rebased now that #11284 is merged so it is back to the original changes. |
Member
|
tested riotboot (bootloader, slot0, slot1) on iotlab-m3. Works fine! |
MrKevinWeiss
added
the
CI: ready for build
MrKevinWeiss
approved these changes
Mar 28, 2019
Contributor
MrKevinWeiss
left a comment
MrKevinWeiss
left a comment
There was a problem hiding this comment.
Things look OK to me. It seems tested by two people and I trust @cladmi.
ACK!
Contributor
Author
|
Thank you for the review. @danpetry there should not be any issue with this one and if there was, any fix would just be setting a variable in one board makefile. So we went for it in the soft featurefreeze. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Contribution description
Update to use FLASHFILE as file to be flashed on the board.
This also now removes the compatibility hack in
riotboot.Testing procedure
We need to test that boards using
openocdstill work with this.Boards using
openocd:Test flashing normal examples with the board
PROGRAMMER=openocd@cladmiPROGRAMMER=openocdPROGRAMMER=openocdPROGRAMMER=openocdPROGRAMMER=openocdPROGRAMMER=openocdPROGRAMMER=openocdTest without board
I get the same output for the
FFLAGSfor all these boards with both this PR and masterfor board in ${OPENOCD_BOARDS}; do echo ${board}; BOARD=${board} PROGRAMMER=openocd make -C examples/hello-world/ --no-print-directory FLASHER=true flash-only; doneFFLAGS output for all boards...
The output for
spark-coreshows it is not usingopenocdfor flashing but was the same in master.riotboottestTest running
tests/riotbootfor boards supporting it.I tested
samr21-xprowithPROGRAMMER=openocdand theiotlab-m3.I also tested some of the other commands
riotboot/flash-slot1riotboot/flash-extended-slot0.Issues/PRs references
Part of #8838