Fixed bug #1196.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@14887 27425a3e-05d8-49a3-a47f-9c15f0e5edd8
This commit is contained in:
parent
54047c87d9
commit
7468c1ad68
|
@ -1474,6 +1474,11 @@
|
||||||
/*
|
/*
|
||||||
* PLLSAI1 enable check.
|
* PLLSAI1 enable check.
|
||||||
*/
|
*/
|
||||||
|
#if ((STM32_SAI1SEL == STM32_SAI1SEL_OFF) && \
|
||||||
|
(STM32_CLK48SEL == STM32_CLK48SEL_PLLSAI1) || \
|
||||||
|
(STM32_ADCSEL == STM32_ADCSEL_PLLSAI1))
|
||||||
|
#error "PLLSAI1 is off and cannot supply CLK48 or ADC"
|
||||||
|
#endif
|
||||||
#if (STM32_SAI1SEL == STM32_SAI1SEL_PLLSAI1) || \
|
#if (STM32_SAI1SEL == STM32_SAI1SEL_PLLSAI1) || \
|
||||||
(STM32_SAI2SEL == STM32_SAI2SEL_PLLSAI1) || \
|
(STM32_SAI2SEL == STM32_SAI2SEL_PLLSAI1) || \
|
||||||
(STM32_CLK48SEL == STM32_CLK48SEL_PLLSAI1) || \
|
(STM32_CLK48SEL == STM32_CLK48SEL_PLLSAI1) || \
|
||||||
|
|
|
@ -84,6 +84,8 @@
|
||||||
- NEW: EFL driver and demo for STM32F3xx.
|
- NEW: EFL driver and demo for STM32F3xx.
|
||||||
- NEW: New unit test subsystem under /os/test. Now it is officially
|
- NEW: New unit test subsystem under /os/test. Now it is officially
|
||||||
ChibiOS/TEST.
|
ChibiOS/TEST.
|
||||||
|
- FIX: SMT32L4+ hangs in clock init when ADC or CLK48 use PLLSAI1 and
|
||||||
|
PLLSAI1 is set to OFF (bug #1196).
|
||||||
- FIX: Fixed ARMCMx port, MPU not enabled when PORT_ENABLE_GUARD_PAGES is set
|
- FIX: Fixed ARMCMx port, MPU not enabled when PORT_ENABLE_GUARD_PAGES is set
|
||||||
(bug #1195)(backported to 20.3.4)(TBP to 21.6.1).
|
(bug #1195)(backported to 20.3.4)(TBP to 21.6.1).
|
||||||
- FIX: Fixed removed incorrect ADCv4 checks for MONEN (bug #1194)
|
- FIX: Fixed removed incorrect ADCv4 checks for MONEN (bug #1194)
|
||||||
|
|
Loading…
Reference in New Issue