EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FLASH: Make sure that the flash unlock register state is cleared before trying to unlock the flash.

Browse Source
This commit is contained in:
Piotr Esden-Tempski
2013-02-26 15:25:55 -08:00
parent bc853e7ebd
commit 5e7ec39440
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/stm32/f1/flash.c
View File

@@ -52,6 +52,9 @@ void flash_set_ws(u32 ws)
void flash_unlock(void) void flash_unlock(void)
{ {
/* Clear the unlock state. */
FLASH_CR |= FLASH_CR_LOCK;
/* Authorize the FPEC access. */ /* Authorize the FPEC access. */
FLASH_KEYR = FLASH_KEYR_KEY1; FLASH_KEYR = FLASH_KEYR_KEY1;
FLASH_KEYR = FLASH_KEYR_KEY2; FLASH_KEYR = FLASH_KEYR_KEY2;

7
lib/stm32/f2/flash.c
View File

@@ -78,6 +78,9 @@ void flash_set_ws(u32 ws)
void flash_unlock(void) void flash_unlock(void)
{ {
/* Clear the unlock state. */
FLASH_CR |= FLASH_CR_LOCK;
/* Authorize the FPEC access. */ /* Authorize the FPEC access. */
FLASH_KEYR = FLASH_KEYR_KEY1; FLASH_KEYR = FLASH_KEYR_KEY1;
FLASH_KEYR = FLASH_KEYR_KEY2; FLASH_KEYR = FLASH_KEYR_KEY2;
@@ -130,6 +133,10 @@ void flash_clear_status_flags(void)
void flash_unlock_option_bytes(void) void flash_unlock_option_bytes(void)
{ {
/* Clear the unlock state. */
FLASH_OPTCR |= FLASH_OPTCR_OPTLOCK;
/* Unlock the option bytes. */
FLASH_OPTKEYR = FLASH_OPTKEYR_KEY1; FLASH_OPTKEYR = FLASH_OPTKEYR_KEY1;
FLASH_OPTKEYR = FLASH_OPTKEYR_KEY2; FLASH_OPTKEYR = FLASH_OPTKEYR_KEY2;
} }

7
lib/stm32/f4/flash.c
View File

@@ -78,6 +78,9 @@ void flash_set_ws(u32 ws)
void flash_unlock(void) void flash_unlock(void)
{ {
/* Clear the unlock sequence state. */
FLASH_CR |= FLASH_CR_LOCK;
/* Authorize the FPEC access. */ /* Authorize the FPEC access. */
FLASH_KEYR = FLASH_KEYR_KEY1; FLASH_KEYR = FLASH_KEYR_KEY1;
FLASH_KEYR = FLASH_KEYR_KEY2; FLASH_KEYR = FLASH_KEYR_KEY2;
@@ -130,6 +133,10 @@ void flash_clear_status_flags(void)
void flash_unlock_option_bytes(void) void flash_unlock_option_bytes(void)
{ {
/* Clear the unlock state. */
FLASH_OPTCR |= FLASH_OPTCR_OPTLOCK;
/* Unlock option bytes. */
FLASH_OPTKEYR = FLASH_OPTKEYR_KEY1; FLASH_OPTKEYR = FLASH_OPTKEYR_KEY1;
FLASH_OPTKEYR = FLASH_OPTKEYR_KEY2; FLASH_OPTKEYR = FLASH_OPTKEYR_KEY2;
} }