RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

boards: remove conditional for st-link version

Browse Source
This commit is contained in:
Alexandre Abadie 2021-02-18 17:44:12 +01:00
parent 74274d9e19
commit 7201acdcd0
No known key found for this signature in database
GPG Key ID: 1C919A403CAE1405
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,10 +17,9 @@ ifeq (dfu-util,$(PROGRAMMER))
# from this software reset. # from this software reset.
FFLAGS_OPTS += --reset FFLAGS_OPTS += --reset
endif endif
else ifeq (openocd,$(PROGRAMMER))
STLINK_VERSION ?= 2
endif endif
STLINK_VERSION ?= 2
# Setup of programmer and serial is shared between STM32 based boards # Setup of programmer and serial is shared between STM32 based boards
include $(RIOTMAKE)/boards/stm32.inc.mk include $(RIOTMAKE)/boards/stm32.inc.mk

3
boards/msbiot/Makefile.include
View File

@ -4,8 +4,9 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
PROGRAMMER ?= openocd PROGRAMMER ?= openocd
OPENOCD_DEBUG_ADAPTER ?= stlink OPENOCD_DEBUG_ADAPTER ?= stlink
STLINK_VERSION ?= 2
ifeq (openocd,$(PROGRAMMER)) ifeq (openocd,$(PROGRAMMER))
STLINK_VERSION ?= 2
PORT_LINUX ?= /dev/ttyUSB0 PORT_LINUX ?= /dev/ttyUSB0
endif endif