diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-07-13 07:14:21 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-07-13 07:14:21 +0000 |
| commit | 43ca8b55d2f9e84656415c1442c7f212e9c87224 (patch) | |
| tree | d55c676b29d9e3a0ae5cc5eff750fa46c3098e7b | |
| parent | 6627768bdfe33da4ce19730007a91061120b513c (diff) | |
| download | ChibiOS-43ca8b55d2f9e84656415c1442c7f212e9c87224.tar.gz ChibiOS-43ca8b55d2f9e84656415c1442c7f212e9c87224.tar.bz2 ChibiOS-43ca8b55d2f9e84656415c1442c7f212e9c87224.zip | |
Fixed bug #417.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@5963 35acf78f-673a-0410-8e92-d51de3d6d3f4
| -rw-r--r-- | os/hal/platforms/STM32F1xx/hal_lld_f105_f107.h | 3 | ||||
| -rw-r--r-- | readme.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/os/hal/platforms/STM32F1xx/hal_lld_f105_f107.h b/os/hal/platforms/STM32F1xx/hal_lld_f105_f107.h index 4daa5df52..115ae8173 100644 --- a/os/hal/platforms/STM32F1xx/hal_lld_f105_f107.h +++ b/os/hal/platforms/STM32F1xx/hal_lld_f105_f107.h @@ -696,8 +696,7 @@ #endif
/* PLL2 activation conditions.*/
-#if STM32_OTG_CLOCK_REQUIRED || \
- (STM32_PREDIV1SRC == STM32_PREDIV1SRC_PLL2) || \
+#if ((STM32_PREDIV1SRC == STM32_PREDIV1SRC_PLL2) && STM32_ACTIVATE_PLL1) || \
(STM32_MCOSEL == STM32_MCOSEL_PLL2DIV2) || \
defined(__DOXYGEN__)
/**
diff --git a/readme.txt b/readme.txt index 8777b246a..e89a4547b 100644 --- a/readme.txt +++ b/readme.txt @@ -91,6 +91,8 @@ *** 2.7.0 ***
- FIX: Fixed missing casts in time-conversion macros (bug #418)(backported
to 2.6.1, 2.4.4 and 2.2.10).
+- FIX: Fixed PLL2 activation condition is wrong in STM32F107 HAL (bug #417)
+ (backported to 2.6.1 and 2.4.4).
- FIX: Fixed STM32 Serial (v2) driver invalid CR registers size (bug #416)
(backported to 2.6.0).
- FIX: Fixed MS2ST() and US2ST() macros error (bug #415)(backported to 2.6.0,
|