riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

boards/blxxxpill: remove dfu-util conditionals

Browse Source
This commit is contained in:
Alexandre Abadie 2021-02-18 18:00:47 +01:00
parent 6b6abed29b
commit a657ff39d6
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
boards/common/blxxxpill/Makefile.include
View File

@ -1,13 +1,11 @@
INCLUDES += -I$(RIOTBOARD)/common/stm32/include INCLUDES += -I$(RIOTBOARD)/common/stm32/include
INCLUDES += -I$(RIOTBOARD)/common/blxxxpill/include INCLUDES += -I$(RIOTBOARD)/common/blxxxpill/include
ifeq (dfu-util,$(PROGRAMMER)) # DFU programmer specific variables
# For older versions of the DFU bootloader, set DFU_USB_ID to 1d50:6017 # For older versions of the DFU bootloader, set DFU_USB_ID to 1d50:6017
DFU_USB_ID ?= 1eaf:0003 DFU_USB_ID ?= 1eaf:0003
DFU_ALT ?= 2 DFU_ALT ?= 2
DFU_USE_DFUSE = 1 DFU_USE_DFUSE = 1
# Leave some space at the beginning of the flash for the bootloader
ROM_OFFSET ?= 0x2000
# If using STM32duino bootloader, this change is necessary. # If using STM32duino bootloader, this change is necessary.
# Bootloader available at # Bootloader available at
# github.com/rogerclarkmelbourne/STM32duino-bootloader/tree/master/binaries # github.com/rogerclarkmelbourne/STM32duino-bootloader/tree/master/binaries
@ -17,6 +15,10 @@ ifeq (dfu-util,$(PROGRAMMER))
# from this software reset. # from this software reset.
DFU_UTIL_FLAGS_OPTS += --reset DFU_UTIL_FLAGS_OPTS += --reset
endif endif
ifeq (dfu-util,$(PROGRAMMER))
# Leave some space at the beginning of the flash for the bootloader
ROM_OFFSET ?= 0x2000
endif endif
STLINK_VERSION ?= 2 STLINK_VERSION ?= 2