aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--os/hal/ports/STM32/STM32F1xx/hal_lld_f100.h5
-rw-r--r--readme.txt2
2 files changed, 5 insertions, 2 deletions
diff --git a/os/hal/ports/STM32/STM32F1xx/hal_lld_f100.h b/os/hal/ports/STM32/STM32F1xx/hal_lld_f100.h
index 63f5533a1..2f6024269 100644
--- a/os/hal/ports/STM32/STM32F1xx/hal_lld_f100.h
+++ b/os/hal/ports/STM32/STM32F1xx/hal_lld_f100.h
@@ -311,8 +311,9 @@
#error "HSE not enabled, required by STM32_SW and STM32_PLLSRC"
#endif
-#if (STM32_MCOSEL == STM32_MCOSEL_HSE) || \
- ((STM32_MCOSEL == STM32_MCOSEL_PLL) && (STM32_PLLSRC == STM32_PLLSRC_HSE))
+#if (STM32_MCOSEL == STM32_MCOSEL_HSE) || \
+ ((STM32_MCOSEL == STM32_MCOSEL_PLLDIV2) && \
+ (STM32_PLLSRC == STM32_PLLSRC_HSE))
#error "HSE not enabled, required by STM32_MCOSEL"
#endif
diff --git a/readme.txt b/readme.txt
index 11968466b..278d848af 100644
--- a/readme.txt
+++ b/readme.txt
@@ -114,6 +114,8 @@
- HAL: Introduced support for TIM21 and TIM22 in STM32 ST driver.
- HAL: Updated STM32F0xx headers to STM32CubeF0 version 1.3.0. Added support
for STM32F030xC, STM32F070x6, STM32F070xB devices.
+- HAL: Fixed error in hal_lld_f100.h checks (bug #641)(backported to 3.0.2
+ and 2.6.10).
- HAL: Fixed volatile variable issue in I/O queues, both RT and HAL (bug #640)
(backported to 3.0.2).
- HAL: Fixed wrong DMA assignment for I2C1 in STM32F302xC registry (bug #637)