diff options
| -rw-r--r-- | keyboards/handwired/onekey/blackpill_f401/rules.mk | 30 | ||||
| -rw-r--r-- | keyboards/handwired/onekey/blackpill_f411/rules.mk | 30 | ||||
| -rw-r--r-- | keyboards/handwired/riblee_f401/rules.mk | 32 | ||||
| -rw-r--r-- | keyboards/matrix/m20add/rules.mk | 27 | ||||
| -rw-r--r-- | keyboards/matrix/noah/rules.mk | 27 | ||||
| -rw-r--r-- | keyboards/phoenix/rules.mk | 34 | ||||
| -rw-r--r-- | keyboards/tkw/stoutgat/v2/f411/rules.mk | 30 | ||||
| -rw-r--r-- | keyboards/zvecr/zv48/f401/rules.mk | 30 | ||||
| -rw-r--r-- | keyboards/zvecr/zv48/f411/rules.mk | 30 | ||||
| -rw-r--r-- | quantum/mcu_selection.mk | 126 |
10 files changed, 131 insertions, 265 deletions
diff --git a/keyboards/handwired/onekey/blackpill_f401/rules.mk b/keyboards/handwired/onekey/blackpill_f401/rules.mk index 609262049..6eb37a581 100644 --- a/keyboards/handwired/onekey/blackpill_f401/rules.mk +++ b/keyboards/handwired/onekey/blackpill_f401/rules.mk | |||
| @@ -1,30 +1,8 @@ | |||
| 1 | ## chip/board settings | 1 | # MCU name |
| 2 | # the next two should match the directories in | 2 | MCU = STM32F401 |
| 3 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
| 4 | MCU_FAMILY = STM32 | ||
| 5 | MCU_SERIES = STM32F4xx | ||
| 6 | # linker script to use | ||
| 7 | # it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
| 8 | # or <this_dir>/ld/ | ||
| 9 | MCU_LDSCRIPT = STM32F401xC | ||
| 10 | # startup code to use | ||
| 11 | # is should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
| 12 | MCU_STARTUP = stm32f4xx | ||
| 13 | # it should exist either in <chibios>/os/hal/boards/ | ||
| 14 | # or <this_dir>/boards | ||
| 15 | BOARD = BLACKPILL_STM32_F401 | ||
| 16 | # Cortex version | ||
| 17 | # Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 | ||
| 18 | MCU = cortex-m4 | ||
| 19 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
| 20 | ARMV = 7 | ||
| 21 | USE_FPU = yes | ||
| 22 | # Address of the booloader in system memory | ||
| 23 | STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 | ||
| 24 | 3 | ||
| 25 | # Options to pass to dfu-util when flashing | 4 | # Address of the bootloader in system memory |
| 26 | DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave | 5 | STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 |
| 27 | DFU_SUFFIX_ARGS = -v 0483 -p df11 | ||
| 28 | 6 | ||
| 29 | # Build Options | 7 | # Build Options |
| 30 | # change yes to no to disable | 8 | # change yes to no to disable |
diff --git a/keyboards/handwired/onekey/blackpill_f411/rules.mk b/keyboards/handwired/onekey/blackpill_f411/rules.mk index f2e0f2b4f..7cf886431 100644 --- a/keyboards/handwired/onekey/blackpill_f411/rules.mk +++ b/keyboards/handwired/onekey/blackpill_f411/rules.mk | |||
| @@ -1,30 +1,8 @@ | |||
| 1 | ## chip/board settings | 1 | # MCU name |
| 2 | # the next two should match the directories in | 2 | MCU = STM32F411 |
| 3 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
| 4 | MCU_FAMILY = STM32 | ||
| 5 | MCU_SERIES = STM32F4xx | ||
| 6 | # linker script to use | ||
| 7 | # it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
| 8 | # or <this_dir>/ld/ | ||
| 9 | MCU_LDSCRIPT = STM32F411xE | ||
| 10 | # startup code to use | ||
| 11 | # is should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
| 12 | MCU_STARTUP = stm32f4xx | ||
| 13 | # it should exist either in <chibios>/os/hal/boards/ | ||
| 14 | # or <this_dir>/boards | ||
| 15 | BOARD = BLACKPILL_STM32_F411 | ||
| 16 | # Cortex version | ||
| 17 | # Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 | ||
| 18 | MCU = cortex-m4 | ||
| 19 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
| 20 | ARMV = 7 | ||
| 21 | USE_FPU = yes | ||
| 22 | # Address of the booloader in system memory | ||
| 23 | STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 | ||
| 24 | 3 | ||
| 25 | # Options to pass to dfu-util when flashing | 4 | # Address of the bootloader in system memory |
| 26 | DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave | 5 | STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 |
| 27 | DFU_SUFFIX_ARGS = -v 0483 -p df11 | ||
| 28 | 6 | ||
| 29 | # Build Options | 7 | # Build Options |
| 30 | # change yes to no to disable | 8 | # change yes to no to disable |
diff --git a/keyboards/handwired/riblee_f401/rules.mk b/keyboards/handwired/riblee_f401/rules.mk index eab426a37..2cb1d380e 100644 --- a/keyboards/handwired/riblee_f401/rules.mk +++ b/keyboards/handwired/riblee_f401/rules.mk | |||
| @@ -1,30 +1,8 @@ | |||
| 1 | ## chip/board settings | 1 | # MCU name |
| 2 | # the next two should match the directories in | 2 | MCU = STM32F401 |
| 3 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
| 4 | MCU_FAMILY = STM32 | ||
| 5 | MCU_SERIES = STM32F4xx | ||
| 6 | # linker script to use | ||
| 7 | # it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
| 8 | # or <this_dir>/ld/ | ||
| 9 | MCU_LDSCRIPT = STM32F401xC | ||
| 10 | # startup code to use | ||
| 11 | # is should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
| 12 | MCU_STARTUP = stm32f4xx | ||
| 13 | # it should exist either in <chibios>/os/hal/boards/ | ||
| 14 | # or <this_dir>/boards | ||
| 15 | BOARD = BLACKPILL_STM32_F401 | ||
| 16 | # Cortex version | ||
| 17 | # Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 | ||
| 18 | MCU = cortex-m4 | ||
| 19 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
| 20 | ARMV = 7 | ||
| 21 | USE_FPU = yes | ||
| 22 | # Address of the booloader in system memory | ||
| 23 | STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 | ||
| 24 | 3 | ||
| 25 | # Options to pass to dfu-util when flashing | 4 | # Address of the bootloader in system memory |
| 26 | DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave | 5 | STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 |
| 27 | DFU_SUFFIX_ARGS = -v 0483 -p df11 | ||
| 28 | 6 | ||
| 29 | # Build Options | 7 | # Build Options |
| 30 | # change yes to no to disable | 8 | # change yes to no to disable |
| @@ -43,4 +21,4 @@ BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality | |||
| 43 | BACKLIGHT_DRIVER = software | 21 | BACKLIGHT_DRIVER = software |
| 44 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow | 22 | RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow |
| 45 | BLUETOOTH_ENABLE = no # Enable Bluetooth | 23 | BLUETOOTH_ENABLE = no # Enable Bluetooth |
| 46 | AUDIO_ENABLE = no # Audio output \ No newline at end of file | 24 | AUDIO_ENABLE = no # Audio output |
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 | 2 | MCU = STM32F411 |
| 3 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
| 4 | MCU_FAMILY = STM32 | ||
| 5 | MCU_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/ |
| 10 | MCU_LDSCRIPT = m20add_boot | 7 | MCU_LDSCRIPT = m20add_boot |
| 11 | 8 | ||
| 12 | # Startup code to use | ||
| 13 | # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ | ||
| 14 | MCU_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 |
| 18 | BOARD = m20add_bd | 11 | BOARD = m20add_bd |
| 19 | 12 | ||
| 20 | # Cortex version | ||
| 21 | MCU = cortex-m4 | ||
| 22 | |||
| 23 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
| 24 | ARMV = 7 | ||
| 25 | |||
| 26 | USE_FPU = yes | ||
| 27 | |||
| 28 | # Vector table for application | ||
| 29 | # 0x00000000-0x00001000 area is occupied by bootlaoder.*/ | ||
| 30 | OPT_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 | 2 | MCU = STM32F411 |
| 3 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
| 4 | MCU_FAMILY = STM32 | ||
| 5 | MCU_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/ |
| 10 | MCU_LDSCRIPT = noah_boot | 7 | MCU_LDSCRIPT = noah_boot |
| 11 | 8 | ||
| 12 | # Startup code to use | ||
| 13 | # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ | ||
| 14 | MCU_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 |
| 18 | BOARD = noah_bd | 11 | BOARD = noah_bd |
| 19 | 12 | ||
| 20 | # Cortex version | ||
| 21 | MCU = cortex-m4 | ||
| 22 | |||
| 23 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
| 24 | ARMV = 7 | ||
| 25 | |||
| 26 | USE_FPU = yes | ||
| 27 | |||
| 28 | # Vector table for application | ||
| 29 | # 0x00000000-0x00001000 area is occupied by bootlaoder.*/ | ||
| 30 | OPT_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/phoenix/rules.mk b/keyboards/phoenix/rules.mk index 6c6c8446a..968c6548c 100644 --- a/keyboards/phoenix/rules.mk +++ b/keyboards/phoenix/rules.mk | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | # MCU name | ||
| 2 | MCU = STM32F401 | ||
| 3 | |||
| 4 | # Address of the bootloader in system memory | ||
| 5 | STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 | ||
| 6 | |||
| 1 | # Build Options | 7 | # Build Options |
| 2 | # change yes to no to disable | 8 | # change yes to no to disable |
| 3 | # | 9 | # |
| @@ -17,32 +23,4 @@ SPLIT_KEYBOARD = yes | |||
| 17 | SERIAL_DRIVER = usart | 23 | SERIAL_DRIVER = usart |
| 18 | KEYBOARD_SHARED_EP = yes | 24 | KEYBOARD_SHARED_EP = yes |
| 19 | 25 | ||
| 20 | ## chip/board settings | ||
| 21 | # the next two should match the directories in | ||
| 22 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
| 23 | MCU_FAMILY = STM32 | ||
| 24 | MCU_SERIES = STM32F4xx | ||
| 25 | # linker script to use | ||
| 26 | # it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
| 27 | # or <this_dir>/ld/ | ||
| 28 | MCU_LDSCRIPT = STM32F401xC | ||
| 29 | # startup code to use | ||
| 30 | # is should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
| 31 | MCU_STARTUP = stm32f4xx | ||
| 32 | # it should exist either in <chibios>/os/hal/boards/ | ||
| 33 | # or <this_dir>/boards | ||
| 34 | BOARD = BLACKPILL_STM32_F401 | ||
| 35 | # Cortex version | ||
| 36 | # Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 | ||
| 37 | MCU = cortex-m4 | ||
| 38 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
| 39 | ARMV = 7 | ||
| 40 | USE_FPU = yes | ||
| 41 | # Address of the booloader in system memory | ||
| 42 | STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 | ||
| 43 | |||
| 44 | # Options to pass to dfu-util when flashing | ||
| 45 | DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave | ||
| 46 | DFU_SUFFIX_ARGS = -v 0483 -p df11 | ||
| 47 | |||
| 48 | OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE | 26 | OPT_DEFS += -DSTM32_DMA_REQUIRED=TRUE |
diff --git a/keyboards/tkw/stoutgat/v2/f411/rules.mk b/keyboards/tkw/stoutgat/v2/f411/rules.mk index 61add3aed..4f7f52e62 100644 --- a/keyboards/tkw/stoutgat/v2/f411/rules.mk +++ b/keyboards/tkw/stoutgat/v2/f411/rules.mk | |||
| @@ -1,27 +1,5 @@ | |||
| 1 | ## chip/board settings | 1 | # MCU name |
| 2 | # the next two should match the directories in | 2 | MCU = STM32F411 |
| 3 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
| 4 | MCU_FAMILY = STM32 | ||
| 5 | MCU_SERIES = STM32F4xx | ||
| 6 | # linker script to use | ||
| 7 | # it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
| 8 | # or <this_dir>/ld/ | ||
| 9 | MCU_LDSCRIPT = STM32F411xE | ||
| 10 | # startup code to use | ||
| 11 | # is should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
| 12 | MCU_STARTUP = stm32f4xx | ||
| 13 | # it should exist either in <chibios>/os/hal/boards/ | ||
| 14 | # or <this_dir>/boards | ||
| 15 | BOARD = BLACKPILL_STM32_F411 | ||
| 16 | # Cortex version | ||
| 17 | # Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 | ||
| 18 | MCU = cortex-m4 | ||
| 19 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
| 20 | ARMV = 7 | ||
| 21 | USE_FPU = yes | ||
| 22 | # Address of the booloader in system memory | ||
| 23 | STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 | ||
| 24 | 3 | ||
| 25 | # Options to pass to dfu-util when flashing | 4 | # Address of the bootloader in system memory |
| 26 | DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave | 5 | STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 |
| 27 | DFU_SUFFIX_ARGS = -v 0483 -p df11 | ||
diff --git a/keyboards/zvecr/zv48/f401/rules.mk b/keyboards/zvecr/zv48/f401/rules.mk index e41d5ef7a..950442af9 100644 --- a/keyboards/zvecr/zv48/f401/rules.mk +++ b/keyboards/zvecr/zv48/f401/rules.mk | |||
| @@ -1,27 +1,5 @@ | |||
| 1 | ## chip/board settings | 1 | # MCU name |
| 2 | # the next two should match the directories in | 2 | MCU = STM32F401 |
| 3 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
| 4 | MCU_FAMILY = STM32 | ||
| 5 | MCU_SERIES = STM32F4xx | ||
| 6 | # linker script to use | ||
| 7 | # it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
| 8 | # or <this_dir>/ld/ | ||
| 9 | MCU_LDSCRIPT = STM32F401xC | ||
| 10 | # startup code to use | ||
| 11 | # is should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
| 12 | MCU_STARTUP = stm32f4xx | ||
| 13 | # it should exist either in <chibios>/os/hal/boards/ | ||
| 14 | # or <this_dir>/boards | ||
| 15 | BOARD = BLACKPILL_STM32_F401 | ||
| 16 | # Cortex version | ||
| 17 | # Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 | ||
| 18 | MCU = cortex-m4 | ||
| 19 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
| 20 | ARMV = 7 | ||
| 21 | USE_FPU = yes | ||
| 22 | # Address of the booloader in system memory | ||
| 23 | STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 | ||
| 24 | 3 | ||
| 25 | # Options to pass to dfu-util when flashing | 4 | # Address of the bootloader in system memory |
| 26 | DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave | 5 | STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 |
| 27 | DFU_SUFFIX_ARGS = -v 0483 -p df11 | ||
diff --git a/keyboards/zvecr/zv48/f411/rules.mk b/keyboards/zvecr/zv48/f411/rules.mk index 61add3aed..4f7f52e62 100644 --- a/keyboards/zvecr/zv48/f411/rules.mk +++ b/keyboards/zvecr/zv48/f411/rules.mk | |||
| @@ -1,27 +1,5 @@ | |||
| 1 | ## chip/board settings | 1 | # MCU name |
| 2 | # the next two should match the directories in | 2 | MCU = STM32F411 |
| 3 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
| 4 | MCU_FAMILY = STM32 | ||
| 5 | MCU_SERIES = STM32F4xx | ||
| 6 | # linker script to use | ||
| 7 | # it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
| 8 | # or <this_dir>/ld/ | ||
| 9 | MCU_LDSCRIPT = STM32F411xE | ||
| 10 | # startup code to use | ||
| 11 | # is should exist in <chibios>/os/common/ports/ARMCMx/compilers/GCC/mk/ | ||
| 12 | MCU_STARTUP = stm32f4xx | ||
| 13 | # it should exist either in <chibios>/os/hal/boards/ | ||
| 14 | # or <this_dir>/boards | ||
| 15 | BOARD = BLACKPILL_STM32_F411 | ||
| 16 | # Cortex version | ||
| 17 | # Teensy LC is cortex-m0; Teensy 3.x are cortex-m4 | ||
| 18 | MCU = cortex-m4 | ||
| 19 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
| 20 | ARMV = 7 | ||
| 21 | USE_FPU = yes | ||
| 22 | # Address of the booloader in system memory | ||
| 23 | STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 | ||
| 24 | 3 | ||
| 25 | # Options to pass to dfu-util when flashing | 4 | # Address of the bootloader in system memory |
| 26 | DFU_ARGS = -d 0483:df11 -a 0 -s 0x08000000:leave | 5 | STM32_BOOTLOADER_ADDRESS = 0x1FFF0000 |
| 27 | DFU_SUFFIX_ARGS = -v 0483 -p df11 | ||
diff --git a/quantum/mcu_selection.mk b/quantum/mcu_selection.mk index 33a0cabc8..6ec5dff5f 100644 --- a/quantum/mcu_selection.mk +++ b/quantum/mcu_selection.mk | |||
| @@ -82,37 +82,37 @@ ifneq ($(findstring MK20DX256, $(MCU)),) | |||
| 82 | BOARD ?= PJRC_TEENSY_3_1 | 82 | BOARD ?= PJRC_TEENSY_3_1 |
| 83 | endif | 83 | endif |
| 84 | 84 | ||
| 85 | ifneq ($(findstring STM32F303, $(MCU)),) | 85 | ifneq ($(findstring STM32F042, $(MCU)),) |
| 86 | # Cortex version | 86 | # Cortex version |
| 87 | MCU = cortex-m4 | 87 | MCU = cortex-m0 |
| 88 | 88 | ||
| 89 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | 89 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 |
| 90 | ARMV = 7 | 90 | ARMV = 6 |
| 91 | 91 | ||
| 92 | ## chip/board settings | 92 | ## chip/board settings |
| 93 | # - the next two should match the directories in | 93 | # - the next two should match the directories in |
| 94 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | 94 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) |
| 95 | MCU_FAMILY = STM32 | 95 | MCU_FAMILY = STM32 |
| 96 | MCU_SERIES = STM32F3xx | 96 | MCU_SERIES = STM32F0xx |
| 97 | 97 | ||
| 98 | # Linker script to use | 98 | # Linker script to use |
| 99 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | 99 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ |
| 100 | # or <keyboard_dir>/ld/ | 100 | # or <keyboard_dir>/ld/ |
| 101 | MCU_LDSCRIPT ?= STM32F303xC | 101 | MCU_LDSCRIPT ?= STM32F042x6 |
| 102 | 102 | ||
| 103 | # Startup code to use | 103 | # Startup code to use |
| 104 | # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ | 104 | # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ |
| 105 | MCU_STARTUP ?= stm32f3xx | 105 | MCU_STARTUP ?= stm32f0xx |
| 106 | 106 | ||
| 107 | # Board: it should exist either in <chibios>/os/hal/boards/, | 107 | # Board: it should exist either in <chibios>/os/hal/boards/, |
| 108 | # <keyboard_dir>/boards/, or drivers/boards/ | 108 | # <keyboard_dir>/boards/, or drivers/boards/ |
| 109 | BOARD ?= GENERIC_STM32_F303XC | 109 | BOARD ?= GENERIC_STM32_F042X6 |
| 110 | 110 | ||
| 111 | USE_FPU ?= yes | 111 | USE_FPU ?= no |
| 112 | 112 | ||
| 113 | # Options to pass to dfu-util when flashing | 113 | # Options to pass to dfu-util when flashing |
| 114 | DFU_ARGS ?= -d 0483:df11 -a 0 -s 0x08000000:leave | 114 | DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave |
| 115 | DFU_SUFFIX_ARGS ?= -v 0483 -p df11 | 115 | DFU_SUFFIX_ARGS ?= -v 0483 -p DF11 |
| 116 | endif | 116 | endif |
| 117 | 117 | ||
| 118 | ifneq ($(findstring STM32F072, $(MCU)),) | 118 | ifneq ($(findstring STM32F072, $(MCU)),) |
| @@ -144,46 +144,46 @@ ifneq ($(findstring STM32F072, $(MCU)),) | |||
| 144 | USE_FPU ?= no | 144 | USE_FPU ?= no |
| 145 | 145 | ||
| 146 | # Options to pass to dfu-util when flashing | 146 | # Options to pass to dfu-util when flashing |
| 147 | DFU_ARGS ?= -d 0483:df11 -a 0 -s 0x08000000:leave | 147 | DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave |
| 148 | DFU_SUFFIX_ARGS ?= -v 0483 -p df11 | 148 | DFU_SUFFIX_ARGS ?= -v 0483 -p DF11 |
| 149 | endif | 149 | endif |
| 150 | 150 | ||
| 151 | ifneq ($(findstring STM32F042, $(MCU)),) | 151 | ifneq ($(findstring STM32F103, $(MCU)),) |
| 152 | # Cortex version | 152 | # Cortex version |
| 153 | MCU = cortex-m0 | 153 | MCU = cortex-m3 |
| 154 | 154 | ||
| 155 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | 155 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 |
| 156 | ARMV = 6 | 156 | ARMV = 7 |
| 157 | 157 | ||
| 158 | ## chip/board settings | 158 | ## chip/board settings |
| 159 | # - the next two should match the directories in | 159 | # - the next two should match the directories in |
| 160 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | 160 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) |
| 161 | MCU_FAMILY = STM32 | 161 | MCU_FAMILY = STM32 |
| 162 | MCU_SERIES = STM32F0xx | 162 | MCU_SERIES = STM32F1xx |
| 163 | 163 | ||
| 164 | # Linker script to use | 164 | # Linker script to use |
| 165 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | 165 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ |
| 166 | # or <keyboard_dir>/ld/ | 166 | # or <keyboard_dir>/ld/ |
| 167 | MCU_LDSCRIPT ?= STM32F042x6 | 167 | MCU_LDSCRIPT ?= STM32F103x8 |
| 168 | 168 | ||
| 169 | # Startup code to use | 169 | # Startup code to use |
| 170 | # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ | 170 | # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ |
| 171 | MCU_STARTUP ?= stm32f0xx | 171 | MCU_STARTUP ?= stm32f1xx |
| 172 | 172 | ||
| 173 | # Board: it should exist either in <chibios>/os/hal/boards/, | 173 | # Board: it should exist either in <chibios>/os/hal/boards/, |
| 174 | # <keyboard_dir>/boards/, or drivers/boards/ | 174 | # <keyboard_dir>/boards/, or drivers/boards/ |
| 175 | BOARD ?= GENERIC_STM32_F042X6 | 175 | BOARD ?= GENERIC_STM32_F103 |
| 176 | 176 | ||
| 177 | USE_FPU ?= no | 177 | USE_FPU ?= no |
| 178 | 178 | ||
| 179 | # Options to pass to dfu-util when flashing | 179 | # Options to pass to dfu-util when flashing |
| 180 | DFU_ARGS ?= -d 0483:df11 -a 0 -s 0x08000000:leave | 180 | DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave |
| 181 | DFU_SUFFIX_ARGS ?= -v 0483 -p df11 | 181 | DFU_SUFFIX_ARGS ?= -v 0483 -p DF11 |
| 182 | endif | 182 | endif |
| 183 | 183 | ||
| 184 | ifneq ($(findstring STM32F103, $(MCU)),) | 184 | ifneq ($(findstring STM32F303, $(MCU)),) |
| 185 | # Cortex version | 185 | # Cortex version |
| 186 | MCU = cortex-m3 | 186 | MCU = cortex-m4 |
| 187 | 187 | ||
| 188 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | 188 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 |
| 189 | ARMV = 7 | 189 | ARMV = 7 |
| @@ -192,26 +192,92 @@ ifneq ($(findstring STM32F103, $(MCU)),) | |||
| 192 | # - the next two should match the directories in | 192 | # - the next two should match the directories in |
| 193 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | 193 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) |
| 194 | MCU_FAMILY = STM32 | 194 | MCU_FAMILY = STM32 |
| 195 | MCU_SERIES = STM32F1xx | 195 | MCU_SERIES = STM32F3xx |
| 196 | 196 | ||
| 197 | # Linker script to use | 197 | # Linker script to use |
| 198 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | 198 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ |
| 199 | # or <keyboard_dir>/ld/ | 199 | # or <keyboard_dir>/ld/ |
| 200 | MCU_LDSCRIPT ?= STM32F103x8 | 200 | MCU_LDSCRIPT ?= STM32F303xC |
| 201 | 201 | ||
| 202 | # Startup code to use | 202 | # Startup code to use |
| 203 | # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ | 203 | # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ |
| 204 | MCU_STARTUP ?= stm32f1xx | 204 | MCU_STARTUP ?= stm32f3xx |
| 205 | 205 | ||
| 206 | # Board: it should exist either in <chibios>/os/hal/boards/, | 206 | # Board: it should exist either in <chibios>/os/hal/boards/, |
| 207 | # <keyboard_dir>/boards/, or drivers/boards/ | 207 | # <keyboard_dir>/boards/, or drivers/boards/ |
| 208 | BOARD ?= GENERIC_STM32_F103 | 208 | BOARD ?= GENERIC_STM32_F303XC |
| 209 | 209 | ||
| 210 | USE_FPU ?= no | 210 | USE_FPU ?= yes |
| 211 | |||
| 212 | # Options to pass to dfu-util when flashing | ||
| 213 | DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave | ||
| 214 | DFU_SUFFIX_ARGS ?= -v 0483 -p DF11 | ||
| 215 | endif | ||
| 216 | |||
| 217 | ifneq ($(findstring STM32F401, $(MCU)),) | ||
| 218 | # Cortex version | ||
| 219 | MCU = cortex-m4 | ||
| 220 | |||
| 221 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
| 222 | ARMV = 7 | ||
| 223 | |||
| 224 | ## chip/board settings | ||
| 225 | # - the next two should match the directories in | ||
| 226 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
| 227 | MCU_FAMILY = STM32 | ||
| 228 | MCU_SERIES = STM32F4xx | ||
| 229 | |||
| 230 | # Linker script to use | ||
| 231 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
| 232 | # or <keyboard_dir>/ld/ | ||
| 233 | MCU_LDSCRIPT ?= STM32F401xC | ||
| 234 | |||
| 235 | # Startup code to use | ||
| 236 | # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ | ||
| 237 | MCU_STARTUP ?= stm32f4xx | ||
| 238 | |||
| 239 | # Board: it should exist either in <chibios>/os/hal/boards/, | ||
| 240 | # <keyboard_dir>/boards/, or drivers/boards/ | ||
| 241 | BOARD ?= BLACKPILL_STM32_F401 | ||
| 242 | |||
| 243 | USE_FPU ?= yes | ||
| 244 | |||
| 245 | # Options to pass to dfu-util when flashing | ||
| 246 | DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave | ||
| 247 | DFU_SUFFIX_ARGS ?= -v 0483 -p DF11 | ||
| 248 | endif | ||
| 249 | |||
| 250 | ifneq ($(findstring STM32F411, $(MCU)),) | ||
| 251 | # Cortex version | ||
| 252 | MCU = cortex-m4 | ||
| 253 | |||
| 254 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
| 255 | ARMV = 7 | ||
| 256 | |||
| 257 | ## chip/board settings | ||
| 258 | # - the next two should match the directories in | ||
| 259 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
| 260 | MCU_FAMILY = STM32 | ||
| 261 | MCU_SERIES = STM32F4xx | ||
| 262 | |||
| 263 | # Linker script to use | ||
| 264 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
| 265 | # or <keyboard_dir>/ld/ | ||
| 266 | MCU_LDSCRIPT ?= STM32F411xE | ||
| 267 | |||
| 268 | # Startup code to use | ||
| 269 | # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ | ||
| 270 | MCU_STARTUP ?= stm32f4xx | ||
| 271 | |||
| 272 | # Board: it should exist either in <chibios>/os/hal/boards/, | ||
| 273 | # <keyboard_dir>/boards/, or drivers/boards/ | ||
| 274 | BOARD ?= BLACKPILL_STM32_F411 | ||
| 275 | |||
| 276 | USE_FPU ?= yes | ||
| 211 | 277 | ||
| 212 | # Options to pass to dfu-util when flashing | 278 | # Options to pass to dfu-util when flashing |
| 213 | DFU_ARGS ?= -d 0483:df11 -a 0 -s 0x08000000:leave | 279 | DFU_ARGS ?= -d 0483:DF11 -a 0 -s 0x08000000:leave |
| 214 | DFU_SUFFIX_ARGS ?= -v 0483 -p df11 | 280 | DFU_SUFFIX_ARGS ?= -v 0483 -p DF11 |
| 215 | endif | 281 | endif |
| 216 | 282 | ||
| 217 | ifneq (,$(filter $(MCU),atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb1286)) | 283 | ifneq (,$(filter $(MCU),atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb1286)) |
