From 4517ec81fd8ce2003f5344d271c69bdc5b829ee6 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Sun, 22 Jul 2018 20:56:28 +0000 Subject: [PATCH] stm32: flash: remove superfluous locking of option bytes Comments were not consistent, and this serves no purpose. There's no reason to explicitly lock the flash first before unlocking. These bits are simply set when the keys are written. --- lib/stm32/common/flash_common_f.c | 3 --- lib/stm32/common/flash_common_f24.c | 4 ---- lib/stm32/f7/flash.c | 4 ---- lib/stm32/l4/flash.c | 4 ---- 4 files changed, 15 deletions(-) diff --git a/lib/stm32/common/flash_common_f.c b/lib/stm32/common/flash_common_f.c index d0a2188a..291fad9b 100644 --- a/lib/stm32/common/flash_common_f.c +++ b/lib/stm32/common/flash_common_f.c @@ -27,9 +27,6 @@ void flash_unlock(void) { - /* Clear the unlock state. */ - FLASH_CR |= FLASH_CR_LOCK; - /* Authorize the FPEC access. */ FLASH_KEYR = FLASH_KEYR_KEY1; FLASH_KEYR = FLASH_KEYR_KEY2; diff --git a/lib/stm32/common/flash_common_f24.c b/lib/stm32/common/flash_common_f24.c index 443d9833..db4ce4c5 100644 --- a/lib/stm32/common/flash_common_f24.c +++ b/lib/stm32/common/flash_common_f24.c @@ -96,10 +96,6 @@ reset. 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_KEY2; } diff --git a/lib/stm32/f7/flash.c b/lib/stm32/f7/flash.c index 314343b4..0dcf388b 100644 --- a/lib/stm32/f7/flash.c +++ b/lib/stm32/f7/flash.c @@ -91,10 +91,6 @@ reset. 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_KEY2; } diff --git a/lib/stm32/l4/flash.c b/lib/stm32/l4/flash.c index d1fa4663..fd3665aa 100644 --- a/lib/stm32/l4/flash.c +++ b/lib/stm32/l4/flash.c @@ -98,10 +98,6 @@ void flash_clear_status_flags(void) */ void flash_unlock_option_bytes(void) { - /* Clear the unlock state. */ - FLASH_CR |= FLASH_CR_OPTLOCK; - - /* Unlock option bytes. */ FLASH_OPTKEYR = FLASH_OPTKEYR_KEY1; FLASH_OPTKEYR = FLASH_OPTKEYR_KEY2; }