diff options
| author | QMK Bot <hello@qmk.fm> | 2021-05-13 02:30:14 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-05-13 02:30:14 +0000 |
| commit | c24d29ef54e4ae62b020208898148d2edd4e71fd (patch) | |
| tree | 9375fc1b115837514fca0f698f0531b61a8feb13 | |
| parent | 2d29ce5de16d91d08bb684aef9b9480769eeb55c (diff) | |
| parent | a2412e3f4c3b17778d4eb72d9fcfcbffa04d1c7b (diff) | |
| download | qmk_firmware-c24d29ef54e4ae62b020208898148d2edd4e71fd.tar.gz qmk_firmware-c24d29ef54e4ae62b020208898148d2edd4e71fd.zip | |
Merge remote-tracking branch 'origin/master' into develop
| -rw-r--r-- | platforms/chibios/BLACKPILL_STM32_F401/configs/config.h | 9 | ||||
| -rw-r--r-- | platforms/chibios/BLACKPILL_STM32_F411/configs/config.h | 9 |
2 files changed, 14 insertions, 4 deletions
diff --git a/platforms/chibios/BLACKPILL_STM32_F401/configs/config.h b/platforms/chibios/BLACKPILL_STM32_F401/configs/config.h index 1c9d9c612..e181422eb 100644 --- a/platforms/chibios/BLACKPILL_STM32_F401/configs/config.h +++ b/platforms/chibios/BLACKPILL_STM32_F401/configs/config.h | |||
| @@ -17,8 +17,13 @@ | |||
| 17 | 17 | ||
| 18 | #define BOARD_OTG_NOVBUSSENS 1 | 18 | #define BOARD_OTG_NOVBUSSENS 1 |
| 19 | 19 | ||
| 20 | #define STM32_LSECLK 32768U | 20 | #ifndef STM32_LSECLK |
| 21 | #define STM32_HSECLK 25000000U | 21 | # define STM32_LSECLK 32768U |
| 22 | #endif // STM32_LSECLK | ||
| 23 | |||
| 24 | #ifndef STM32_HSECLK | ||
| 25 | # define STM32_HSECLK 25000000U | ||
| 26 | #endif // STM32_HSECLK | ||
| 22 | 27 | ||
| 23 | #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP | 28 | #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP |
| 24 | # define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE | 29 | # define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE |
diff --git a/platforms/chibios/BLACKPILL_STM32_F411/configs/config.h b/platforms/chibios/BLACKPILL_STM32_F411/configs/config.h index 1c9d9c612..e181422eb 100644 --- a/platforms/chibios/BLACKPILL_STM32_F411/configs/config.h +++ b/platforms/chibios/BLACKPILL_STM32_F411/configs/config.h | |||
| @@ -17,8 +17,13 @@ | |||
| 17 | 17 | ||
| 18 | #define BOARD_OTG_NOVBUSSENS 1 | 18 | #define BOARD_OTG_NOVBUSSENS 1 |
| 19 | 19 | ||
| 20 | #define STM32_LSECLK 32768U | 20 | #ifndef STM32_LSECLK |
| 21 | #define STM32_HSECLK 25000000U | 21 | # define STM32_LSECLK 32768U |
| 22 | #endif // STM32_LSECLK | ||
| 23 | |||
| 24 | #ifndef STM32_HSECLK | ||
| 25 | # define STM32_HSECLK 25000000U | ||
| 26 | #endif // STM32_HSECLK | ||
| 22 | 27 | ||
| 23 | #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP | 28 | #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP |
| 24 | # define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE | 29 | # define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE |