瀏覽代碼

Fix STM32duino bootloader (#10648)

Ryan 4 年之前
父節點
當前提交
b0dbe7365b
共有 2 個文件被更改,包括 2 次插入4 次删除
  1. 1 1
      bootloader.mk
  2. 1 3
      keyboards/wolfmarkclub/wm1/rules.mk

+ 1 - 1
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

+ 1 - 3
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