djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32/system_stm32: Fix CONFIG_RCC_CR_2ND value to use bitwise or.

This commit is contained in:
iabdalkader 2018-03-09 13:37:00 +02:00 committed by Damien George
parent 9cef2b03a7
commit ad2a6e538c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/stm32/system_stm32.c
View File

@ -110,7 +110,7 @@ void __fatal_error(const char *msg);
#if defined(MCU_SERIES_F4) || defined(MCU_SERIES_F7) #if defined(MCU_SERIES_F4) || defined(MCU_SERIES_F7)
#define CONFIG_RCC_CR_1ST (RCC_CR_HSION) #define CONFIG_RCC_CR_1ST (RCC_CR_HSION)
#define CONFIG_RCC_CR_2ND (RCC_CR_HSEON || RCC_CR_CSSON || RCC_CR_PLLON) #define CONFIG_RCC_CR_2ND (RCC_CR_HSEON | RCC_CR_CSSON | RCC_CR_PLLON)
#define CONFIG_RCC_PLLCFGR (0x24003010) #define CONFIG_RCC_PLLCFGR (0x24003010)
#if defined(MCU_SERIES_F4) #if defined(MCU_SERIES_F4)
@ -124,7 +124,7 @@ const uint8_t APBPrescTable[8] = {0, 0, 0, 0, 1, 2, 3, 4};
#elif defined(MCU_SERIES_L4) #elif defined(MCU_SERIES_L4)
#define CONFIG_RCC_CR_1ST (RCC_CR_MSION) #define CONFIG_RCC_CR_1ST (RCC_CR_MSION)
#define CONFIG_RCC_CR_2ND (RCC_CR_HSEON || RCC_CR_CSSON || RCC_CR_HSION || RCC_CR_PLLON) #define CONFIG_RCC_CR_2ND (RCC_CR_HSEON | RCC_CR_CSSON | RCC_CR_HSION | RCC_CR_PLLON)
#define CONFIG_RCC_PLLCFGR (0x00001000) #define CONFIG_RCC_PLLCFGR (0x00001000)
/* /*
* FIXME Do not know why I have to define these arrays here! they should be defined in the * FIXME Do not know why I have to define these arrays here! they should be defined in the