Skip to content

boards/samd21-bootloader*: small cleanup#13794

Merged
fjmolinas merged 2 commits intoRIOT-OS:masterfrom
aabadie:pr/boards/samd21_bootloader_cleanup
Apr 6, 2020
Merged

boards/samd21-bootloader*: small cleanup#13794
fjmolinas merged 2 commits intoRIOT-OS:masterfrom
aabadie:pr/boards/samd21_bootloader_cleanup

Conversation

@aabadie
Copy link
Contributor

@aabadie aabadie commented Apr 2, 2020

Contribution description

This PR is a follow-up of #13664 and #13791 for samd21 boards that are using the arduino bootloader:

Testing procedure

  • The code for managing the arduino bootloader is correctly built by default:
feather-m0
$ make BOARD=feather-m0 -C examples/hello-world
make: Entering directory '/work/riot/RIOT/examples/hello-world'
Building application "hello-world" for "feather-m0" with MCU "samd21".

"make" -C /work/riot/RIOT/boards/feather-m0
"make" -C /work/riot/RIOT/boards/common/samd21-arduino-bootloader
"make" -C /work/riot/RIOT/core
"make" -C /work/riot/RIOT/cpu/samd21
"make" -C /work/riot/RIOT/cpu/cortexm_common
"make" -C /work/riot/RIOT/cpu/cortexm_common/periph
"make" -C /work/riot/RIOT/cpu/sam0_common
"make" -C /work/riot/RIOT/cpu/sam0_common/periph
"make" -C /work/riot/RIOT/cpu/samd21/periph
"make" -C /work/riot/RIOT/drivers
"make" -C /work/riot/RIOT/drivers/periph_common
"make" -C /work/riot/RIOT/sys
"make" -C /work/riot/RIOT/sys/auto_init
"make" -C /work/riot/RIOT/sys/auto_init/usb
"make" -C /work/riot/RIOT/sys/event
"make" -C /work/riot/RIOT/sys/isrpipe
"make" -C /work/riot/RIOT/sys/newlib_syscalls_default
"make" -C /work/riot/RIOT/sys/pm_layered
"make" -C /work/riot/RIOT/sys/tsrb
"make" -C /work/riot/RIOT/sys/usb/usbus
"make" -C /work/riot/RIOT/sys/usb/usbus/cdc/acm
"make" -C /work/riot/RIOT/sys/usb_board_reset
   text	   data	    bss	    dec	    hex	filename
  15316	    132	   5868	  21316	   5344	/work/riot/RIOT/examples/hello-world/bin/feather-m0/hello-world.elf
  • The bootloader is correctly removed from build when another stdio module is used, for example stdio_null:
feather-m0
$ USEMODULE=stdio_null make BOARD=feather-m0 -C examples/hello-world
make: Entering directory '/work/riot/RIOT/examples/hello-world'
Building application "hello-world" for "feather-m0" with MCU "samd21".

"make" -C /work/riot/RIOT/boards/feather-m0
"make" -C /work/riot/RIOT/core
"make" -C /work/riot/RIOT/cpu/samd21
"make" -C /work/riot/RIOT/cpu/cortexm_common
"make" -C /work/riot/RIOT/cpu/cortexm_common/periph
"make" -C /work/riot/RIOT/cpu/sam0_common
"make" -C /work/riot/RIOT/cpu/sam0_common/periph
"make" -C /work/riot/RIOT/cpu/samd21/periph
"make" -C /work/riot/RIOT/drivers
"make" -C /work/riot/RIOT/drivers/periph_common
"make" -C /work/riot/RIOT/sys
"make" -C /work/riot/RIOT/sys/auto_init
"make" -C /work/riot/RIOT/sys/newlib_syscalls_default
"make" -C /work/riot/RIOT/sys/pm_layered
"make" -C /work/riot/RIOT/sys/stdio_null
   text	   data	    bss	    dec	    hex	filename
   7748	    112	   2544	  10404	   28a4	/work/riot/RIOT/examples/hello-world/bin/feather-m0/hello-world.elf
  • Same when the slipdev_stdio module is used:
feather-m0
$ USEMODULE=slipdev_stdio make BOARD=feather-m0 -C examples/hello-world
make: Entering directory '/work/riot/RIOT/examples/hello-world'
Building application "hello-world" for "feather-m0" with MCU "samd21".

"make" -C /work/riot/RIOT/boards/feather-m0
"make" -C /work/riot/RIOT/core
"make" -C /work/riot/RIOT/cpu/samd21
"make" -C /work/riot/RIOT/cpu/cortexm_common
"make" -C /work/riot/RIOT/cpu/cortexm_common/periph
"make" -C /work/riot/RIOT/cpu/sam0_common
"make" -C /work/riot/RIOT/cpu/sam0_common/periph
"make" -C /work/riot/RIOT/cpu/samd21/periph
"make" -C /work/riot/RIOT/drivers
"make" -C /work/riot/RIOT/drivers/periph_common
"make" -C /work/riot/RIOT/drivers/slipdev
"make" -C /work/riot/RIOT/sys
"make" -C /work/riot/RIOT/sys/auto_init
"make" -C /work/riot/RIOT/sys/isrpipe
"make" -C /work/riot/RIOT/sys/newlib_syscalls_default
"make" -C /work/riot/RIOT/sys/pm_layered
"make" -C /work/riot/RIOT/sys/tsrb
   text	   data	    bss	    dec	    hex	filename
   9184	    132	   2620	  11936	   2ea0	/work/riot/RIOT/examples/hello-world/bin/feather-m0/hello-world.elf

Issues/PRs references

Follow-up of #13664 and #13791

@aabadie aabadie added Area: build system Area: Build system Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation CI: ready for build If set, CI server will compile all applications for all available boards for the labeled PR Area: boards Area: Board ports labels Apr 2, 2020
@aabadie aabadie requested a review from fjmolinas April 2, 2020 14:49
Copy link
Contributor

@fjmolinas fjmolinas left a comment

Choose a reason for hiding this comment

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

ACK, thanks for the cleanup.

@fjmolinas fjmolinas merged commit 2165327 into RIOT-OS:master Apr 6, 2020
@leandrolanzieri leandrolanzieri added this to the Release 2020.04 milestone Apr 7, 2020
@aabadie aabadie deleted the pr/boards/samd21_bootloader_cleanup branch June 24, 2020 06:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Area: boards Area: Board ports 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 Type: cleanup The issue proposes a clean-up / The PR cleans-up parts of the codebase / documentation

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants