aboutsummaryrefslogtreecommitdiff
path: root/src/flash
diff options
context:
space:
mode:
authorAntonio Borneo <borneo.antonio@gmail.com>2021-11-13 14:38:21 +0100
committerAntonio Borneo <borneo.antonio@gmail.com>2021-11-13 22:36:03 +0000
commita498a3deaaec7ee87d73cf753bdddefaf4779666 (patch)
tree8a50cad3352554e120bc6520fed674c1fc5717e7 /src/flash
parent9d574aa3fab6e6d802fab4ededb24b73542ef2b9 (diff)
downloadriscv-openocd-a498a3deaaec7ee87d73cf753bdddefaf4779666.zip
riscv-openocd-a498a3deaaec7ee87d73cf753bdddefaf4779666.tar.gz
riscv-openocd-a498a3deaaec7ee87d73cf753bdddefaf4779666.tar.bz2
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 <borneo.antonio@gmail.com> 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 <vanekt@fbl.cz> Tested-by: jenkins
Diffstat (limited to 'src/flash')
-rw-r--r--src/flash/nor/jtagspi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/flash/nor/jtagspi.c b/src/flash/nor/jtagspi.c
index 9d377ce..a5672c6 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;