aboutsummaryrefslogtreecommitdiff
path: root/keyboards/matrix
diff options
context:
space:
mode:
authorRyan <fauxpark@gmail.com>2020-09-19 13:00:18 +1000
committerGitHub <noreply@github.com>2020-09-18 20:00:18 -0700
commit0140baf7e0b041df841f8782743344a4ebe4ebe1 (patch)
tree91d933bc255432b751e8535dff501bbb0206d7a3 /keyboards/matrix
parentb0024470ed347271e29b2de4d0442f855a26345c (diff)
downloadqmk_firmware-0140baf7e0b041df841f8782743344a4ebe4ebe1.tar.gz
qmk_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.mk27
-rw-r--r--keyboards/matrix/noah/rules.mk27
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 @@
1## chip/board settings 1# MCU name
2# - the next two should match the directories in 2MCU = STM32F411
3# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
4MCU_FAMILY = STM32
5MCU_SERIES = STM32F4xx
6 3
7# Linker script to use 4# Linker script to use
8# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ 5# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
9# or <this_dir>/ld/ 6# or <this_dir>/ld/
10MCU_LDSCRIPT = m20add_boot 7MCU_LDSCRIPT = m20add_boot
11 8
12# Startup code to use
13# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
14MCU_STARTUP = stm32f4xx
15
16# Board: it should exist either in <chibios>/os/hal/boards/ 9# Board: it should exist either in <chibios>/os/hal/boards/
17# or <this_dir>/boards 10# or <this_dir>/boards
18BOARD = m20add_bd 11BOARD = m20add_bd
19 12
20# Cortex version
21MCU = cortex-m4
22
23# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
24ARMV = 7
25
26USE_FPU = yes
27
28# Vector table for application
29# 0x00000000-0x00001000 area is occupied by bootlaoder.*/
30OPT_DEFS =
31
32# Options to pass to dfu-util when flashing
33#DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
34#DFU_SUFFIX_ARGS = -p DF11 -v 0483
35
36# Build Options 13# Build Options
37# comment out to disable the options. 14# comment out to disable the options.
38# 15#
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 @@
1## chip/board settings 1# MCU name
2# - the next two should match the directories in 2MCU = STM32F411
3# <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES)
4MCU_FAMILY = STM32
5MCU_SERIES = STM32F4xx
6 3
7# Linker script to use 4# Linker script to use
8# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ 5# - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/
9# or <this_dir>/ld/ 6# or <this_dir>/ld/
10MCU_LDSCRIPT = noah_boot 7MCU_LDSCRIPT = noah_boot
11 8
12# Startup code to use
13# - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/
14MCU_STARTUP = stm32f4xx
15
16# Board: it should exist either in <chibios>/os/hal/boards/ 9# Board: it should exist either in <chibios>/os/hal/boards/
17# or <this_dir>/boards 10# or <this_dir>/boards
18BOARD = noah_bd 11BOARD = noah_bd
19 12
20# Cortex version
21MCU = cortex-m4
22
23# ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7
24ARMV = 7
25
26USE_FPU = yes
27
28# Vector table for application
29# 0x00000000-0x00001000 area is occupied by bootlaoder.*/
30OPT_DEFS =
31
32# Options to pass to dfu-util when flashing
33#DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave
34#DFU_SUFFIX_ARGS = -p DF11 -v 0483
35
36# Build Options 13# Build Options
37# comment out to disable the options. 14# comment out to disable the options.
38# 15#