diff options
| author | Joel Challis <git@zvecr.com> | 2023-03-18 21:19:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-18 21:19:26 +0000 |
| commit | 50cb8a3bf5ec3b6229af882e6a1367d4aedd3f53 (patch) | |
| tree | 87467756e06e883726fcd024260ea08ed5907847 /platforms/chibios/mcu_selection.mk | |
| parent | 2c19e5d1c3361dbbde04c53df79f02bfcbeb08b3 (diff) | |
Remove bootloader logic from `mcu_selection.mk` (#20150)
* Remove bootloader logic from mcu_selection.mk
* Move MCU/BOOTLOADER to info.json
Diffstat (limited to 'platforms/chibios/mcu_selection.mk')
| -rw-r--r-- | platforms/chibios/mcu_selection.mk | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/platforms/chibios/mcu_selection.mk b/platforms/chibios/mcu_selection.mk index 6b6488466b..5f7bd1d44e 100644 --- a/platforms/chibios/mcu_selection.mk +++ b/platforms/chibios/mcu_selection.mk @@ -273,11 +273,7 @@ ifneq ($(findstring STM32F103, $(MCU)),) # Linker script to use # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/ # or <keyboard_dir>/ld/ - ifeq ($(strip $(BOOTLOADER)), uf2boot) - MCU_LDSCRIPT ?= STM32F103xB_uf2boot - else - MCU_LDSCRIPT ?= STM32F103x8 - endif + MCU_LDSCRIPT ?= STM32F103x8 # Startup code to use # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ @@ -311,11 +307,7 @@ ifneq ($(findstring STM32F303, $(MCU)),) # Linker script to use # - it should exist either in <chibios>/os/common/startup/ARMCMx/compilers/GCC/ld/ # or <keyboard_dir>/ld/ - ifeq ($(strip $(BOOTLOADER)), tinyuf2) - MCU_LDSCRIPT ?= STM32F303xC_tinyuf2 - else - MCU_LDSCRIPT ?= STM32F303xC - endif + MCU_LDSCRIPT ?= STM32F303xC # Startup code to use # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ @@ -352,11 +344,7 @@ ifneq ($(findstring STM32F401, $(MCU)),) # Linker script to use # - 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 - else - MCU_LDSCRIPT ?= STM32F401xC - endif + MCU_LDSCRIPT ?= STM32F401xC # Startup code to use # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ @@ -471,11 +459,7 @@ ifneq ($(findstring STM32F411, $(MCU)),) # Linker script to use # - 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 - else - MCU_LDSCRIPT ?= STM32F411xE - endif + MCU_LDSCRIPT ?= STM32F411xE # Startup code to use # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ |