From b50f1e0b897a78811906588fd6bc6bf8ccad9bd2 Mon Sep 17 00:00:00 2001
From: mcudev <29890609+mcudev@users.noreply.github.com>
Date: Wed, 4 Jul 2018 15:21:01 -0400
Subject: [PATCH] openocd: separate stlink configs deprecated - now combined

---
 core/Makefile               | 5 ++---
 docs/core/build/embedded.md | 3 +--
 legacy/Makefile.include     | 3 ++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/Makefile b/core/Makefile
index 2603bf28b..e0c751c7a 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -23,9 +23,8 @@ BITCOIN_ONLY ?= 0
 TREZOR_MODEL ?= T
 TREZOR_MEMPERF ?= 0
 
-STLINK_VER ?= v2
-OPENOCD = openocd -f interface/stlink-$(STLINK_VER).cfg -c "transport select hla_swd" -f target/stm32f4x.cfg
-OPENOCD_T1 = openocd -f interface/stlink-$(STLINK_VER).cfg -c "transport select hla_swd" -f target/stm32f2x.cfg
+OPENOCD = openocd -f interface/stlink.cfg -c "transport select hla_swd" -f target/stm32f4x.cfg
+OPENOCD_T1 = openocd -f interface/stlink.cfg -c "transport select hla_swd" -f target/stm32f2x.cfg
 
 BOARDLOADER_START   = 0x08000000
 BOOTLOADER_START    = 0x08020000
diff --git a/docs/core/build/embedded.md b/docs/core/build/embedded.md
index eebcd0025..1c2edf69a 100644
--- a/docs/core/build/embedded.md
+++ b/docs/core/build/embedded.md
@@ -46,8 +46,7 @@ Use `make upload` to upload the firmware to a production device. Do not forget t
 
 ## Flashing
 
-For flashing firmware to blank device (without bootloader) use `make flash`,
-or `make flash STLINK_VER=v2-1` if using a ST-LINK/V2.1 interface.
+For flashing firmware to blank device (without bootloader) use `make flash`.
 You need to have OpenOCD installed.
 
 ## Building in debug mode
diff --git a/legacy/Makefile.include b/legacy/Makefile.include
index 11e877958..a855c998f 100644
--- a/legacy/Makefile.include
+++ b/legacy/Makefile.include
@@ -28,7 +28,8 @@ OBJCOPY  := $(PREFIX)objcopy
 OBJDUMP  := $(PREFIX)objdump
 AR       := $(PREFIX)ar
 AS       := $(PREFIX)as
-OPENOCD  := openocd -f interface/stlink-v2.cfg -c "transport select hla_swd" -f target/stm32f2x.cfg
+OPENOCD  := openocd -f interface/stlink.cfg -c "transport select hla_swd" -f target/stm32f2x.cfg
+
 GDB      := $(PREFIX)gdb --nx -ex 'set remotetimeout unlimited' -ex 'set confirm off' -ex 'target remote 127.0.0.1:3333' -ex 'monitor reset halt'
 
 CONFFLAG ?= -DCONFIDENTIAL='__attribute__((section("confidential")))'