[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-463-ga498a3dea

[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  a498a3deaaec7ee87d73cf753bdddefaf4779666 (commit)
      from  9d574aa3fab6e6d802fab4ededb24b73542ef2b9 (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 a498a3deaaec7ee87d73cf753bdddefaf4779666
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Nov 13 14:38:21 2021 +0100

    jtagspi: fix build on MacOS
    
    Commit be57b0ab847e ("Update jtagspi driver for 1-, 2- and 4-byte
    addresses") introduces two incorrect format string for uint32_t
    data types.
    This cause build failure on MacOS:
    
    src/flash/nor/jtagspi.c:474:35: error: format specifies type 'unsigned char'
    but the argument has type 'uint32_t' (aka 'unsigned int') [-Werror,-Wformat]
            LOG_DEBUG("status=0x%02" PRIx8, *status);
            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~~
    
    src/flash/nor/jtagspi.c:513:65: error: format specifies type 'unsigned char'
    but the argument has type 'uint32_t' (aka 'unsigned int') [-Werror,-Wformat]
            LOG_ERROR("Cannot enable write to flash. Status=0x%02" PRIx8, status);
            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~~
    
    Fix the format string.
    
    Change-Id: I209053317c8b26c35c6f11be0553ccccc698c551
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Fixes: be57b0ab847e ("Update jtagspi driver for 1-, 2- and 4-byte addresses")
    Reviewed-on: https://review.openocd.org/c/openocd/+/6701
    Reviewed-by: Tomas Vanek <va...@fb...>
    Tested-by: jenkins

diff --git a/src/flash/nor/jtagspi.c b/src/flash/nor/jtagspi.c
index 9d377ce70..a5672c63e 100644
--- a/src/flash/nor/jtagspi.c
+++ b/src/flash/nor/jtagspi.c
@@ -471,7 +471,7 @@ static int jtagspi_read_status(struct flash_bank *bank, uint32_t *status)
 	int err = jtagspi_cmd(bank, SPIFLASH_READ_STATUS, NULL, 0, &buf, -1);
 	if (err == ERROR_OK) {
 		*status = buf;
-		LOG_DEBUG("status=0x%02" PRIx8, *status);
+		LOG_DEBUG("status=0x%02" PRIx32, *status);
 	}
 	return err;
 }
@@ -510,7 +510,7 @@ static int jtagspi_write_enable(struct flash_bank *bank)
 		return retval;
 
 	if ((status & SPIFLASH_WE_BIT) == 0) {
-		LOG_ERROR("Cannot enable write to flash. Status=0x%02" PRIx8, status);
+		LOG_ERROR("Cannot enable write to flash. Status=0x%02" PRIx32, status);
 		return ERROR_FAIL;
 	}
 	return ERROR_OK;

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

Summary of changes:
 src/flash/nor/jtagspi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository