From c31932ba4954aee28b5216e8846e3237a81d32bd Mon Sep 17 00:00:00 2001 From: Giovanni Di Sirio Date: Sat, 24 Apr 2021 19:14:25 +0000 Subject: [PATCH] Fixed bug #1157. git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14307 27425a3e-05d8-49a3-a47f-9c15f0e5edd8 --- os/hal/ports/STM32/STM32G4xx/hal_lld.c | 2 +- readme.txt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/os/hal/ports/STM32/STM32G4xx/hal_lld.c b/os/hal/ports/STM32/STM32G4xx/hal_lld.c index 5980ccdfe..14957b33a 100644 --- a/os/hal/ports/STM32/STM32G4xx/hal_lld.c +++ b/os/hal/ports/STM32/STM32G4xx/hal_lld.c @@ -134,7 +134,7 @@ void stm32_clock_init(void) { rccResetAPB2(~0); /* PWR clock enable.*/ -#if defined(HAL_USE_RTC) && defined(RCC_APBENR1_RTCAPBEN) +#if (HAL_USE_RTC == TRUE) && defined(RCC_APBENR1_RTCAPBEN) rccEnableAPB1R1(RCC_APB1ENR1_PWREN | RCC_APB1ENR1_RTCAPBEN, false) #else rccEnableAPB1R1(RCC_APB1ENR1_PWREN, false) diff --git a/readme.txt b/readme.txt index 502eb3d8f..203fe3df7 100644 --- a/readme.txt +++ b/readme.txt @@ -133,10 +133,12 @@ MEMS Accelerometers. - NEW: Safer messages mechanism for sandboxes (to be backported to 20.3.1). - NEW: Added latency measurement test application. -- FIX: Fixed STM32G431 DMA defines error (bug #1155) - (backported to 20.3.4). +- FIX: Fixed wrong check on HAL_USE_RTC in STM32G4 clock initialization + (bug #1157)(backported to 20.3.4). - FIX: Fixed wrong checks related to PLLSAI2 on L4 and L4+ (bug #1156) (backported to 20.3.4)(backported to 19.1.5). +- FIX: Fixed STM32G431 DMA defines error (bug #1155) + (backported to 20.3.4). - FIX: Fixed errors in STM32L4xx registry (bug #1154) (backported to 20.3.4)(backported to 19.1.5). - FIX: Fixed QUADSPI errata fix applied to all platforms (bug #1153)