diff options
| author | Ryan <fauxpark@gmail.com> | 2020-09-19 13:00:18 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-18 20:00:18 -0700 |
| commit | 0140baf7e0b041df841f8782743344a4ebe4ebe1 (patch) | |
| tree | 91d933bc255432b751e8535dff501bbb0206d7a3 /keyboards/matrix | |
| parent | b0024470ed347271e29b2de4d0442f855a26345c (diff) | |
| download | firmware-0140baf7e0b041df841f8782743344a4ebe4ebe1.tar.gz firmware-0140baf7e0b041df841f8782743344a4ebe4ebe1.tar.bz2 firmware-0140baf7e0b041df841f8782743344a4ebe4ebe1.zip | |
Add STM32F401/F411 to mcu_selection.mk (#10278)
* Reorder STM32 MCUs
* Add STM32F4xx to mcu_selection.mk
* Set MCU for phoenix and tkw/stoutgat/v2/f411
Diffstat (limited to 'keyboards/matrix')
| -rw-r--r-- | keyboards/matrix/m20add/rules.mk | 27 | ||||
| -rw-r--r-- | keyboards/matrix/noah/rules.mk | 27 |
2 files changed, 4 insertions, 50 deletions
diff --git a/keyboards/matrix/m20add/rules.mk b/keyboards/matrix/m20add/rules.mk index 6dba15393..fb97c1d3c 100644 --- a/keyboards/matrix/m20add/rules.mk +++ b/keyboards/matrix/m20add/rules.mk @@ -1,38 +1,15 @@ -## chip/board settings -# - the next two should match the directories in -# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) -MCU_FAMILY = STM32 -MCU_SERIES = STM32F4xx +# MCU name +MCU = STM32F411 # Linker script to use # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ # or <this_dir>/ld/ MCU_LDSCRIPT = m20add_boot -# Startup code to use -# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ -MCU_STARTUP = stm32f4xx - # Board: it should exist either in <chibios>/os/hal/boards/ # or <this_dir>/boards BOARD = m20add_bd -# Cortex version -MCU = cortex-m4 - -# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 -ARMV = 7 - -USE_FPU = yes - -# Vector table for application -# 0x00000000-0x00001000 area is occupied by bootlaoder.*/ -OPT_DEFS = - -# Options to pass to dfu-util when flashing -#DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave -#DFU_SUFFIX_ARGS = -p DF11 -v 0483 - # Build Options # comment out to disable the options. # diff --git a/keyboards/matrix/noah/rules.mk b/keyboards/matrix/noah/rules.mk index 094364e11..19e432d2a 100644 --- a/keyboards/matrix/noah/rules.mk +++ b/keyboards/matrix/noah/rules.mk @@ -1,38 +1,15 @@ -## chip/board settings -# - the next two should match the directories in -# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) -MCU_FAMILY = STM32 -MCU_SERIES = STM32F4xx +# MCU name +MCU = STM32F411 # Linker script to use # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ # or <this_dir>/ld/ MCU_LDSCRIPT = noah_boot -# Startup code to use -# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ -MCU_STARTUP = stm32f4xx - # Board: it should exist either in <chibios>/os/hal/boards/ # or <this_dir>/boards BOARD = noah_bd -# Cortex version -MCU = cortex-m4 - -# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 -ARMV = 7 - -USE_FPU = yes - -# Vector table for application -# 0x00000000-0x00001000 area is occupied by bootlaoder.*/ -OPT_DEFS = - -# Options to pass to dfu-util when flashing -#DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave -#DFU_SUFFIX_ARGS = -p DF11 -v 0483 - # Build Options # comment out to disable the options. # |