[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-802-gd60e1f669

[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  d60e1f6693e52800603eac7c8de3ade14eb6a514 (commit)
      from  133dd9d669e5b8beb7c7787b0be677621808e72d (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 d60e1f6693e52800603eac7c8de3ade14eb6a514
Author: Pete Moore <pm...@mo...>
Date:   Mon Dec 16 16:55:06 2024 +0100

    flash/nor/sfdp: Fix broken DEBUG log line on macOS
    
    https://review.openocd.org/c/openocd/+/8439 changed variable `words`
    from uint8_t to unsigned int in sfdp.c but failed to update the
    LOG_DEBUG line to reflect the new type. On macOS this caused:
    
    src/flash/nor/sfdp.c:107:28: error: format specifies type 'unsigned
    char' but the argument has type 'unsigned int' [-Werror,-Wformat]
    
    The formatting of the debug line has been updated to reflect the updated
    type.
    
    Change-Id: Ifc7ddb1279ab2603901c969d9c09af847f3a3caf
    Signed-off-by: Pete Moore <pm...@mo...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8660
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/sfdp.c b/src/flash/nor/sfdp.c
index 917f1626f..8e25ba680 100644
--- a/src/flash/nor/sfdp.c
+++ b/src/flash/nor/sfdp.c
@@ -103,7 +103,7 @@ int spi_sfdp(struct flash_bank *bank, struct flash_device *dev,
 		uint16_t id = (((pheaders[k].ptr) >> 16) & 0xFF00) | (pheaders[k].revision & 0xFF);
 		uint32_t ptr = pheaders[k].ptr & 0xFFFFFF;
 
-		LOG_DEBUG("pheader %d len=0x%02" PRIx8 " id=0x%04" PRIx16
+		LOG_DEBUG("pheader %d len=0x%02x id=0x%04" PRIx16
 			" ptr=0x%06" PRIx32, k, words, id, ptr);
 
 		/* retrieve parameter table */

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

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


hooks/post-receive
-- 
Main OpenOCD repository