flash/nor/sfdp|stmqspi: fix build issue with clang on mac OS

[openocd.git] / src / flash / nor / stmqspi.c

diff --git a/src/flash/nor/stmqspi.c b/src/flash/nor/stmqspi.c
index 11529f410ed354cbaf7df2cb4b16d9753a368c84..f54e4975dd95ce2050896db7001730e4e3bfed22 100644 (file)
--- a/src/flash/nor/stmqspi.c
+++ b/src/flash/nor/stmqspi.c
@@ -455,8 +455,8 @@ static int qspi_write_enable(struct flash_bank *bank)
        if ((stmqspi_info->saved_cr & (BIT(SPI_DUAL_FLASH) | BIT(SPI_FSEL_FLASH)))
                != BIT(SPI_FSEL_FLASH))
                if ((status & (SPIFLASH_WE_BIT | SPIFLASH_BSY_BIT)) != SPIFLASH_WE_BIT) {
-                       LOG_ERROR("Cannot write enable flash1. Status=0x%02" PRIx8,
-                               status & 0xFF);
+                       LOG_ERROR("Cannot write enable flash1. Status=0x%02x",
+                               status & 0xFFU);
                        return ERROR_FLASH_OPERATION_FAILED;
                }
 
@@ -464,8 +464,8 @@ static int qspi_write_enable(struct flash_bank *bank)
        status >>= 8;
        if ((stmqspi_info->saved_cr & (BIT(SPI_DUAL_FLASH) | BIT(SPI_FSEL_FLASH))) != 0)
                if ((status & (SPIFLASH_WE_BIT | SPIFLASH_BSY_BIT)) != SPIFLASH_WE_BIT) {
-                       LOG_ERROR("Cannot write enable flash2. Status=0x%02" PRIx8,
-                               status & 0xFF);
+                       LOG_ERROR("Cannot write enable flash2. Status=0x%02x",
+                               status & 0xFFU);
                        return ERROR_FLASH_OPERATION_FAILED;
                }
 
@@ -548,8 +548,8 @@ COMMAND_HANDLER(stmqspi_handle_mass_erase_command)
        if (((stmqspi_info->saved_cr & (BIT(SPI_DUAL_FLASH) | BIT(SPI_FSEL_FLASH)))
                != BIT(SPI_FSEL_FLASH)) && ((status & SPIFLASH_BSY_BIT) == 0) &&
                ((status & SPIFLASH_WE_BIT) != 0)) {
-               LOG_ERROR("Mass erase command not accepted by flash1. Status=0x%02" PRIx8,
-                       status & 0xFF);
+               LOG_ERROR("Mass erase command not accepted by flash1. Status=0x%02x",
+                       status & 0xFFU);
                retval = ERROR_FLASH_OPERATION_FAILED;
                goto err;
        }
@@ -559,8 +559,8 @@ COMMAND_HANDLER(stmqspi_handle_mass_erase_command)
        if (((stmqspi_info->saved_cr & (BIT(SPI_DUAL_FLASH) | BIT(SPI_FSEL_FLASH))) != 0) &&
                ((status & SPIFLASH_BSY_BIT) == 0) &&
                ((status & SPIFLASH_WE_BIT) != 0)) {
-               LOG_ERROR("Mass erase command not accepted by flash2. Status=0x%02" PRIx8,
-                       status & 0xFF);
+               LOG_ERROR("Mass erase command not accepted by flash2. Status=0x%02x",
+                       status & 0xFFU);
                retval = ERROR_FLASH_OPERATION_FAILED;
                goto err;
        }
@@ -959,8 +959,8 @@ static int qspi_erase_sector(struct flash_bank *bank, unsigned int sector)
        if (((stmqspi_info->saved_cr & (BIT(SPI_DUAL_FLASH) | BIT(SPI_FSEL_FLASH)))
                != BIT(SPI_FSEL_FLASH)) && ((status & SPIFLASH_BSY_BIT) == 0) &&
                ((status & SPIFLASH_WE_BIT) != 0)) {
-               LOG_ERROR("Sector erase command not accepted by flash1. Status=0x%02" PRIx8,
-                       status & 0xFF);
+               LOG_ERROR("Sector erase command not accepted by flash1. Status=0x%02x",
+                       status & 0xFFU);
                retval = ERROR_FLASH_OPERATION_FAILED;
                goto err;
        }
@@ -971,8 +971,8 @@ static int qspi_erase_sector(struct flash_bank *bank, unsigned int sector)
        if (((stmqspi_info->saved_cr & (BIT(SPI_DUAL_FLASH) | BIT(SPI_FSEL_FLASH))) != 0) &&
                ((status & SPIFLASH_BSY_BIT) == 0) &&
                ((status & SPIFLASH_WE_BIT) != 0)) {
-               LOG_ERROR("Sector erase command not accepted by flash2. Status=0x%02" PRIx8,
-                       status & 0xFF);
+               LOG_ERROR("Sector erase command not accepted by flash2. Status=0x%02x",
+                       status & 0xFFU);
                retval = ERROR_FLASH_OPERATION_FAILED;
                goto err;
        }
@@ -1214,7 +1214,7 @@ static int stmqspi_blank_check(struct flash_bank *bank)
                        /* we need le_32_to_h, but that's the same as h_to_le_32 */
                        result = h_to_le_32(erase_check_info.result);
                        bank->sectors[sector + index].is_erased = ((result & 0xFF) == 0xFF);
-                       LOG_DEBUG("Flash sector %u checked: 0x%04" PRIx16, sector + index, result & 0xFFFF);
+                       LOG_DEBUG("Flash sector %u checked: 0x%04x", sector + index, result & 0xFFFFU);
                }
                keep_alive();
                sector += count;