summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-10-15 12:55:31 +1100
committerGitHub <noreply@github.com>2020-10-15 02:55:31 +0100
commitb0dbe7365b56d181928e8fee06d03df6ba92ea62 (patch)
tree64f5df7fb7b698bb8a76816593f1e99fd90fb86c
parentaf2c50638353ce2a277392ff0ecbc10f91f92413 (diff)
downloadqmk_firmware-b0dbe7365b56d181928e8fee06d03df6ba92ea62.tar.gz
qmk_firmware-b0dbe7365b56d181928e8fee06d03df6ba92ea62.zip
Fix STM32duino bootloader (#10648)
-rw-r--r--bootloader.mk2
-rw-r--r--keyboards/wolfmarkclub/wm1/rules.mk4
2 files changed, 2 insertions, 4 deletions
diff --git a/bootloader.mk b/bootloader.mk
index ab1ced0ea4..5487f9ece6 100644
--- a/bootloader.mk
+++ b/bootloader.mk
@@ -110,7 +110,7 @@ endif
ifeq ($(strip $(BOOTLOADER)), stm32duino)
OPT_DEFS += -DBOOTLOADER_STM32DUINO
- MCU_LDSCRIPT ?= STM32F103x8_stm32duino_bootloader
+ MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
BOARD = STM32_F103_STM32DUINO
# STM32F103 does NOT have an USB bootloader in ROM (only serial), so setting anything here does not make much sense
STM32_BOOTLOADER_ADDRESS = 0x80000000
diff --git a/keyboards/wolfmarkclub/wm1/rules.mk b/keyboards/wolfmarkclub/wm1/rules.mk
index 9394bbd716..d0a9f22660 100644
--- a/keyboards/wolfmarkclub/wm1/rules.mk
+++ b/keyboards/wolfmarkclub/wm1/rules.mk
@@ -1,11 +1,9 @@
# MCU name
MCU = STM32F103
-# Bootloader selection
-BOOTLOADER = stm32duino
-
# GENERIC STM32F103C8T6 board - mass storage bootloader
MCU_LDSCRIPT = wm1_f103
+BOARD = STM32_F103_STM32DUINO
PROGRAM_CMD = echo 'CLI flashing not supported' >&2