[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-218-ga5d34202c

[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  a5d34202c6880bc9b8d0b326628ba1f2e5b061ff (commit)
      from  3733cf196153f56be3a790311aeb95e3c15c56f3 (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 a5d34202c6880bc9b8d0b326628ba1f2e5b061ff
Author: Matthijs Kooijman <mat...@st...>
Date:   Thu Apr 27 18:34:44 2023 +0200

    flash/nor/stm32f2x: Show error message when unprotecting OTP
    
    Trying to disable OTP write protection by running e.g. `flash protect
    1 0 1 off` would already be rejected with an error code, but that would
    result in a generic "failed setting protection for blocks 0 to 1"
    message. Now a more specific error message is also printed, telling the
    user why it failed.
    
    Change-Id: I6d4974eb0bcd23a0a6cf68ff955d9e59b8b1b06a
    Signed-off-by: Matthijs Kooijman <mat...@st...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/7615
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/flash/nor/stm32f2x.c b/src/flash/nor/stm32f2x.c
index fd538d02f..dcaf260d9 100644
--- a/src/flash/nor/stm32f2x.c
+++ b/src/flash/nor/stm32f2x.c
@@ -659,8 +659,10 @@ static int stm32x_protect(struct flash_bank *bank, int set, unsigned int first,
 	}
 
 	if (stm32x_is_otp(bank)) {
-		if (!set)
+		if (!set) {
+			LOG_ERROR("OTP protection can only be enabled");
 			return ERROR_COMMAND_ARGUMENT_INVALID;
+		}
 
 		return stm32x_otp_protect(bank, first, last);
 	}

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

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


hooks/post-receive
-- 
Main OpenOCD repository