From 86e0e99187f2074474404662a4e7cee3d2c5f2da Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 1 Nov 2012 15:31:10 +0000 Subject: ST32F4Discovery board.h patches from Freddie Chopin git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5291 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/ChangeLog | 3 +++ nuttx/configs/stm32f4discovery/include/board.h | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index e14cac1e2..40ff0a51b 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -3545,3 +3545,6 @@ lib_feof.c, and lib_clearerr.c: Add support for ferror(), feof(), and clearerror(). ferror() support is bogus at the moment (it is equivalent to !feof()); the others should be good. + * configs/stm32f4discovery/include/board.h: Correct timer 2-7 + base frequency (provided by Freddie Chopin). + diff --git a/nuttx/configs/stm32f4discovery/include/board.h b/nuttx/configs/stm32f4discovery/include/board.h index 9b866d56f..01ae56b30 100644 --- a/nuttx/configs/stm32f4discovery/include/board.h +++ b/nuttx/configs/stm32f4discovery/include/board.h @@ -66,7 +66,7 @@ * AHB Prescaler : 1 (STM32_RCC_CFGR_HPRE) * APB1 Prescaler : 4 (STM32_RCC_CFGR_PPRE1) * APB2 Prescaler : 2 (STM32_RCC_CFGR_PPRE2) - * HSE Frequency(Hz) : 25000000 (STM32_BOARD_XTAL) + * HSE Frequency(Hz) : 8000000 (STM32_BOARD_XTAL) * PLLM : 8 (STM32_PLLCFG_PLLM) * PLLN : 336 (STM32_PLLCFG_PLLN) * PLLP : 2 (STM32_PLLCFG_PLLP) @@ -82,7 +82,7 @@ /* HSI - 16 MHz RC factory-trimmed * LSI - 32 KHz RC - * HSE - On-board crystal frequency is 25MHz + * HSE - On-board crystal frequency is 8MHz * LSE - 32.768 kHz */ @@ -97,7 +97,7 @@ * * PLL source is HSE * PLL_VCO = (STM32_HSE_FREQUENCY / PLLM) * PLLN - * = (25,000,000 / 25) * 336 + * = (8,000,000 / 8) * 336 * = 336,000,000 * SYSCLK = PLL_VCO / PLLP * = 336,000,000 / 2 = 168,000,000 @@ -155,7 +155,7 @@ */ #define STM32_TIM18_FREQUENCY STM32_HCLK_FREQUENCY -#define STM32_TIM27_FREQUENCY STM32_HCLK_FREQUENCY +#define STM32_TIM27_FREQUENCY (STM32_HCLK_FREQUENCY/2) /* LED definitions ******************************************************************/ /* If CONFIG_ARCH_LEDS is not defined, then the user can control the LEDs in any -- cgit v1.2.3