andreika-git
/
ChibiOS
mirror of https://github.com/andreika-git/ChibiOS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #918. 

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11542 35acf78f-673a-0410-8e92-d51de3d6d3f4
This commit is contained in:
Giovanni Di Sirio 2018-02-23 09:56:01 +00:00
parent c716b58ebc
commit 13f3a2a253
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
os/hal/ports/STM32/STM32F4xx/hal_lld.h
View File

@ -1961,8 +1961,10 @@
#define STM32_FLASHBITS 0x00000006 #define STM32_FLASHBITS 0x00000006
#elif STM32_HCLK <= STM32_7WS_THRESHOLD #elif STM32_HCLK <= STM32_7WS_THRESHOLD
#define STM32_FLASHBITS 0x00000007 #define STM32_FLASHBITS 0x00000007
#else #elif STM32_HCLK <= STM32_8WS_THRESHOLD
#define STM32_FLASHBITS 0x00000008 #define STM32_FLASHBITS 0x00000008
#else
#error "invalid frequency at specified VDD level"
#endif #endif
/* There are differences in vector names in the various sub-families, /* There are differences in vector names in the various sub-families,

15
os/hal/ports/STM32/STM32F7xx/hal_lld.h
View File

@ -930,8 +930,9 @@
#define STM32_4WS_THRESHOLD 150000000 #define STM32_4WS_THRESHOLD 150000000
#define STM32_5WS_THRESHOLD 180000000 #define STM32_5WS_THRESHOLD 180000000
#define STM32_6WS_THRESHOLD 210000000 #define STM32_6WS_THRESHOLD 210000000
#define STM32_7WS_THRESHOLD 0 #define STM32_7WS_THRESHOLD STM32_SYSCLK_MAX
#define STM32_8WS_THRESHOLD 0 #define STM32_8WS_THRESHOLD 0
#define STM32_9WS_THRESHOLD 0
#elif (STM32_VDD >= 240) && (STM32_VDD < 270) #elif (STM32_VDD >= 240) && (STM32_VDD < 270)
#define STM32_0WS_THRESHOLD 24000000 #define STM32_0WS_THRESHOLD 24000000
@ -942,7 +943,8 @@
#define STM32_5WS_THRESHOLD 144000000 #define STM32_5WS_THRESHOLD 144000000
#define STM32_6WS_THRESHOLD 168000000 #define STM32_6WS_THRESHOLD 168000000
#define STM32_7WS_THRESHOLD 192000000 #define STM32_7WS_THRESHOLD 192000000
#define STM32_8WS_THRESHOLD 0 #define STM32_8WS_THRESHOLD STM32_SYSCLK_MAX
#define STM32_9WS_THRESHOLD 0
#elif (STM32_VDD >= 210) && (STM32_VDD < 240) #elif (STM32_VDD >= 210) && (STM32_VDD < 240)
#define STM32_0WS_THRESHOLD 22000000 #define STM32_0WS_THRESHOLD 22000000
@ -954,6 +956,7 @@
#define STM32_6WS_THRESHOLD 154000000 #define STM32_6WS_THRESHOLD 154000000
#define STM32_7WS_THRESHOLD 176000000 #define STM32_7WS_THRESHOLD 176000000
#define STM32_8WS_THRESHOLD 198000000 #define STM32_8WS_THRESHOLD 198000000
#define STM32_9WS_THRESHOLD STM32_SYSCLK_MAX
#elif (STM32_VDD >= 180) && (STM32_VDD < 210) #elif (STM32_VDD >= 180) && (STM32_VDD < 210)
#define STM32_0WS_THRESHOLD 20000000 #define STM32_0WS_THRESHOLD 20000000
@ -964,7 +967,8 @@
#define STM32_5WS_THRESHOLD 120000000 #define STM32_5WS_THRESHOLD 120000000
#define STM32_6WS_THRESHOLD 140000000 #define STM32_6WS_THRESHOLD 140000000
#define STM32_7WS_THRESHOLD 160000000 #define STM32_7WS_THRESHOLD 160000000
#define STM32_8WS_THRESHOLD 0 #define STM32_8WS_THRESHOLD 180000000
#define STM32_9WS_THRESHOLD 0
#else #else
#error "invalid VDD voltage specified" #error "invalid VDD voltage specified"
@ -2058,8 +2062,11 @@
#elif STM32_HCLK <= STM32_8WS_THRESHOLD #elif STM32_HCLK <= STM32_8WS_THRESHOLD
#define STM32_FLASHBITS 0x00000008 #define STM32_FLASHBITS 0x00000008
#else #elif STM32_HCLK <= STM32_9WS_THRESHOLD
#define STM32_FLASHBITS 0x00000009 #define STM32_FLASHBITS 0x00000009
#else
#error "invalid frequency at specified VDD level"
#endif #endif
/*===========================================================================*/ /*===========================================================================*/

2
readme.txt
View File

@ -169,6 +169,8 @@
Updated the various platform.mk implementing "smart build" mode. Updated the various platform.mk implementing "smart build" mode.
- HAL: Fixed wrong DMA settings for STM32F76x I2C3 and I2C4 (bug #920) - HAL: Fixed wrong DMA settings for STM32F76x I2C3 and I2C4 (bug #920)
(backported to 18.2.1 and 17.6.4). (backported to 18.2.1 and 17.6.4).
- HAL: Fixed wrong flash waiting state for STM32F7xx (bug #918)
(backported to 18.2.1 and 17.6.4).
- LIB: Fixed heap allocator failing on simulators (bug #917)(backported - LIB: Fixed heap allocator failing on simulators (bug #917)(backported
to 17.6.4). to 17.6.4).
- STP: Fixed CRT0_FORCE_MSP_INIT flag not defaulted in crt0_v7m.S (bug #916) - STP: Fixed CRT0_FORCE_MSP_INIT flag not defaulted in crt0_v7m.S (bug #916)