openocd: get flash and debug files from cli by cladmi · Pull Request #10539 · RIOT-OS/RIOT

cladmi · 2018-12-03T16:14:19Z

Contribution description

Get FLASH_FILE and ELFFILE from command line instead of environment variable.

The documentation was claiming ELFFILE was given as a command line argument
already, but is was not.

EDIT: this also includes hifive1 specific flasher based on openocd as they share FFLAGS.

Testing procedure

I tested on iotlab-m3 with flash and debug.
I also ran the command for the seeeduino_arch-pro has it had specific changes.

I checked and no boards | Makefile.include is setting IMAGE_FILE anymore too.

iotlab-m3 check

To get a more verbose comparison I used:

BOARD=iotlab-m3 make --no-print-directory -C examples/default/ flash-only FLASHER='bash -x $(RIOTTOOLS)/openocd/openocd.sh'

BOARD=iotlab-m3 make --no-print-directory -C examples/default/ debug DEBUGGER='bash -x $(RIOTTOOLS)/openocd/openocd.sh'

The difference for flash between master and this PR was this one (without the speed and time diff)

1c1
< bash -x /home/harter/work/git/RIOT/dist/tools/openocd/openocd.sh flash
---
> bash -x /home/harter/work/git/RIOT/dist/tools/openocd/openocd.sh flash /home/harter/work/git/RIOT/examples/default/bin/iotlab-m3/default.elf
17d16
< + : /home/harter/work/git/RIOT/examples/default/bin/iotlab-m3/default.elf
19a19
> + shift
23c23,24
< + do_flash
---
> + do_flash /home/harter/work/git/RIOT/examples/default/bin/iotlab-m3/default.elf
> + IMAGE_FILE=/home/harter/work/git/RIOT/examples/default/bin/iotlab-m3/default.elf

and for debug, after removing the difference for the tmp directory name:

1c1
< bash -x /home/harter/work/git/RIOT/dist/tools/openocd/openocd.sh debug
---
> bash -x /home/harter/work/git/RIOT/dist/tools/openocd/openocd.sh debug /home/harter/work/git/RIOT/examples/default/bin/iotlab-m3/default.elf
17d16
< + : /home/harter/work/git/RIOT/examples/default/bin/iotlab-m3/default.elf
19a19
> + shift
23c23,24
< + do_debug
---
> + do_debug /home/harter/work/git/RIOT/examples/default/bin/iotlab-m3/default.elf
> + ELFFILE=/home/harter/work/git/RIOT/examples/default/bin/iotlab-m3/default.elf

seeeduino_arch-pro check

For the seeeduino_arch-pro it is using the hexfile as is master. The command output was this one (without the board):

1c1
< bash -x /home/harter/work/git/RIOT/dist/tools/openocd/openocd.sh flash
---
> bash -x /home/harter/work/git/RIOT/dist/tools/openocd/openocd.sh flash /home/harter/work/git/RIOT/examples/default/bin/seeeduino_arch-pro/default.hex
17d16
< + : /home/harter/work/git/RIOT/examples/default/bin/seeeduino_arch-pro/default.hex
19a19
> + shift
23c23,24
< + do_flash
---
> + do_flash /home/harter/work/git/RIOT/examples/default/bin/seeeduino_arch-pro/default.hex
> + IMAGE_FILE=/home/harter/work/git/RIOT/examples/default/bin/seeeduino_arch-pro/default.hex

hifive1 check

2c2
< bash -x /home/harter/work/git/worktree/riot_master/boards/hifive1/dist/flasher.sh flash
---
> bash -x /home/harter/work/git/worktree/riot_master/boards/hifive1/dist/flasher.sh flash /home/harter/work/git/worktree/riot_master/examples/default/bin/hifive1/default.elf
6d5
< + : /home/harter/work/git/worktree/riot_master/examples/default/bin/hifive1/default.elf
8a8
> + shift
12c12,13
< + do_flash
---
> + do_flash /home/harter/work/git/worktree/riot_master/examples/default/bin/hifive1/default.elf
> + IMAGE_FILE=/home/harter/work/git/worktree/riot_master/examples/default/bin/hifive1/default.elf

Issues/PRs references

Split out of #8838

cladmi · 2018-12-03T16:23:42Z

I rebased on top of the last master to be a base for other PRs.

cladmi · 2018-12-03T17:19:30Z

By debugging the other required files, I think I should also include the changes for the hifive1 board in this one.
It uses a separate openocd.sh flash script but uses openocd.inc.mk file FFLAGS variable anyway.

cladmi · 2018-12-03T17:27:06Z

@kenrabold can you check flashing is still working for the hifive1 with this change, would be great!

aabadie

No particular comment on the code changes, they are all good.

I tested flash and debug on a nucleo board and all worked the same as in master.

ACK, but before merging, let's wait a bit for @kenrabold test on hifive.

aabadie · 2018-12-04T16:51:32Z

I'll merge this one tomorrow if no one objects.

aabadie · 2018-12-05T06:57:33Z

boards/hifive1/dist/flasher.sh

+    do_flash "$@"
    ;;
  *)
    echo "Usage: $0 flash"


Maybe also update the "usage" message ?

I forgot this one indeed.

No problem, now it's time to squash !

Get FLASH_FILE and ELFFILE from command line instead of environment variable. The documentation was claiming ELFFILE was given as a command line argument already, but is was not.

Get FLASH_FILE from command line instead of environment variable. The documentation was claiming ELFFILE was given as a command line argument already, but is was not. This is the same change as with `openocd.sh`.

cladmi · 2018-12-05T15:21:42Z

Squashed and rebased.

cladmi · 2018-12-05T16:16:36Z

Failing to an unrelated native xtimer test, re-triggering murdock.

cladmi · 2018-12-05T17:44:14Z

Failing again because of xtimer_usleep/native

https://ci.riot-os.org/RIOT-OS/RIOT/10539/0b664453dc19dea31b8045884e46cbf02a8c2704/output/compile/tests/xtimer_usleep/native:llvm.txt

Re-triggering again.

aabadie · 2018-12-05T19:32:49Z

It's all green ! Thanks @cladmi for restarting the CI.

cladmi · 2018-12-06T13:07:06Z

Thanks for the review :)

cladmi added Area: build system Area: Build system CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Area: tools Area: Supplementary tools Area: boards Area: Board ports labels Dec 3, 2018

cladmi requested a review from aabadie December 3, 2018 16:14

cladmi mentioned this pull request Dec 3, 2018

Makefiles: add support to generate both .hex and .bin file and add FLASHFILE variable #8838

Merged

49 tasks

cladmi force-pushed the pr/make/openocd/flashfile_from_cli branch from d0b0c69 to c98b038 Compare December 3, 2018 16:18

cladmi mentioned this pull request Dec 3, 2018

make/flash: make flasher take the file used for flashing from command line argument #9514

Closed

aabadie approved these changes Dec 4, 2018

View reviewed changes

miri64 added the Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation label Dec 4, 2018

aabadie reviewed Dec 5, 2018

View reviewed changes

cladmi added 2 commits December 5, 2018 16:21

openocd: get flash and debug files from cli

a0b97ad

Get FLASH_FILE and ELFFILE from command line instead of environment variable. The documentation was claiming ELFFILE was given as a command line argument already, but is was not.

hifive1/flasher.sh: get flash file from cli

0b66445

Get FLASH_FILE from command line instead of environment variable. The documentation was claiming ELFFILE was given as a command line argument already, but is was not. This is the same change as with `openocd.sh`.

cladmi force-pushed the pr/make/openocd/flashfile_from_cli branch from a54658f to 0b66445 Compare December 5, 2018 15:21

cladmi mentioned this pull request Dec 5, 2018

bootloader: add riotboot minimal bootloader #10065

Merged

3 tasks

cladmi 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 Dec 5, 2018

cladmi mentioned this pull request Dec 5, 2018

tests/xtimer_now64_continuity|xtimer_usleep: disable running test on native #10552

Merged

aabadie merged commit 49aa583 into RIOT-OS:master Dec 5, 2018

cladmi deleted the pr/make/openocd/flashfile_from_cli branch December 6, 2018 13:07

aabadie added this to the Release 2019.01 milestone Dec 19, 2018

Conversation

cladmi commented Dec 3, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Contribution description

Testing procedure

iotlab-m3 check

seeeduino_arch-pro check

hifive1 check

Issues/PRs references

Uh oh!

cladmi commented Dec 3, 2018

Uh oh!

cladmi commented Dec 3, 2018

Uh oh!

cladmi commented Dec 3, 2018

Uh oh!

aabadie left a comment

Choose a reason for hiding this comment

Uh oh!

aabadie commented Dec 4, 2018

Uh oh!

aabadie Dec 5, 2018

Choose a reason for hiding this comment

Uh oh!

cladmi Dec 5, 2018

Choose a reason for hiding this comment

Uh oh!

aabadie Dec 5, 2018

Choose a reason for hiding this comment

Uh oh!

cladmi commented Dec 5, 2018

Uh oh!

cladmi commented Dec 5, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cladmi commented Dec 5, 2018

Uh oh!

aabadie commented Dec 5, 2018

Uh oh!

cladmi commented Dec 6, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

cladmi commented Dec 3, 2018 •

edited

Loading

cladmi commented Dec 5, 2018 •

edited

Loading