aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriabdalkader2018-03-09 13:37:00 +0200
committerDamien George2018-03-09 23:37:09 +1100
commitad2a6e538ca008d5e25bb03223ac4b948a340aff (patch)
tree871d6cbef8457a204eaaac744e1e2a496fa1b78a
parent9cef2b03a7a7bae2adb91e42320efa3e2af33a22 (diff)
stm32/system_stm32: Fix CONFIG_RCC_CR_2ND value to use bitwise or.
-rw-r--r--ports/stm32/system_stm32.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ports/stm32/system_stm32.c b/ports/stm32/system_stm32.c
index bd25a149b..77875f32c 100644
--- a/ports/stm32/system_stm32.c
+++ b/ports/stm32/system_stm32.c
@@ -110,7 +110,7 @@ void __fatal_error(const char *msg);
#if defined(MCU_SERIES_F4) || defined(MCU_SERIES_F7)
#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)
#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)
#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)
/*
* FIXME Do not know why I have to define these arrays here! they should be defined in the