[riot-notifications] [RIOT-OS/RIOT] makefiles/edbg.inc.mk: use FLASHFILE (#11172)

Gaƫtan Harter notifications at github.com
Wed Mar 13 15:34:15 CET 2019


### 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 edbg would still work with this.

#### Boards using edbg:

```
echo ${EDBG_BOARDS} 
arduino-zero samd21-xpro saml10-xpro saml11-xpro saml21-xpro samr21-xpro samr30-xpro
```

#### Test flashing normal examples with the board

* [x] samr21-xpro @cladmi 
* [ ] ...

#### Test without board

I replaced FLASHER by 'true' to only show the FFLAGS and get the same output with master and this pull request:

```
for board in ${EDBG_BOARDS} ; do echo ${board}; BOARD=${board} make -C examples/hello-world/ --no-print-directory FLASHER=true flash-only; done
arduino-zero
true  -t atmel_cm0p -b -v -p -f /home/harter/work/git/RIOT/examples/hello-world/bin/arduino-zero/hello-world.bin
samd21-xpro
true  -t atmel_cm0p -b -v -p -f /home/harter/work/git/RIOT/examples/hello-world/bin/samd21-xpro/hello-world.bin
saml10-xpro
true  -t mchp_cm23 -b -v -p -f /home/harter/work/git/RIOT/examples/hello-world/bin/saml10-xpro/hello-world.bin
saml11-xpro
true  -t mchp_cm23 -b -v -p -f /home/harter/work/git/RIOT/examples/hello-world/bin/saml11-xpro/hello-world.bin
saml21-xpro
true  -t atmel_cm0p -b -v -p -f /home/harter/work/git/RIOT/examples/hello-world/bin/saml21-xpro/hello-world.bin
samr21-xpro
true  -t atmel_cm0p -b -v -p -f /home/harter/work/git/RIOT/examples/hello-world/bin/samr21-xpro/hello-world.bin
samr30-xpro
true  -t atmel_cm0p -b -v -p -f /home/harter/work/git/RIOT/examples/hello-world/bin/samr30-xpro/hello-world.bin
```

#### `riotboot` test

Test running `tests/riotboot` test for `samr21-xpro` and `saml21-xpro`

```
BOARD=samr21-xpro make -C tests/riotboot flash test

2019-03-13 15:27:51,462 - INFO # main(): This is RIOT! (Version: 2019.04-devel-475-g4af35)
2019-03-13 15:27:51,463 - INFO # Hello riotboot!
2019-03-13 15:27:51,482 - INFO # You are running RIOTmain(): This is RIOT! (Version: 2019.04-devel-475-g4af35)
2019-03-13 15:27:51,483 - INFO # Hello riotboot!
2019-03-13 15:27:51,487 - INFO # You are running RIOT on a(n) samr21-xpro board.
2019-03-13 15:27:51,491 - INFO # This board features a(n) samd21 MCU.
2019-03-13 15:27:51,494 - INFO # riotboot_test: running from slot 0
2019-03-13 15:27:51,497 - INFO # Image magic_number: 0x544f4952
2019-03-13 15:27:51,499 - INFO # Image Version: 0x00000000
2019-03-13 15:27:51,502 - INFO # Image start address: 0x00001100
2019-03-13 15:27:51,504 - INFO # Header chksum: 0x7f7aaea1
2019-03-13 15:27:51,505 - INFO # 
> curslotnr
2019-03-13 15:27:51,527 - INFO #  curslotnr
2019-03-13 15:27:51,529 - INFO # Current slot=0
> curslothdr
curslothdr
2019-03-13 15:27:51,582 - INFO #  curslothdr
2019-03-13 15:27:51,585 - INFO # Image magic_number: 0x544f4952
2019-03-13 15:27:51,587 - INFO # Image Version: 0x00000000
2019-03-13 15:27:51,590 - INFO # Image start address: 0x00001100
2019-03-13 15:27:51,592 - INFO # Header chksum: 0x7f7aaea1
2019-03-13 15:27:51,592 - INFO # 
> getslotaddr 0
getslotaddr 0
2019-03-13 15:27:51,645 - INFO #  getslotaddr 0
2019-03-13 15:27:51,647 - INFO # Slot 0 address=0x00001100
> dumpaddrs
dumpaddrs
2019-03-13 15:27:51,699 - INFO #  dumpaddrs
2019-03-13 15:27:51,703 - INFO # slot 0: metadata: 0x1000 image: 0x00001100
2019-03-13 15:27:51,707 - INFO # slot 1: metadata: 0x20800 image: 0x00000000
> 
```

### Issues/PRs references

Split out of #8838 
You can view, comment on, or merge this pull request online at:

  https://github.com/RIOT-OS/RIOT/pull/11172

-- Commit Summary --

  * riotboot: remove compatibility for HEXFILE as file to flash
  * makefiles/edbg.inc.mk: use FLASHFILE

-- File Changes --

    M makefiles/boot/riotboot.mk (9)
    M makefiles/tools/edbg.inc.mk (4)
    M tests/riotboot/Makefile (2)

-- Patch Links --

https://github.com/RIOT-OS/RIOT/pull/11172.patch
https://github.com/RIOT-OS/RIOT/pull/11172.diff

-- 
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/RIOT-OS/RIOT/pull/11172
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.riot-os.org/pipermail/notifications/attachments/20190313/449384f0/attachment-0001.html>


More information about the notifications mailing list