diff options
| author | Michael Stapelberg <stapelberg@users.noreply.github.com> | 2021-03-16 20:45:21 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 06:45:21 +1100 |
| commit | 1d341ffbb0dfbf45139c103123549c3c0fec816e (patch) | |
| tree | 53e9a2cf5c0aea78d0089635945a1346652a3277 /tmk_core | |
| parent | 319031154d74ba2568dc855c73d7919a749c7f32 (diff) | |
| download | qmk_firmware-1d341ffbb0dfbf45139c103123549c3c0fec816e.tar.gz qmk_firmware-1d341ffbb0dfbf45139c103123549c3c0fec816e.zip | |
core: add support for MK66F18 (Teensy 3.6) micro controller (#12258)
This is in preparation for https://github.com/qmk/qmk_firmware/pull/10171
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/chibios/bootloader.c | 2 | ||||
| -rw-r--r-- | tmk_core/common/chibios/chibios_config.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tmk_core/common/chibios/bootloader.c b/tmk_core/common/chibios/bootloader.c index 6cabcc4b8..4a175a628 100644 --- a/tmk_core/common/chibios/bootloader.c +++ b/tmk_core/common/chibios/bootloader.c | |||
| @@ -79,7 +79,7 @@ void enter_bootloader_mode_if_requested(void) { | |||
| 79 | } | 79 | } |
| 80 | } | 80 | } |
| 81 | 81 | ||
| 82 | #elif defined(KL2x) || defined(K20x) // STM32_BOOTLOADER_DUAL_BANK // STM32_BOOTLOADER_ADDRESS | 82 | #elif defined(KL2x) || defined(K20x) || defined(MK66F18) // STM32_BOOTLOADER_DUAL_BANK // STM32_BOOTLOADER_ADDRESS |
| 83 | /* Kinetis */ | 83 | /* Kinetis */ |
| 84 | 84 | ||
| 85 | # if defined(BOOTLOADER_KIIBOHD) | 85 | # if defined(BOOTLOADER_KIIBOHD) |
diff --git a/tmk_core/common/chibios/chibios_config.h b/tmk_core/common/chibios/chibios_config.h index 9a66ac317..1d8ace495 100644 --- a/tmk_core/common/chibios/chibios_config.h +++ b/tmk_core/common/chibios/chibios_config.h | |||
| @@ -32,3 +32,7 @@ | |||
| 32 | # define USE_GPIOV1 | 32 | # define USE_GPIOV1 |
| 33 | # define STM32_SYSCLK KINETIS_SYSCLK_FREQUENCY | 33 | # define STM32_SYSCLK KINETIS_SYSCLK_FREQUENCY |
| 34 | #endif | 34 | #endif |
| 35 | |||
| 36 | #if defined(MK66F18) | ||
| 37 | # define STM32_SYSCLK KINETIS_SYSCLK_FREQUENCY | ||
| 38 | #endif | ||