Skip to content

Commit

Permalink
makefiles/tools/uf2conv.inc.mk: partial riotboot support
Browse files Browse the repository at this point in the history
Individual files need to be converted to uf2 format, targets
flashing individual slots or the bootloader will work:

- riotboot/flash-slot%
- riotboot/flash-bootloader

But not targest flashing combined/extended versions since conversion
of the blob is not possible with the uf2conv.py script.
  • Loading branch information
fjmolinas committed Apr 12, 2021
1 parent 67302bf commit 3d85e13
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion makefiles/boot/riotboot.mk
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ riotboot: $(SLOT_RIOT_BINS)
riotboot/flash-bootloader: riotboot/bootloader/flash
riotboot/bootloader/%: $(BUILDDEPS)
$(Q)/usr/bin/env -i \
QUIET=$(QUIET) PATH="$(PATH)"\
QUIET=$(QUIET) PATH="$(PATH)" USER="$(USER)"\
EXTERNAL_BOARD_DIRS="$(EXTERNAL_BOARD_DIRS)" BOARD=$(BOARD)\
DEBUG_ADAPTER_ID=$(DEBUG_ADAPTER_ID) \
PROGRAMMER=$(PROGRAMMER) PROGRAMMER_QUIET=$(PROGRAMMER_QUIET) \
Expand Down
4 changes: 3 additions & 1 deletion makefiles/tools/uf2conv.inc.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,10 @@ ifneq (,$(FFLAGS_OPTS))
UF2CONV_FLAGS ?= $(FFLAGS_OPTS)
endif

IMAGE_OFFSET ?= $(ROM_OFFSET)

FLASHER ?= $(RIOTTOOLS)/uf2/uf2conv.py
FFLAGS ?= $(UF2CONV_FLAGS) $(FLASHFILE)
FFLAGS ?= $(UF2CONV_FLAGS) $(FLASHFILE) --base $(IMAGE_OFFSET)

PREFLASH_DELAY ?= 2

Expand Down

0 comments on commit 3d85e13

Please sign in to comment.