Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bootloaders/riotboot_dfu: fixes including sys/usb/usbus/dfu #18964

Merged
merged 8 commits into from
Dec 2, 2022
Prev Previous commit
Next Next commit
boards: make DFU_USB_ID and DFU_USE_DFUSE overridable
  • Loading branch information
gschorcht committed Nov 30, 2022
commit 941d6be666c86a06489c41eac95ca31962fc3015
3 changes: 2 additions & 1 deletion boards/common/blxxxpill/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ INCLUDES += -I$(RIOTBOARD)/common/blxxxpill/include
# For older versions of the DFU bootloader, set DFU_USB_ID to 1d50:6017
DFU_USB_ID ?= 1eaf:0003
DFU_ALT ?= 2
DFU_USE_DFUSE = 1
DFU_USE_DFUSE ?= 1

# If using STM32duino bootloader, this change is necessary.
# Bootloader available at
# github.com/rogerclarkmelbourne/STM32duino-bootloader/tree/master/binaries
Expand Down
2 changes: 1 addition & 1 deletion boards/common/weact-f4x1cx/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ INCLUDES += -I$(RIOTBOARD)/common/weact-f4x1cx/include
# default to flashing over USB
PROGRAMMER ?= dfu-util
DFU_USB_ID ?= 0483:df11
DFU_USE_DFUSE = 1
DFU_USE_DFUSE ?= 1
ROM_OFFSET ?= 0x0

# CDC ACM is available faster on STM32
Expand Down
4 changes: 2 additions & 2 deletions boards/nz32-sc151/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))

# this board is flashed using DFU
PROGRAMMER ?= dfu-util
DFU_USB_ID = 0483:df11
DFU_USE_DFUSE = 1
DFU_USB_ID ?= 0483:df11
DFU_USE_DFUSE ?= 1

# dfu-util programmer is supported
PROGRAMMERS_SUPPORTED += dfu-util
4 changes: 2 additions & 2 deletions boards/pyboard/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.SLAB_USBtoUART*)))
# this board is flashed using DFU
PROGRAMMER ?= dfu-util
PROGRAMMERS_SUPPORTED += dfu-util
DFU_USB_ID = 1d50:607f
DFU_USE_DFUSE = 1
DFU_USB_ID ?= 1d50:607f
DFU_USE_DFUSE ?= 1
4 changes: 2 additions & 2 deletions boards/spark-core/Makefile.include
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ROM_OFFSET ?= 0x5000

# this board is flashed using DFU
PROGRAMMER ?= dfu-util
DFU_USB_ID = 1d50:607f
DFU_USE_DFUSE = 1
DFU_USB_ID ?= 1d50:607f
DFU_USE_DFUSE ?= 1

PROGRAMMERS_SUPPORTED += dfu-util