[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-607-g6673f90e0

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  6673f90e08ac7fb079403dfe7011779349559f0c (commit)
      from  6883567d5f734040a40c4b2c2d739fa432132cb2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 6673f90e08ac7fb079403dfe7011779349559f0c
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Thu Feb 24 15:18:53 2022 +0100

    flash/stm32h7x: fix FLASH_WPSN_PRG mask used for protection
    
    STM32H7Ax/7Bx devices have a different WPSN mask (0xFFFFFFFF),
    (0xFF for STM32H74x/75x and STM32H72x/73x devices).
    
    And when supporting STM32H7Ax/7Bx devices, stm32x_protect() was
    not updated accordingly.
    
    Change-Id: I081217af3e5ed815b67bfdfec7f4ebaa3152a865
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Fixes: 0b7eca17691a (flash/stm32h7x: add support of STM32H7Ax/H7Bx devices)
    Reviewed-on: https://review.openocd.org/c/openocd/+/6858
    Reviewed-by: Tomas Vanek <va...@fb...>
    Tested-by: jenkins

diff --git a/src/flash/nor/stm32h7x.c b/src/flash/nor/stm32h7x.c
index 6d3149f94..d2914eb39 100644
--- a/src/flash/nor/stm32h7x.c
+++ b/src/flash/nor/stm32h7x.c
@@ -531,6 +531,7 @@ static int stm32x_protect(struct flash_bank *bank, int set, unsigned int first,
 		unsigned int last)
 {
 	struct target *target = bank->target;
+	struct stm32h7x_flash_bank *stm32x_info = bank->driver_priv;
 	uint32_t protection;
 
 	if (target->state != TARGET_HALTED) {
@@ -553,7 +554,7 @@ static int stm32x_protect(struct flash_bank *bank, int set, unsigned int first,
 	}
 
 	/* apply WRPSN mask */
-	protection &= 0xff;
+	protection &= stm32x_info->part_info->wps_mask;
 
 	LOG_DEBUG("stm32x_protect, option_bytes written WPSN 0x%" PRIx32, protection);
 

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nor/stm32h7x.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository