Henry-Hiles/qmk_userspace
1
0
Fork 0
forked from mirrors/qmk_userspace
Code Pull requests Activity

Fix STM32duino bootloader (#10648)

Browse source
This commit is contained in:
Ryan 2020-10-15 12:55:31 +11:00 • committed by GitHub
commit b0dbe7365b
Failed to generate hash of commit
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bootloader.mk
View file

@ -110,7 +110,7 @@ endif
ifeq ($(strip $(BOOTLOADER)), stm32duino) ifeq ($(strip $(BOOTLOADER)), stm32duino)
OPT_DEFS += -DBOOTLOADER_STM32DUINO OPT_DEFS += -DBOOTLOADER_STM32DUINO
MCU_LDSCRIPT ?= STM32F103x8_stm32duino_bootloader MCU_LDSCRIPT = STM32F103x8_stm32duino_bootloader
BOARD = STM32_F103_STM32DUINO BOARD = STM32_F103_STM32DUINO
# STM32F103 does NOT have an USB bootloader in ROM (only serial), so setting anything here does not make much sense # STM32F103 does NOT have an USB bootloader in ROM (only serial), so setting anything here does not make much sense
STM32_BOOTLOADER_ADDRESS = 0x80000000 STM32_BOOTLOADER_ADDRESS = 0x80000000

4
keyboards/wolfmarkclub/wm1/rules.mk
View file

@ -1,11 +1,9 @@
# MCU name # MCU name
MCU = STM32F103 MCU = STM32F103
# Bootloader selection
BOOTLOADER = stm32duino
# GENERIC STM32F103C8T6 board - mass storage bootloader # GENERIC STM32F103C8T6 board - mass storage bootloader
MCU_LDSCRIPT = wm1_f103 MCU_LDSCRIPT = wm1_f103
BOARD = STM32_F103_STM32DUINO
PROGRAM_CMD = echo 'CLI flashing not supported' >&2 PROGRAM_CMD = echo 'CLI flashing not supported' >&2