diff options
| author | Bernard Xiong <[email protected]> | 2015-04-28 08:36:34 +0800 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2015-04-28 08:36:34 +0800 |
| commit | f111495b4fb9650286ef9dff0ae701fa47d23188 (patch) | |
| tree | af578f5b3e09debc4359e80b40a19d27592c6a37 | |
| parent | 5d65e6eeb6e5814aea7c5be418618c2a58f0e2ec (diff) | |
| parent | 3563c195fb95f5e5d1d2e8291293827a35f3d387 (diff) | |
Merge pull request #466 from aozima/pulls
update stm32f2/f4: fixed PLL_M define.
| -rw-r--r-- | bsp/stm32f20x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F2xx/system_stm32f2xx.c | 2 | ||||
| -rw-r--r-- | bsp/stm32f40x/Libraries/CMSIS/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bsp/stm32f20x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F2xx/system_stm32f2xx.c b/bsp/stm32f20x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F2xx/system_stm32f2xx.c index da0e189c88..63938af735 100644 --- a/bsp/stm32f20x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F2xx/system_stm32f2xx.c +++ b/bsp/stm32f20x/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F2xx/system_stm32f2xx.c @@ -142,7 +142,7 @@ /* PLL_VCO = (HSE_VALUE or HSI_VALUE / PLL_M) * PLL_N */ -#define PLL_M 25 +#define PLL_M (HSE_VALUE / 1000000) #define PLL_N 240 /* SYSCLK = PLL_VCO / PLL_P */ diff --git a/bsp/stm32f40x/Libraries/CMSIS/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c b/bsp/stm32f40x/Libraries/CMSIS/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c index 98e8e04dbe..18fa12b803 100644 --- a/bsp/stm32f40x/Libraries/CMSIS/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c +++ b/bsp/stm32f40x/Libraries/CMSIS/ST/STM32F4xx/Source/Templates/system_stm32f4xx.c @@ -146,7 +146,7 @@ /************************* PLL Parameters *************************************/ /* PLL_VCO = (HSE_VALUE or HSI_VALUE / PLL_M) * PLL_N */ -#define PLL_M 25 +#define PLL_M (HSE_VALUE / 1000000) #define PLL_N 336 /* SYSCLK = PLL_VCO / PLL_P */ |