summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-05-13 02:30:14 +0000
committerQMK Bot <hello@qmk.fm>2021-05-13 02:30:14 +0000
commitc24d29ef54e4ae62b020208898148d2edd4e71fd (patch)
tree9375fc1b115837514fca0f698f0531b61a8feb13
parent2d29ce5de16d91d08bb684aef9b9480769eeb55c (diff)
parenta2412e3f4c3b17778d4eb72d9fcfcbffa04d1c7b (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--platforms/chibios/BLACKPILL_STM32_F401/configs/config.h9
-rw-r--r--platforms/chibios/BLACKPILL_STM32_F411/configs/config.h9
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 1c9d9c6126..e181422eba 100644
--- a/platforms/chibios/BLACKPILL_STM32_F401/configs/config.h
+++ b/platforms/chibios/BLACKPILL_STM32_F401/configs/config.h
@@ -17,8 +17,13 @@
#define BOARD_OTG_NOVBUSSENS 1
-#define STM32_LSECLK 32768U
-#define STM32_HSECLK 25000000U
+#ifndef STM32_LSECLK
+# define STM32_LSECLK 32768U
+#endif // STM32_LSECLK
+
+#ifndef STM32_HSECLK
+# define STM32_HSECLK 25000000U
+#endif // STM32_HSECLK
#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
# 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 1c9d9c6126..e181422eba 100644
--- a/platforms/chibios/BLACKPILL_STM32_F411/configs/config.h
+++ b/platforms/chibios/BLACKPILL_STM32_F411/configs/config.h
@@ -17,8 +17,13 @@
#define BOARD_OTG_NOVBUSSENS 1
-#define STM32_LSECLK 32768U
-#define STM32_HSECLK 25000000U
+#ifndef STM32_LSECLK
+# define STM32_LSECLK 32768U
+#endif // STM32_LSECLK
+
+#ifndef STM32_HSECLK
+# define STM32_HSECLK 25000000U
+#endif // STM32_HSECLK
#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
# define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE