git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@9989 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Rocco Marco Guglielmi 2016-12-26 09:58:20 +00:00
parent a00002ab53
commit 4b1426b2de
2 changed files with 4 additions and 2 deletions

View File

@ -309,7 +309,7 @@ void stm32_clock_init(void) {
/* Set flash WS's for SYSCLK source */
if (STM32_FLASHBITS > STM32_MSI_FLASHBITS)
FLASH->ACR = STM32_FLASHBITS;
FLASH->ACR = (FLASH->ACR & ~FLASH_ACR_LATENCY_Msk) | STM32_FLASHBITS;
/* Switching to the configured SYSCLK source if it is different from MSI.*/
#if (STM32_SW != STM32_SW_MSI)
@ -321,7 +321,7 @@ void stm32_clock_init(void) {
/* Reduce the flash WS's for SYSCLK source if they are less than MSI WSs */
if (STM32_FLASHBITS < STM32_MSI_FLASHBITS)
FLASH->ACR = STM32_FLASHBITS;
FLASH->ACR = (FLASH->ACR & ~FLASH_ACR_LATENCY_Msk) | STM32_FLASHBITS;
#endif /* STM32_NO_INIT */

View File

@ -153,6 +153,8 @@
- RT: Merged RT4.
- NIL: Merged NIL2.
- NIL: Added STM32F7 demo.
- HAL: Fixed flash waiting state misconfiguration in STM32L4 port (bug #804)
(backported to 16.1.6).
- HAL: Added CR field to DAC configuration in STM32 port (bug #803)
(backported to 16.1.6).
- HAL: Fixed wrong initialization for DACD4 in STM32 port (bug #802)