Merge pull request #1416 from xlz/testing

Fixed STM32H7 FLASH_OPTCR unlock sequence
stlink-org · Aug 2, 2024 · f5da718 · f5da718
2 parents 35e6e9a + 42b3a10
commit f5da718
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 3 deletions.
diff --git a/inc/stm32flash.h b/inc/stm32flash.h
@@ -236,7 +236,6 @@
 #define FLASH_H7_KEYR1 (FLASH_H7_REGS_ADDR + 0x04)
 #define FLASH_H7_KEYR2 (FLASH_H7_REGS_ADDR + 0x104)
 #define FLASH_H7_OPT_KEYR (FLASH_H7_REGS_ADDR + 0x08)
-#define FLASH_H7_OPT_KEYR2 (FLASH_H7_REGS_ADDR + 0x108)
 #define FLASH_H7_CR1 (FLASH_H7_REGS_ADDR + 0x0c)
 #define FLASH_H7_CR2 (FLASH_H7_REGS_ADDR + 0x10c)
 #define FLASH_H7_SR1 (FLASH_H7_REGS_ADDR + 0x10)

diff --git a/src/stlink-lib/common_flash.c b/src/stlink-lib/common_flash.c
@@ -685,8 +685,6 @@ static int32_t unlock_flash_option(stlink_t *sl) {
     break;
   case STM32_FLASH_TYPE_H7:
     optkey_reg = FLASH_H7_OPT_KEYR;
-    if (sl->chip_flags & CHIP_F_HAS_DUAL_BANK)
-      optkey2_reg = FLASH_H7_OPT_KEYR2;
     break;
   case STM32_FLASH_TYPE_L0_L1:
     optkey_reg = get_stm32l0_flash_base(sl) + FLASH_OPTKEYR_OFF;