Skip to content

Commit

Permalink
STM32Gx: flash: clear programming mode before erasing
Browse files Browse the repository at this point in the history
As described in 3.3.8, if erasing while another mode's "enable" bit
is set, a programming sequence error will be raised. This change
makes sure this will not happen for an erase operation.
  • Loading branch information
d4ilyrun committed Aug 8, 2024
1 parent 627774e commit b571196
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions src/stlink-lib/common_flash.c
Original file line number Diff line number Diff line change
Expand Up @@ -1124,6 +1124,10 @@ int32_t stlink_erase_flash_page(stlink_t *sl, stm32_addr_t flashaddr) {
stlink_read_debug32(sl, FLASH_Gx_CR, &val);
// sec 3.7.5 - PNB[9:0] is offset by 3. PER is 0x2.
val &= ~(0x7FF << 3);
// sec 3.3.8 - Error PGSERR
// * In the page erase sequence: PG, FSTPG and MER1 are not cleared when PER is set
val &= ~(1 << FLASH_Gx_CR_MER1 | 1 << FLASH_Gx_CR_MER2);
val &= ~(1 << FLASH_Gx_CR_PG);
// Products of the Gx series with more than 128K of flash use 2 banks.
// In this case we need to specify which bank to erase (sec 3.7.5 - BKER)
if (sl->flash_size > (128 * 1024) &&
Expand Down

0 comments on commit b571196

Please sign in to comment.