Skip to content

Commit

Permalink
boards: remove conditional for st-link version
Browse files Browse the repository at this point in the history
  • Loading branch information
aabadie committed Feb 23, 2021
1 parent 74274d9 commit 7201acd
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
5 changes: 2 additions & 3 deletions boards/common/blxxxpill/Makefile.include
Expand Up @@ -17,10 +17,9 @@ ifeq (dfu-util,$(PROGRAMMER))
# from this software reset.
FFLAGS_OPTS += --reset
endif

else ifeq (openocd,$(PROGRAMMER))
STLINK_VERSION ?= 2
endif

STLINK_VERSION ?= 2

# Setup of programmer and serial is shared between STM32 based boards
include $(RIOTMAKE)/boards/stm32.inc.mk
3 changes: 2 additions & 1 deletion boards/msbiot/Makefile.include
Expand Up @@ -4,8 +4,9 @@ INCLUDES += -I$(RIOTBOARD)/common/stm32/include
PROGRAMMER ?= openocd

OPENOCD_DEBUG_ADAPTER ?= stlink
STLINK_VERSION ?= 2

ifeq (openocd,$(PROGRAMMER))
STLINK_VERSION ?= 2
PORT_LINUX ?= /dev/ttyUSB0
endif

Expand Down

0 comments on commit 7201acd

Please sign in to comment.