mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stm32/flash: Fix sector and bank calculation for H5 and H7 MCUs. 

Flash sectors should start counting at 0 for each bank.  This commit makes
sure that is the case on all H5 and H7 MCUs, by using `get_page()` instead
of `flash_get_sector_info()`.

Signed-off-by: Damien George <damien@micropython.org>
This commit is contained in:
Damien George 2023-11-23 10:29:28 +11:00
parent 5cb93f63fb
commit 7ecff515d7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ports/stm32/flash.c
View File

@ -163,13 +163,18 @@ static const flash_layout_t flash_layout[] = {
#error Unsupported processor #error Unsupported processor
#endif #endif
#if defined(STM32H723xx) || defined(STM32H750xx) #if defined(STM32H7) && !defined(DUAL_BANK)
// get the bank of a given flash address // get the bank of a given flash address
static uint32_t get_bank(uint32_t addr) { static uint32_t get_bank(uint32_t addr) {
return FLASH_BANK_1; return FLASH_BANK_1;
} }
// get the page of a given flash address
static uint32_t get_page(uint32_t addr) {
return (addr - FLASH_LAYOUT_START_ADDR) / FLASH_LAYOUT_SECTOR_SIZE;
}
#elif (defined(STM32L4) && defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32H5) || defined(STM32H7) #elif (defined(STM32L4) && defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32H5) || defined(STM32H7)
// get the bank of a given flash address // get the bank of a given flash address
@ -195,7 +200,6 @@ static uint32_t get_bank(uint32_t addr) {
} }
} }
#if (defined(STM32L4) && defined(SYSCFG_MEMRMP_FB_MODE))
// get the page of a given flash address // get the page of a given flash address
static uint32_t get_page(uint32_t addr) { static uint32_t get_page(uint32_t addr) {
if (addr < (FLASH_LAYOUT_START_ADDR + FLASH_BANK_SIZE)) { if (addr < (FLASH_LAYOUT_START_ADDR + FLASH_BANK_SIZE)) {
@ -206,7 +210,6 @@ static uint32_t get_page(uint32_t addr) {
return (addr - (FLASH_LAYOUT_START_ADDR + FLASH_BANK_SIZE)) / FLASH_LAYOUT_SECTOR_SIZE; return (addr - (FLASH_LAYOUT_START_ADDR + FLASH_BANK_SIZE)) / FLASH_LAYOUT_SECTOR_SIZE;
} }
} }
#endif
#elif (defined(STM32L4) && !defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32WB) || defined(STM32WL) #elif (defined(STM32L4) && !defined(SYSCFG_MEMRMP_FB_MODE)) || defined(STM32WB) || defined(STM32WL)
@ -352,10 +355,7 @@ int flash_erase(uint32_t flash_dest) {
EraseInitStruct.Sector = flash_get_sector_info(flash_dest, NULL, NULL); EraseInitStruct.Sector = flash_get_sector_info(flash_dest, NULL, NULL);
#elif defined(STM32H5) || defined(STM32H7) #elif defined(STM32H5) || defined(STM32H7)
EraseInitStruct.Banks = get_bank(flash_dest); EraseInitStruct.Banks = get_bank(flash_dest);
EraseInitStruct.Sector = flash_get_sector_info(flash_dest, NULL, NULL); EraseInitStruct.Sector = get_page(flash_dest);
#if defined(STM32H5)
EraseInitStruct.Sector &= 0x7f; // second bank should start counting at 0
#endif
#else #else
#error Unsupported processor #error Unsupported processor
#endif #endif