diff options
| -rw-r--r-- | data/schemas/keyboard.jsonschema | 2 | ||||
| -rw-r--r-- | docs/compatible_microcontrollers.md | 2 | ||||
| -rw-r--r-- | docs/ja/compatible_microcontrollers.md | 2 | ||||
| -rw-r--r-- | lib/python/qmk/constants.py | 2 | ||||
| -rw-r--r-- | platforms/chibios/GENERIC_STM32_L412XB/board/board.mk | 9 | ||||
| -rw-r--r-- | platforms/chibios/GENERIC_STM32_L412XB/configs/board.h | 24 | ||||
| -rw-r--r-- | platforms/chibios/GENERIC_STM32_L412XB/configs/config.h | 26 | ||||
| -rw-r--r-- | platforms/chibios/GENERIC_STM32_L412XB/configs/mcuconf.h | 282 | ||||
| -rw-r--r-- | platforms/chibios/GENERIC_STM32_L433XC/configs/board.h | 2 | ||||
| -rw-r--r-- | platforms/chibios/common/ld/STM32L412xB.ld | 85 | ||||
| -rw-r--r-- | quantum/mcu_selection.mk | 34 |
11 files changed, 467 insertions, 3 deletions
diff --git a/data/schemas/keyboard.jsonschema b/data/schemas/keyboard.jsonschema index d6d33ce4e..3a77b2067 100644 --- a/data/schemas/keyboard.jsonschema +++ b/data/schemas/keyboard.jsonschema | |||
| @@ -13,7 +13,7 @@ | |||
| 13 | }, | 13 | }, |
| 14 | "processor": { | 14 | "processor": { |
| 15 | "type": "string", | 15 | "type": "string", |
| 16 | "enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "MK66F18", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F411", "STM32F446", "STM32G431", "STM32G474", "STM32L433", "STM32L443", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"] | 16 | "enum": ["cortex-m0", "cortex-m0plus", "cortex-m3", "cortex-m4", "MKL26Z64", "MK20DX128", "MK20DX256", "MK66F18", "STM32F042", "STM32F072", "STM32F103", "STM32F303", "STM32F401", "STM32F411", "STM32F446", "STM32G431", "STM32G474", "STM32L412", "STM32L422", "STM32L433", "STM32L443", "atmega16u2", "atmega32u2", "atmega16u4", "atmega32u4", "at90usb162", "at90usb646", "at90usb647", "at90usb1286", "at90usb1287", "atmega32a", "atmega328p", "atmega328", "attiny85", "unknown"] |
| 17 | }, | 17 | }, |
| 18 | "board": { | 18 | "board": { |
| 19 | "type": "string", | 19 | "type": "string", |
diff --git a/docs/compatible_microcontrollers.md b/docs/compatible_microcontrollers.md index 0f5b140de..865b29fee 100644 --- a/docs/compatible_microcontrollers.md +++ b/docs/compatible_microcontrollers.md | |||
| @@ -31,6 +31,8 @@ You can also use any ARM chip with USB that [ChibiOS](https://www.chibios.org) s | |||
| 31 | * [STM32F446](https://www.st.com/en/microcontrollers-microprocessors/stm32f446.html) | 31 | * [STM32F446](https://www.st.com/en/microcontrollers-microprocessors/stm32f446.html) |
| 32 | * [STM32G431](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x1.html) | 32 | * [STM32G431](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x1.html) |
| 33 | * [STM32G474](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x4.html) | 33 | * [STM32G474](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x4.html) |
| 34 | * [STM32L412](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x2.html) | ||
| 35 | * [STM32L422](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x2.html) | ||
| 34 | * [STM32L433](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x3.html) | 36 | * [STM32L433](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x3.html) |
| 35 | * [STM32L443](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x3.html) | 37 | * [STM32L443](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x3.html) |
| 36 | 38 | ||
diff --git a/docs/ja/compatible_microcontrollers.md b/docs/ja/compatible_microcontrollers.md index b675b038d..761a4cda4 100644 --- a/docs/ja/compatible_microcontrollers.md +++ b/docs/ja/compatible_microcontrollers.md | |||
| @@ -36,6 +36,8 @@ QMK は十分な容量のフラッシュメモリを備えた USB 対応 AVR ま | |||
| 36 | * [STM32F446](https://www.st.com/en/microcontrollers-microprocessors/stm32f446.html) | 36 | * [STM32F446](https://www.st.com/en/microcontrollers-microprocessors/stm32f446.html) |
| 37 | * [STM32G431](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x1.html) | 37 | * [STM32G431](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x1.html) |
| 38 | * [STM32G474](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x4.html) | 38 | * [STM32G474](https://www.st.com/en/microcontrollers-microprocessors/stm32g4x4.html) |
| 39 | * [STM32L412](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x2.html) | ||
| 40 | * [STM32L422](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x2.html) | ||
| 39 | * [STM32L433](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x3.html) | 41 | * [STM32L433](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x3.html) |
| 40 | * [STM32L443](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x3.html) | 42 | * [STM32L443](https://www.st.com/en/microcontrollers-microprocessors/stm32l4x3.html) |
| 41 | 43 | ||
diff --git a/lib/python/qmk/constants.py b/lib/python/qmk/constants.py index 49e5e0eb4..be5ce5d4e 100644 --- a/lib/python/qmk/constants.py +++ b/lib/python/qmk/constants.py | |||
| @@ -10,7 +10,7 @@ QMK_FIRMWARE = Path.cwd() | |||
| 10 | MAX_KEYBOARD_SUBFOLDERS = 5 | 10 | MAX_KEYBOARD_SUBFOLDERS = 5 |
| 11 | 11 | ||
| 12 | # Supported processor types | 12 | # Supported processor types |
| 13 | CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK66F18', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L433', 'STM32L443' | 13 | CHIBIOS_PROCESSORS = 'cortex-m0', 'cortex-m0plus', 'cortex-m3', 'cortex-m4', 'MKL26Z64', 'MK20DX128', 'MK20DX256', 'MK66F18', 'STM32F042', 'STM32F072', 'STM32F103', 'STM32F303', 'STM32F401', 'STM32F411', 'STM32F446', 'STM32G431', 'STM32G474', 'STM32L412', 'STM32L422', 'STM32L433', 'STM32L443' |
| 14 | LUFA_PROCESSORS = 'at90usb162', 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', None | 14 | LUFA_PROCESSORS = 'at90usb162', 'atmega16u2', 'atmega32u2', 'atmega16u4', 'atmega32u4', 'at90usb646', 'at90usb647', 'at90usb1286', 'at90usb1287', None |
| 15 | VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85' | 15 | VUSB_PROCESSORS = 'atmega32a', 'atmega328p', 'atmega328', 'attiny85' |
| 16 | 16 | ||
diff --git a/platforms/chibios/GENERIC_STM32_L412XB/board/board.mk b/platforms/chibios/GENERIC_STM32_L412XB/board/board.mk new file mode 100644 index 000000000..1250385eb --- /dev/null +++ b/platforms/chibios/GENERIC_STM32_L412XB/board/board.mk | |||
| @@ -0,0 +1,9 @@ | |||
| 1 | # List of all the board related files. | ||
| 2 | BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO32_L432KC/board.c | ||
| 3 | |||
| 4 | # Required include directories | ||
| 5 | BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO32_L432KC | ||
| 6 | |||
| 7 | # Shared variables | ||
| 8 | ALLCSRC += $(BOARDSRC) | ||
| 9 | ALLINC += $(BOARDINC) | ||
diff --git a/platforms/chibios/GENERIC_STM32_L412XB/configs/board.h b/platforms/chibios/GENERIC_STM32_L412XB/configs/board.h new file mode 100644 index 000000000..2e37d95fe --- /dev/null +++ b/platforms/chibios/GENERIC_STM32_L412XB/configs/board.h | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | /* Copyright 2018-2021 Harrison Chan (@Xelus) | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 3 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | #pragma once | ||
| 17 | |||
| 18 | #include_next "board.h" | ||
| 19 | |||
| 20 | #undef STM32L432xx | ||
| 21 | |||
| 22 | // Pretend that we're an L443xx as the ChibiOS definitions for L4x2/L4x3 mistakenly don't enable GPIOH, I2C2, or SPI2. | ||
| 23 | // Until ChibiOS upstream is fixed, this should be kept at L443, as nothing in QMK currently utilises the crypto peripheral on the L443. | ||
| 24 | #define STM32L443xx | ||
diff --git a/platforms/chibios/GENERIC_STM32_L412XB/configs/config.h b/platforms/chibios/GENERIC_STM32_L412XB/configs/config.h new file mode 100644 index 000000000..c27c61b19 --- /dev/null +++ b/platforms/chibios/GENERIC_STM32_L412XB/configs/config.h | |||
| @@ -0,0 +1,26 @@ | |||
| 1 | /* Copyright 2018-2021 Harrison Chan (@Xelus) | ||
| 2 | * | ||
| 3 | * This program is free software: you can redistribute it and/or modify | ||
| 4 | * it under the terms of the GNU General Public License as published by | ||
| 5 | * the Free Software Foundation, either version 2 of the License, or | ||
| 6 | * (at your option) any later version. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | * | ||
| 13 | * You should have received a copy of the GNU General Public License | ||
| 14 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 15 | */ | ||
| 16 | |||
| 17 | /* Address for jumping to bootloader on STM32 chips. */ | ||
| 18 | /* It is chip dependent, the correct number can be looked up by checking against ST's application note AN2606. | ||
| 19 | */ | ||
| 20 | #define STM32_BOOTLOADER_ADDRESS 0x1FFF0000 | ||
| 21 | |||
| 22 | #define PAL_STM32_OSPEED_HIGHEST PAL_STM32_OSPEED_HIGH | ||
| 23 | |||
| 24 | #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP | ||
| 25 | # define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE | ||
| 26 | #endif | ||
diff --git a/platforms/chibios/GENERIC_STM32_L412XB/configs/mcuconf.h b/platforms/chibios/GENERIC_STM32_L412XB/configs/mcuconf.h new file mode 100644 index 000000000..8ad5a8da2 --- /dev/null +++ b/platforms/chibios/GENERIC_STM32_L412XB/configs/mcuconf.h | |||
| @@ -0,0 +1,282 @@ | |||
| 1 | /* | ||
| 2 | ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio | ||
| 3 | |||
| 4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
| 5 | you may not use this file except in compliance with the License. | ||
| 6 | You may obtain a copy of the License at | ||
| 7 | |||
| 8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
| 9 | |||
| 10 | Unless required by applicable law or agreed to in writing, software | ||
| 11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
| 12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| 13 | See the License for the specific language governing permissions and | ||
| 14 | limitations under the License. | ||
| 15 | */ | ||
| 16 | |||
| 17 | /* | ||
| 18 | * STM32L4xx drivers configuration. | ||
| 19 | * The following settings override the default settings present in | ||
| 20 | * the various device driver implementation headers. | ||
| 21 | * Note that the settings for each driver only have effect if the whole | ||
| 22 | * driver is enabled in halconf.h. | ||
| 23 | * | ||
| 24 | * IRQ priorities: | ||
| 25 | * 15...0 Lowest...Highest. | ||
| 26 | * | ||
| 27 | * DMA priorities: | ||
| 28 | * 0...3 Lowest...Highest. | ||
| 29 | */ | ||
| 30 | |||
| 31 | #ifndef MCUCONF_H | ||
| 32 | #define MCUCONF_H | ||
| 33 | |||
| 34 | #define STM32L4xx_MCUCONF | ||
| 35 | #define STM32L412_MCUCONF | ||
| 36 | #define STM32L422_MCUCONF | ||
| 37 | #define STM32L432_MCUCONF | ||
| 38 | #define STM32L433_MCUCONF | ||
| 39 | #define STM32L442_MCUCONF | ||
| 40 | #define STM32L443_MCUCONF | ||
| 41 | |||
| 42 | /* | ||
| 43 | * HAL driver system settings. | ||
| 44 | */ | ||
| 45 | #define STM32_NO_INIT FALSE | ||
| 46 | #define STM32_VOS STM32_VOS_RANGE1 | ||
| 47 | #define STM32_PVD_ENABLE FALSE | ||
| 48 | #define STM32_PLS STM32_PLS_LEV0 | ||
| 49 | #define STM32_HSI16_ENABLED TRUE | ||
| 50 | #define STM32_HSI48_ENABLED TRUE | ||
| 51 | #define STM32_LSI_ENABLED FALSE | ||
| 52 | #define STM32_HSE_ENABLED FALSE | ||
| 53 | #define STM32_LSE_ENABLED FALSE | ||
| 54 | #define STM32_MSIPLL_ENABLED FALSE | ||
| 55 | #define STM32_ADC_CLOCK_ENABLED TRUE | ||
| 56 | #define STM32_USB_CLOCK_ENABLED TRUE | ||
| 57 | #define STM32_SAI1_CLOCK_ENABLED TRUE | ||
| 58 | #define STM32_SAI2_CLOCK_ENABLED TRUE | ||
| 59 | #define STM32_MSIRANGE STM32_MSIRANGE_4M | ||
| 60 | #define STM32_MSISRANGE STM32_MSISRANGE_4M | ||
| 61 | #define STM32_SW STM32_SW_PLL | ||
| 62 | #define STM32_PLLSRC STM32_PLLSRC_HSI16 | ||
| 63 | #define STM32_PLLM_VALUE 4 | ||
| 64 | #define STM32_PLLN_VALUE 80 | ||
| 65 | #define STM32_PLLP_VALUE 7 | ||
| 66 | #define STM32_PLLQ_VALUE 4 | ||
| 67 | #define STM32_PLLR_VALUE 4 | ||
| 68 | #define STM32_HPRE STM32_HPRE_DIV1 | ||
| 69 | #define STM32_PPRE1 STM32_PPRE1_DIV1 | ||
| 70 | #define STM32_PPRE2 STM32_PPRE2_DIV1 | ||
| 71 | #define STM32_STOPWUCK STM32_STOPWUCK_MSI | ||
| 72 | #define STM32_MCOSEL STM32_MCOSEL_NOCLOCK | ||
| 73 | #define STM32_MCOPRE STM32_MCOPRE_DIV1 | ||
| 74 | #define STM32_LSCOSEL STM32_LSCOSEL_NOCLOCK | ||
| 75 | #define STM32_PLLSAI1N_VALUE 72 | ||
| 76 | #define STM32_PLLSAI1P_VALUE 7 | ||
| 77 | #define STM32_PLLSAI1Q_VALUE 6 | ||
| 78 | #define STM32_PLLSAI1R_VALUE 6 | ||
| 79 | #define STM32_PLLSAI2N_VALUE 72 | ||
| 80 | #define STM32_PLLSAI2P_VALUE 7 | ||
| 81 | #define STM32_PLLSAI2R_VALUE 6 | ||
| 82 | |||
| 83 | /* | ||
| 84 | * Peripherals clock sources. | ||
| 85 | */ | ||
| 86 | #define STM32_USART1SEL STM32_USART1SEL_SYSCLK | ||
| 87 | #define STM32_USART2SEL STM32_USART2SEL_SYSCLK | ||
| 88 | #define STM32_USART3SEL STM32_USART3SEL_SYSCLK | ||
| 89 | #define STM32_UART4SEL STM32_UART4SEL_SYSCLK | ||
| 90 | #define STM32_UART5SEL STM32_UART5SEL_SYSCLK | ||
| 91 | #define STM32_LPUART1SEL STM32_LPUART1SEL_SYSCLK | ||
| 92 | #define STM32_I2C1SEL STM32_I2C1SEL_SYSCLK | ||
| 93 | #define STM32_I2C2SEL STM32_I2C2SEL_SYSCLK | ||
| 94 | #define STM32_I2C3SEL STM32_I2C3SEL_SYSCLK | ||
| 95 | #define STM32_LPTIM1SEL STM32_LPTIM1SEL_PCLK1 | ||
| 96 | #define STM32_LPTIM2SEL STM32_LPTIM2SEL_PCLK1 | ||
| 97 | #define STM32_SAI1SEL STM32_SAI1SEL_OFF | ||
| 98 | #define STM32_SAI2SEL STM32_SAI2SEL_OFF | ||
| 99 | #define STM32_CLK48SEL STM32_CLK48SEL_HSI48 | ||
| 100 | #define STM32_ADCSEL STM32_ADCSEL_SYSCLK | ||
| 101 | #define STM32_SWPMI1SEL STM32_SWPMI1SEL_PCLK1 | ||
| 102 | #define STM32_RTCSEL STM32_RTCSEL_LSI | ||
| 103 | |||
| 104 | /* | ||
| 105 | * IRQ system settings. | ||
| 106 | */ | ||
| 107 | #define STM32_IRQ_EXTI0_PRIORITY 6 | ||
| 108 | #define STM32_IRQ_EXTI1_PRIORITY 6 | ||
| 109 | #define STM32_IRQ_EXTI2_PRIORITY 6 | ||
| 110 | #define STM32_IRQ_EXTI3_PRIORITY 6 | ||
| 111 | #define STM32_IRQ_EXTI4_PRIORITY 6 | ||
| 112 | #define STM32_IRQ_EXTI5_9_PRIORITY 6 | ||
| 113 | #define STM32_IRQ_EXTI10_15_PRIORITY 6 | ||
| 114 | #define STM32_IRQ_EXTI1635_38_PRIORITY 6 | ||
| 115 | #define STM32_IRQ_EXTI18_PRIORITY 6 | ||
| 116 | #define STM32_IRQ_EXTI19_PRIORITY 6 | ||
| 117 | #define STM32_IRQ_EXTI20_PRIORITY 6 | ||
| 118 | #define STM32_IRQ_EXTI21_22_PRIORITY 15 | ||
| 119 | |||
| 120 | #define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7 | ||
| 121 | #define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7 | ||
| 122 | #define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7 | ||
| 123 | #define STM32_IRQ_TIM1_CC_PRIORITY 7 | ||
| 124 | #define STM32_IRQ_TIM2_PRIORITY 7 | ||
| 125 | #define STM32_IRQ_TIM6_PRIORITY 7 | ||
| 126 | #define STM32_IRQ_TIM7_PRIORITY 7 | ||
| 127 | |||
| 128 | #define STM32_IRQ_USART1_PRIORITY 12 | ||
| 129 | #define STM32_IRQ_USART2_PRIORITY 12 | ||
| 130 | #define STM32_IRQ_USART3_PRIORITY 12 | ||
| 131 | #define STM32_IRQ_LPUART1_PRIORITY 12 | ||
| 132 | |||
| 133 | /* | ||
| 134 | * ADC driver system settings. | ||
| 135 | */ | ||
| 136 | #define STM32_ADC_COMPACT_SAMPLES FALSE | ||
| 137 | #define STM32_ADC_USE_ADC1 FALSE | ||
| 138 | #define STM32_ADC_ADC1_DMA_STREAM STM32_DMA_STREAM_ID(1, 1) | ||
| 139 | #define STM32_ADC_ADC1_DMA_PRIORITY 2 | ||
| 140 | #define STM32_ADC_ADC12_IRQ_PRIORITY 5 | ||
| 141 | #define STM32_ADC_ADC1_DMA_IRQ_PRIORITY 5 | ||
| 142 | #define STM32_ADC_ADC123_CLOCK_MODE ADC_CCR_CKMODE_AHB_DIV1 | ||
| 143 | #define STM32_ADC_ADC123_PRESC ADC_CCR_PRESC_DIV2 | ||
| 144 | |||
| 145 | /* | ||
| 146 | * CAN driver system settings. | ||
| 147 | */ | ||
| 148 | #define STM32_CAN_USE_CAN1 FALSE | ||
| 149 | #define STM32_CAN_CAN1_IRQ_PRIORITY 11 | ||
| 150 | |||
| 151 | /* | ||
| 152 | * DAC driver system settings. | ||
| 153 | */ | ||
| 154 | #define STM32_DAC_DUAL_MODE FALSE | ||
| 155 | #define STM32_DAC_USE_DAC1_CH1 FALSE | ||
| 156 | #define STM32_DAC_USE_DAC1_CH2 FALSE | ||
| 157 | #define STM32_DAC_DAC1_CH1_IRQ_PRIORITY 10 | ||
| 158 | #define STM32_DAC_DAC1_CH2_IRQ_PRIORITY 10 | ||
| 159 | #define STM32_DAC_DAC1_CH1_DMA_PRIORITY 2 | ||
| 160 | #define STM32_DAC_DAC1_CH2_DMA_PRIORITY 2 | ||
| 161 | #define STM32_DAC_DAC1_CH1_DMA_STREAM STM32_DMA_STREAM_ID(2, 4) | ||
| 162 | #define STM32_DAC_DAC1_CH2_DMA_STREAM STM32_DMA_STREAM_ID(1, 4) | ||
| 163 | |||
| 164 | /* | ||
| 165 | * GPT driver system settings. | ||
| 166 | */ | ||
| 167 | #define STM32_GPT_USE_TIM1 FALSE | ||
| 168 | #define STM32_GPT_USE_TIM2 FALSE | ||
| 169 | #define STM32_GPT_USE_TIM6 FALSE | ||
| 170 | #define STM32_GPT_USE_TIM7 FALSE | ||
| 171 | #define STM32_GPT_USE_TIM15 FALSE | ||
| 172 | #define STM32_GPT_USE_TIM16 FALSE | ||
| 173 | |||
| 174 | /* | ||
| 175 | * I2C driver system settings. | ||
| 176 | */ | ||
| 177 | #define STM32_I2C_USE_I2C1 FALSE | ||
| 178 | #define STM32_I2C_USE_I2C3 FALSE | ||
| 179 | #define STM32_I2C_BUSY_TIMEOUT 50 | ||
| 180 | #define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 7) | ||
| 181 | #define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) | ||
| 182 | #define STM32_I2C_I2C3_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 3) | ||
| 183 | #define STM32_I2C_I2C3_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 2) | ||
| 184 | #define STM32_I2C_I2C1_IRQ_PRIORITY 5 | ||
| 185 | #define STM32_I2C_I2C3_IRQ_PRIORITY 5 | ||
| 186 | #define STM32_I2C_I2C1_DMA_PRIORITY 3 | ||
| 187 | #define STM32_I2C_I2C3_DMA_PRIORITY 3 | ||
| 188 | #define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure") | ||
| 189 | |||
| 190 | /* | ||
| 191 | * ICU driver system settings. | ||
| 192 | */ | ||
| 193 | #define STM32_ICU_USE_TIM1 FALSE | ||
| 194 | #define STM32_ICU_USE_TIM2 FALSE | ||
| 195 | #define STM32_ICU_USE_TIM15 FALSE | ||
| 196 | #define STM32_ICU_USE_TIM16 FALSE | ||
| 197 | |||
| 198 | /* | ||
| 199 | * PWM driver system settings. | ||
| 200 | */ | ||
| 201 | #define STM32_PWM_USE_ADVANCED FALSE | ||
| 202 | #define STM32_PWM_USE_TIM1 FALSE | ||
| 203 | #define STM32_PWM_USE_TIM2 FALSE | ||
| 204 | #define STM32_PWM_USE_TIM15 FALSE | ||
| 205 | #define STM32_PWM_USE_TIM16 FALSE | ||
| 206 | |||
| 207 | /* | ||
| 208 | * RTC driver system settings. | ||
| 209 | */ | ||
| 210 | #define STM32_RTC_PRESA_VALUE 32 | ||
| 211 | #define STM32_RTC_PRESS_VALUE 1024 | ||
| 212 | #define STM32_RTC_CR_INIT 0 | ||
| 213 | #define STM32_RTC_TAMPCR_INIT 0 | ||
| 214 | |||
| 215 | /* | ||
| 216 | * SERIAL driver system settings. | ||
| 217 | */ | ||
| 218 | #define STM32_SERIAL_USE_USART1 FALSE | ||
| 219 | #define STM32_SERIAL_USE_USART2 FALSE | ||
| 220 | #define STM32_SERIAL_USE_LPUART1 FALSE | ||
| 221 | #define STM32_SERIAL_USART1_PRIORITY 12 | ||
| 222 | #define STM32_SERIAL_USART2_PRIORITY 12 | ||
| 223 | #define STM32_SERIAL_LPUART1_PRIORITY 12 | ||
| 224 | |||
| 225 | /* | ||
| 226 | * SPI driver system settings. | ||
| 227 | */ | ||
| 228 | #define STM32_SPI_USE_SPI1 FALSE | ||
| 229 | #define STM32_SPI_USE_SPI3 FALSE | ||
| 230 | #define STM32_SPI_SPI1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 3) | ||
| 231 | #define STM32_SPI_SPI1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 4) | ||
| 232 | #define STM32_SPI_SPI3_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 1) | ||
| 233 | #define STM32_SPI_SPI3_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 2) | ||
| 234 | #define STM32_SPI_SPI1_DMA_PRIORITY 1 | ||
| 235 | #define STM32_SPI_SPI3_DMA_PRIORITY 1 | ||
| 236 | #define STM32_SPI_SPI1_IRQ_PRIORITY 10 | ||
| 237 | #define STM32_SPI_SPI3_IRQ_PRIORITY 10 | ||
| 238 | #define STM32_SPI_DMA_ERROR_HOOK(spip) osalSysHalt("DMA failure") | ||
| 239 | |||
| 240 | /* | ||
| 241 | * ST driver system settings. | ||
| 242 | */ | ||
| 243 | #define STM32_ST_IRQ_PRIORITY 8 | ||
| 244 | #define STM32_ST_USE_TIMER 2 | ||
| 245 | |||
| 246 | /* | ||
| 247 | * TRNG driver system settings. | ||
| 248 | */ | ||
| 249 | #define STM32_TRNG_USE_RNG1 FALSE | ||
| 250 | |||
| 251 | /* | ||
| 252 | * UART driver system settings. | ||
| 253 | */ | ||
| 254 | #define STM32_UART_USE_USART1 FALSE | ||
| 255 | #define STM32_UART_USE_USART2 FALSE | ||
| 256 | #define STM32_UART_USART1_RX_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) | ||
| 257 | #define STM32_UART_USART1_TX_DMA_STREAM STM32_DMA_STREAM_ID(2, 6) | ||
| 258 | #define STM32_UART_USART2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6) | ||
| 259 | #define STM32_UART_USART2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 7) | ||
| 260 | #define STM32_UART_DMA_ERROR_HOOK(uartp) osalSysHalt("DMA failure") | ||
| 261 | |||
| 262 | /* | ||
| 263 | * USB driver system settings. | ||
| 264 | */ | ||
| 265 | #define STM32_USB_USE_USB1 TRUE | ||
| 266 | #define STM32_USB_LOW_POWER_ON_SUSPEND FALSE | ||
| 267 | #define STM32_USB_USB1_HP_IRQ_PRIORITY 13 | ||
| 268 | #define STM32_USB_USB1_LP_IRQ_PRIORITY 14 | ||
| 269 | |||
| 270 | /* | ||
| 271 | * WDG driver system settings. | ||
| 272 | */ | ||
| 273 | #define STM32_WDG_USE_IWDG FALSE | ||
| 274 | |||
| 275 | /* | ||
| 276 | * WSPI driver system settings. | ||
| 277 | */ | ||
| 278 | #define STM32_WSPI_USE_QUADSPI1 FALSE | ||
| 279 | #define STM32_WSPI_QUADSPI1_DMA_STREAM STM32_DMA_STREAM_ID(2, 7) | ||
| 280 | #define STM32_WSPI_QUADSPI1_PRESCALER_VALUE 1 | ||
| 281 | |||
| 282 | #endif /* MCUCONF_H */ | ||
diff --git a/platforms/chibios/GENERIC_STM32_L433XC/configs/board.h b/platforms/chibios/GENERIC_STM32_L433XC/configs/board.h index 51f9724f9..2e37d95fe 100644 --- a/platforms/chibios/GENERIC_STM32_L433XC/configs/board.h +++ b/platforms/chibios/GENERIC_STM32_L433XC/configs/board.h | |||
| @@ -19,6 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | #undef STM32L432xx | 20 | #undef STM32L432xx |
| 21 | 21 | ||
| 22 | // Pretend that we're an L443xx as the ChibiOS definitions for L432/L433 mistakenly don't enable GPIOH, I2C2, or SPI2. | 22 | // Pretend that we're an L443xx as the ChibiOS definitions for L4x2/L4x3 mistakenly don't enable GPIOH, I2C2, or SPI2. |
| 23 | // Until ChibiOS upstream is fixed, this should be kept at L443, as nothing in QMK currently utilises the crypto peripheral on the L443. | 23 | // Until ChibiOS upstream is fixed, this should be kept at L443, as nothing in QMK currently utilises the crypto peripheral on the L443. |
| 24 | #define STM32L443xx | 24 | #define STM32L443xx |
diff --git a/platforms/chibios/common/ld/STM32L412xB.ld b/platforms/chibios/common/ld/STM32L412xB.ld new file mode 100644 index 000000000..5718d6bc7 --- /dev/null +++ b/platforms/chibios/common/ld/STM32L412xB.ld | |||
| @@ -0,0 +1,85 @@ | |||
| 1 | /* | ||
| 2 | ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio | ||
| 3 | |||
| 4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
| 5 | you may not use this file except in compliance with the License. | ||
| 6 | You may obtain a copy of the License at | ||
| 7 | |||
| 8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
| 9 | |||
| 10 | Unless required by applicable law or agreed to in writing, software | ||
| 11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
| 12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| 13 | See the License for the specific language governing permissions and | ||
| 14 | limitations under the License. | ||
| 15 | */ | ||
| 16 | |||
| 17 | /* | ||
| 18 | * STM32L412xB memory setup. | ||
| 19 | */ | ||
| 20 | MEMORY | ||
| 21 | { | ||
| 22 | flash0 : org = 0x08000000, len = 128k | ||
| 23 | flash1 : org = 0x00000000, len = 0 | ||
| 24 | flash2 : org = 0x00000000, len = 0 | ||
| 25 | flash3 : org = 0x00000000, len = 0 | ||
| 26 | flash4 : org = 0x00000000, len = 0 | ||
| 27 | flash5 : org = 0x00000000, len = 0 | ||
| 28 | flash6 : org = 0x00000000, len = 0 | ||
| 29 | flash7 : org = 0x00000000, len = 0 | ||
| 30 | ram0 : org = 0x20000000, len = 32k | ||
| 31 | ram1 : org = 0x00000000, len = 0 | ||
| 32 | ram2 : org = 0x00000000, len = 0 | ||
| 33 | ram3 : org = 0x00000000, len = 0 | ||
| 34 | ram4 : org = 0x00000000, len = 0 | ||
| 35 | ram5 : org = 0x00000000, len = 0 | ||
| 36 | ram6 : org = 0x00000000, len = 0 | ||
| 37 | ram7 : org = 0x00000000, len = 0 | ||
| 38 | } | ||
| 39 | |||
| 40 | /* For each data/text section two region are defined, a virtual region | ||
| 41 | and a load region (_LMA suffix).*/ | ||
| 42 | |||
| 43 | /* Flash region to be used for exception vectors.*/ | ||
| 44 | REGION_ALIAS("VECTORS_FLASH", flash0); | ||
| 45 | REGION_ALIAS("VECTORS_FLASH_LMA", flash0); | ||
| 46 | |||
| 47 | /* Flash region to be used for constructors and destructors.*/ | ||
| 48 | REGION_ALIAS("XTORS_FLASH", flash0); | ||
| 49 | REGION_ALIAS("XTORS_FLASH_LMA", flash0); | ||
| 50 | |||
| 51 | /* Flash region to be used for code text.*/ | ||
| 52 | REGION_ALIAS("TEXT_FLASH", flash0); | ||
| 53 | REGION_ALIAS("TEXT_FLASH_LMA", flash0); | ||
| 54 | |||
| 55 | /* Flash region to be used for read only data.*/ | ||
| 56 | REGION_ALIAS("RODATA_FLASH", flash0); | ||
| 57 | REGION_ALIAS("RODATA_FLASH_LMA", flash0); | ||
| 58 | |||
| 59 | /* Flash region to be used for various.*/ | ||
| 60 | REGION_ALIAS("VARIOUS_FLASH", flash0); | ||
| 61 | REGION_ALIAS("VARIOUS_FLASH_LMA", flash0); | ||
| 62 | |||
| 63 | /* Flash region to be used for RAM(n) initialization data.*/ | ||
| 64 | REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0); | ||
| 65 | |||
| 66 | /* RAM region to be used for Main stack. This stack accommodates the processing | ||
| 67 | of all exceptions and interrupts.*/ | ||
| 68 | REGION_ALIAS("MAIN_STACK_RAM", ram0); | ||
| 69 | |||
| 70 | /* RAM region to be used for the process stack. This is the stack used by | ||
| 71 | the main() function.*/ | ||
| 72 | REGION_ALIAS("PROCESS_STACK_RAM", ram0); | ||
| 73 | |||
| 74 | /* RAM region to be used for data segment.*/ | ||
| 75 | REGION_ALIAS("DATA_RAM", ram0); | ||
| 76 | REGION_ALIAS("DATA_RAM_LMA", flash0); | ||
| 77 | |||
| 78 | /* RAM region to be used for BSS segment.*/ | ||
| 79 | REGION_ALIAS("BSS_RAM", ram0); | ||
| 80 | |||
| 81 | /* RAM region to be used for the default heap.*/ | ||
| 82 | REGION_ALIAS("HEAP_RAM", ram0); | ||
| 83 | |||
| 84 | /* Generic rules inclusion.*/ | ||
| 85 | INCLUDE rules.ld | ||
diff --git a/quantum/mcu_selection.mk b/quantum/mcu_selection.mk index f8def7f67..ca0accd71 100644 --- a/quantum/mcu_selection.mk +++ b/quantum/mcu_selection.mk | |||
| @@ -433,6 +433,40 @@ ifneq (,$(filter $(MCU),STM32L433 STM32L443)) | |||
| 433 | UF2_FAMILY ?= STM32L4 | 433 | UF2_FAMILY ?= STM32L4 |
| 434 | endif | 434 | endif |
| 435 | 435 | ||
| 436 | ifneq (,$(filter $(MCU),STM32L412 STM32L422)) | ||
| 437 | # Cortex version | ||
| 438 | MCU = cortex-m4 | ||
| 439 | |||
| 440 | # ARM version, CORTEX-M0/M1 are 6, CORTEX-M3/M4/M7 are 7 | ||
| 441 | ARMV = 7 | ||
| 442 | |||
| 443 | ## chip/board settings | ||
| 444 | # - the next two should match the directories in | ||
| 445 | # <chibios>/os/hal/ports/$(MCU_FAMILY)/$(MCU_SERIES) | ||
| 446 | MCU_FAMILY = STM32 | ||
| 447 | MCU_SERIES = STM32L4xx | ||
| 448 | |||
| 449 | # Linker script to use | ||
| 450 | # - it should exist either in <chibios>/os/common/ports/ARMCMx/compilers/GCC/ld/ | ||
| 451 | # or <keyboard_dir>/ld/ | ||
| 452 | MCU_LDSCRIPT ?= STM32L412xB | ||
| 453 | |||
| 454 | # Startup code to use | ||
| 455 | # - it should exist in <chibios>/os/common/startup/ARMCMx/compilers/GCC/mk/ | ||
| 456 | MCU_STARTUP ?= stm32l4xx | ||
| 457 | |||
| 458 | # Board: it should exist either in <chibios>/os/hal/boards/, | ||
| 459 | # <keyboard_dir>/boards/, or drivers/boards/ | ||
| 460 | BOARD ?= GENERIC_STM32_L412XB | ||
| 461 | |||
| 462 | PLATFORM_NAME ?= platform_l432 | ||
| 463 | |||
| 464 | USE_FPU ?= yes | ||
| 465 | |||
| 466 | # UF2 settings | ||
| 467 | UF2_FAMILY ?= STM32L4 | ||
| 468 | endif | ||
| 469 | |||
| 436 | ifneq (,$(filter $(MCU),at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647 at90usb1286 at90usb1287)) | 470 | ifneq (,$(filter $(MCU),at90usb162 atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 at90usb647 at90usb1286 at90usb1287)) |
| 437 | PROTOCOL = LUFA | 471 | PROTOCOL = LUFA |
| 438 | 472 | ||
