Fix STM32duino bootloader (#10648)

5 years ago · b0dbe7365b
parent af2c506383
commit b0dbe7365b
2 changed files with 2 additions and 4 deletions
--- 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
--- 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