Aksal/nuttx
3
1
Fork 1
mirror of https://github.com/apache/nuttx.git synced 2026-09-09 02:16:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

stm32g0: Fix erase bank selection after bank swap

Browse source 
The flash page number follows the logical memory mapping, but BKER selects a physical flash bank. Account for the nSWAP_BANK option when selecting BKER so erasing a logical address targets the corresponding physical bank after a swap.

Assisted-by: OpenAI Codex <codex@openai.com>
Signed-off-by: jsanchez-2g <jsanchez@2g-eng.com>
This commit is contained in:
jsanchez-2g 2026-09-03 09:22:11 -05:00 • committed by Alan C. Assis
parent c8f1e093f5
commit b75b93fd32
1 changed files with 15 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

16
arch/arm/src/common/stm32/stm32_flash_m0_g0c0.c
View file

@ -373,6 +373,7 @@ static void flash_lock_cr(void)
static bool flash_unlock_opt(void)
{
bool was_locked = false;
flash_unlock_cr();
if (getreg32(STM32_FLASH_CR) & FLASH_CR_OPTLOCK)
@ -688,6 +689,9 @@ ssize_t up_progmem_eraseblock(size_t block)
{
int ret;
size_t block_address;
#ifdef FLASH_DUAL_BANK
bool bank2;
#endif
ret = flash_verify_blocknum(block);
if (ret < 0)
@ -729,7 +733,17 @@ ssize_t up_progmem_eraseblock(size_t block)
* match the correct bank.
*/
if (block >= flash_bank2_priv.stblock)
/* BKER selects a physical bank, while block numbers follow the memory map.
* Reverse the bank selection when the banks are swapped in the memory map.
*/
bank2 = block >= flash_bank2_priv.stblock;
if ((getreg32(STM32_FLASH_OPTR) & FLASH_OPTR_NSWAP_BANK) == 0)
{
bank2 = !bank2;
}
if (bank2)
{
modifyreg32(STM32_FLASH_CR, 0, FLASH_CR_BKER);
}