Skip to content

boards/mspdebug: use FLASHFILE for boards using mspdebug#11708

Merged
MrKevinWeiss merged 1 commit into
RIOT-OS:masterfrom
cladmi:pr/mspdebug/flashfile
Jun 25, 2019
Merged

boards/mspdebug: use FLASHFILE for boards using mspdebug#11708
MrKevinWeiss merged 1 commit into
RIOT-OS:masterfrom
cladmi:pr/mspdebug/flashfile

Conversation

@cladmi

@cladmi cladmi commented Jun 17, 2019

Copy link
Copy Markdown
Contributor

Contribution description

Update to use FLASHFILE as file to be flashed on the board.

Testing procedure

You can flash on a board using mspdebug.

MSPDEBUG_BOARDS=$(git grep -l -e  mspdebug -e common/msb-430 -e common/wsn430 '*' ':!boards/common' | cut -f 2 -d/ | sort -u)
echo ${MSPDEBUG_BOARDS} 
chronos msb-430 msb-430h wsn430-v1_3b wsn430-v1_4

Testing without a board

The output of the FFLAGS is the same on master and this PR.

for board in ${MSPDEBUG_BOARDS}; do echo ${board}; BOARD=${board} make --no-print-directory -C examples/hello-world/ FLASHER=true flash-only; done

for board in ${MSPDEBUG_BOARDS}; do echo ${board}; BOARD=${board} make --no-print-directory -C examples/hello-world/ FLASHER=true flash-only; done
chronos
true rf2500 "prog /home/harter/work/git/RIOT/examples/hello-world/bin/chronos/hello-world.hex"
msb-430
true -j olimex "prog /home/harter/work/git/RIOT/examples/hello-world/bin/msb-430/hello-world.hex"
msb-430h
true -j olimex "prog /home/harter/work/git/RIOT/examples/hello-world/bin/msb-430h/hello-world.hex"
wsn430-v1_3b
true -d /dev/ttyUSB0 -j uif "prog /home/harter/work/git/RIOT/examples/hello-world/bin/wsn430-v1_3b/hello-world.hex"
wsn430-v1_4
true -d /dev/ttyUSB0 -j uif "prog /home/harter/work/git/RIOT/examples/hello-world/bin/wsn430-v1_4/hello-world.hex"

And the value can be changed from environment variable:

for board in ${MSPDEBUG_BOARDS}; do echo ${board}; FLASHFILE=toto BOARD=${board} make --no-print-directory -C examples/hello-world/ FLASHER=true flash-only; done

for board in ${MSPDEBUG_BOARDS}; do echo ${board}; FLASHFILE=toto BOARD=${board} make --no-print-directory -C examples/hello-world/ FLASHER=true flash-only; done
chronos
true rf2500 "prog toto"
msb-430
true -j olimex "prog toto"
msb-430h
true -j olimex "prog toto"
wsn430-v1_3b
true -d /dev/ttyUSB0 -j uif "prog toto"
wsn430-v1_4
true -d /dev/ttyUSB0 -j uif "prog toto"

IOTLAB_NODE update

The value for IOTLAB_NODE is correctly overwritten to the .hex file as it was in master.

IOTLAB_NODE=wsn430-1.grenoble.iot-lab.info BOARD=wsn430-v1_3b make --no-print-directory -C examples/hello-world/ info-debug-variable-IOTLAB_FLASHFILE
/home/harter/work/git/RIOT/examples/hello-world/bin/wsn430-v1_3b/hello-world.hex

Issues/PRs references

Part of #8838

@cladmi cladmi added Area: build system Area: Build system Area: tools Area: Supplementary tools labels Jun 17, 2019
@cladmi cladmi added this to the Release 2019.07 milestone Jun 17, 2019
@cladmi cladmi requested a review from MrKevinWeiss June 17, 2019 16:09
@cladmi cladmi added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer labels Jun 17, 2019
@cladmi

cladmi commented Jun 17, 2019

Copy link
Copy Markdown
Contributor Author

Added test for the squash commit.

@cladmi cladmi removed the CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR label Jun 17, 2019
@MrKevinWeiss MrKevinWeiss added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable labels Jun 24, 2019
@MrKevinWeiss

Copy link
Copy Markdown
Contributor

I think it looks good. I cannot test on a board but the tests provided along with the simplicity of the change makes it seem OK to me. Please squash.

@cladmi cladmi force-pushed the pr/mspdebug/flashfile branch from 5cb9048 to 60bf01c Compare June 25, 2019 10:43
Update to use FLASHFILE as file to be flashed on the board.
IOTLAB_FLASHFILE also uses 'FLASHFILE' (and not the default 'ELFFILE').
@cladmi cladmi force-pushed the pr/mspdebug/flashfile branch from 60bf01c to 6538d71 Compare June 25, 2019 10:43
@cladmi cladmi removed the CI: needs squashing Commits in this PR need to be squashed; If set, CI systems will mark this PR as unmergable label Jun 25, 2019
@cladmi

cladmi commented Jun 25, 2019

Copy link
Copy Markdown
Contributor Author

Squashed and rebased.

@MrKevinWeiss MrKevinWeiss left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

ACK

@MrKevinWeiss MrKevinWeiss added CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR and removed CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR labels Jun 25, 2019
@MrKevinWeiss MrKevinWeiss merged commit 90e8da0 into RIOT-OS:master Jun 25, 2019
@cladmi

cladmi commented Jun 25, 2019

Copy link
Copy Markdown
Contributor Author

Thank you for the review.

@cladmi cladmi deleted the pr/mspdebug/flashfile branch June 25, 2019 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: build system Area: Build system 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 Impact: minor The PR is small in size and might only require a quick look of a knowledgeable reviewer

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants