diff options
| author | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-06-17 13:36:58 +0000 |
|---|---|---|
| committer | Giovanni Di Sirio <gdisirio@gmail.com> | 2018-06-17 13:36:58 +0000 |
| commit | 0d21de71ed974082179e8eb972a04584d1eed810 (patch) | |
| tree | 0f667b2d9c779965ed9d6f80b73aeb9b320db3c8 | |
| parent | d40f2cbd3924aca4486561136e7ccb37cceff810 (diff) | |
| download | ChibiOS-0d21de71ed974082179e8eb972a04584d1eed810.tar.gz ChibiOS-0d21de71ed974082179e8eb972a04584d1eed810.tar.bz2 ChibiOS-0d21de71ed974082179e8eb972a04584d1eed810.zip | |
Fixed some mcuconf.h files and a regression introduced by the new STM32F4 clock tree.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@12110 110e8d01-0319-4d1e-a829-52ad28d1bb01
| -rw-r--r-- | demos/STM32/RT-STM32F446RE-NUCLEO64/mcuconf.h | 2 | ||||
| -rw-r--r-- | demos/STM32/RT-STM32F446ZE-NUCLEO144/mcuconf.h | 2 | ||||
| -rw-r--r-- | demos/STM32/RT-STM32F469I-DISCOVERY/mcuconf.h | 2 | ||||
| -rw-r--r-- | os/hal/ports/STM32/STM32F4xx/hal_lld.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/demos/STM32/RT-STM32F446RE-NUCLEO64/mcuconf.h b/demos/STM32/RT-STM32F446RE-NUCLEO64/mcuconf.h index 023647cc2..d592c5664 100644 --- a/demos/STM32/RT-STM32F446RE-NUCLEO64/mcuconf.h +++ b/demos/STM32/RT-STM32F446RE-NUCLEO64/mcuconf.h @@ -69,7 +69,7 @@ #define STM32_I2SSRC STM32_I2SSRC_PLLI2S
#define STM32_SAI1SEL STM32_SAI2SEL_PLLR
#define STM32_SAI2SEL STM32_SAI2SEL_PLLR
-#define STM32_CK48MSEL STM32_CK48MSEL_PLLSAI
+#define STM32_CK48MSEL STM32_CK48MSEL_PLLALT
#define STM32_PVD_ENABLE FALSE
#define STM32_PLS STM32_PLS_LEV0
#define STM32_BKPRAM_ENABLE FALSE
diff --git a/demos/STM32/RT-STM32F446ZE-NUCLEO144/mcuconf.h b/demos/STM32/RT-STM32F446ZE-NUCLEO144/mcuconf.h index 1db2fb533..8172bd54a 100644 --- a/demos/STM32/RT-STM32F446ZE-NUCLEO144/mcuconf.h +++ b/demos/STM32/RT-STM32F446ZE-NUCLEO144/mcuconf.h @@ -69,7 +69,7 @@ #define STM32_I2SSRC STM32_I2SSRC_PLLI2S
#define STM32_SAI1SEL STM32_SAI2SEL_PLLR
#define STM32_SAI2SEL STM32_SAI2SEL_PLLR
-#define STM32_CK48MSEL STM32_CK48MSEL_PLLSAI
+#define STM32_CK48MSEL STM32_CK48MSEL_PLLALT
#define STM32_PVD_ENABLE FALSE
#define STM32_PLS STM32_PLS_LEV0
#define STM32_BKPRAM_ENABLE FALSE
diff --git a/demos/STM32/RT-STM32F469I-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F469I-DISCOVERY/mcuconf.h index cbb83d098..44f0b055f 100644 --- a/demos/STM32/RT-STM32F469I-DISCOVERY/mcuconf.h +++ b/demos/STM32/RT-STM32F469I-DISCOVERY/mcuconf.h @@ -67,7 +67,7 @@ #define STM32_I2SSRC STM32_I2SSRC_PLLI2S
#define STM32_SAI1SEL STM32_SAI2SEL_PLLR
#define STM32_SAI2SEL STM32_SAI2SEL_PLLR
-#define STM32_CK48MSEL STM32_CK48MSEL_PLLSAI
+#define STM32_CK48MSEL STM32_CK48MSEL_PLLALT
#define STM32_PVD_ENABLE FALSE
#define STM32_PLS STM32_PLS_LEV0
#define STM32_BKPRAM_ENABLE FALSE
diff --git a/os/hal/ports/STM32/STM32F4xx/hal_lld.h b/os/hal/ports/STM32/STM32F4xx/hal_lld.h index 4b05135e1..102ff0992 100644 --- a/os/hal/ports/STM32/STM32F4xx/hal_lld.h +++ b/os/hal/ports/STM32/STM32F4xx/hal_lld.h @@ -181,7 +181,7 @@ #if STM32_HAS_RCC_CK48MSEL || defined(__DOXYGEN__)
#if (STM32_CK48MSEL == STM32_CK48MSEL_PLL) || defined(__DOXYGEN__)
#define STM32_PLL48CLK (STM32_PLLVCO / STM32_PLLQ_VALUE)
-#elif STM32_CK48MSEL == STM32_CK48MSEL_PLLI2S
+#elif STM32_CK48MSEL == STM32_CK48MSEL_PLLALT
#if STM32_RCC_CK48MSEL_USES_I2S
#define STM32_PLL48CLK STM32_PLLI2S_Q_CLKOUT
#else
|