summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-10-26 23:11:25 +0000
committerQMK Bot <hello@qmk.fm>2021-10-26 23:11:25 +0000
commit462323418e2fa3f79ad1db369109805e3e50c8cd (patch)
treeb5df39f33fe2b8fd2cd49a1bc56a9bc21c37f319
parent0bbfe855b2a3248722ae49ce48a54b7f5d8616ad (diff)
parent015c4cf5beab530916b6c539583f9b7179bf42d3 (diff)
downloadqmk_firmware-462323418e2fa3f79ad1db369109805e3e50c8cd.tar.gz
qmk_firmware-462323418e2fa3f79ad1db369109805e3e50c8cd.zip
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--quantum/mcu_selection.mk25
1 files changed, 12 insertions, 13 deletions
diff --git a/quantum/mcu_selection.mk b/quantum/mcu_selection.mk
index 7c4a617af0..1251b7a2b7 100644
--- a/quantum/mcu_selection.mk
+++ b/quantum/mcu_selection.mk
@@ -122,7 +122,7 @@ ifneq ($(findstring STM32F042, $(MCU)),)
MCU_SERIES = STM32F0xx
# Linker script to use
- # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+ # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32F042x6
@@ -159,7 +159,7 @@ ifneq ($(findstring STM32F072, $(MCU)),)
MCU_SERIES = STM32F0xx
# Linker script to use
- # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+ # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32F072xB
@@ -191,7 +191,7 @@ ifneq ($(findstring STM32F103, $(MCU)),)
MCU_SERIES = STM32F1xx
# Linker script to use
- # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+ # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32F103x8
@@ -223,7 +223,7 @@ ifneq ($(findstring STM32F303, $(MCU)),)
MCU_SERIES = STM32F3xx
# Linker script to use
- # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+ # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32F303xC
@@ -255,7 +255,7 @@ ifneq ($(findstring STM32F401, $(MCU)),)
MCU_SERIES = STM32F4xx
# Linker script to use
- # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+ # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
ifeq ($(strip $(BOOTLOADER)), tinyuf2)
MCU_LDSCRIPT ?= STM32F401xC_tinyuf2
@@ -324,7 +324,7 @@ ifneq ($(findstring STM32F407, $(MCU)),)
MCU_SERIES = STM32F4xx
# Linker script to use
- # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+ # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32F407xE
@@ -356,7 +356,7 @@ ifneq ($(findstring STM32F411, $(MCU)),)
MCU_SERIES = STM32F4xx
# Linker script to use
- # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+ # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
ifeq ($(strip $(BOOTLOADER)), tinyuf2)
MCU_LDSCRIPT ?= STM32F411xE_tinyuf2
@@ -393,8 +393,7 @@ ifneq ($(findstring STM32F446, $(MCU)),)
MCU_SERIES = STM32F4xx
# Linker script to use
- # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
- # or <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
+ # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32F446xE
@@ -423,7 +422,7 @@ ifneq ($(findstring STM32G431, $(MCU)),)
MCU_SERIES = STM32G4xx
# Linker script to use
- # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+ # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32G431xB
@@ -455,7 +454,7 @@ ifneq ($(findstring STM32G474, $(MCU)),)
MCU_SERIES = STM32G4xx
# Linker script to use
- # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+ # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32G474xE
@@ -487,7 +486,7 @@ ifneq (,$(filter $(MCU),STM32L433 STM32L443))
MCU_SERIES = STM32L4xx
# Linker script to use
- # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+ # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32L432xC
@@ -521,7 +520,7 @@ ifneq (,$(filter $(MCU),STM32L412 STM32L422))
MCU_SERIES = STM32L4xx
# Linker script to use
- # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
+ # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/
# or <keyboard_dir>/ld/
MCU_LDSCRIPT ?= STM32L412xB