diff options
| author | Bernard Xiong <[email protected]> | 2015-05-02 01:33:58 +0000 |
|---|---|---|
| committer | Bernard Xiong <[email protected]> | 2015-05-02 01:33:58 +0000 |
| commit | 5ca3da9e1c2f917b09ffce06bd41b29bf72600ec (patch) | |
| tree | 83508cdd816c5514c8fc54d491671b346e879f0f /bsp | |
| parent | a7d6e284d0b6330fc0992ff424b7bfab4109a1c6 (diff) | |
| parent | fa901c70bc0124424d389b071f5ed28591a114f6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'bsp')
3 files changed, 3 insertions, 2 deletions
diff --git a/bsp/stm32f10x/drivers/gpio.c b/bsp/stm32f10x/drivers/gpio.c index 747b55b4dc..6e46835417 100644 --- a/bsp/stm32f10x/drivers/gpio.c +++ b/bsp/stm32f10x/drivers/gpio.c @@ -36,6 +36,7 @@ static const struct pin_index pins[] = { #if (STM32F10X_PIN_NUMBERS == 64) __STM32_PIN_DEFAULT, + __STM32_PIN_DEFAULT, __STM32_PIN(2, APB2, C, 13), __STM32_PIN(3, APB2, C, 14), __STM32_PIN(4, APB2, C, 15), 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 */ |
