interesting
/
riscv-openocd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

src/flash/nor/stm32h7x: fix format strings 

* use proper type codes
* add 0x in front of hex values
* remove some concatenated empty strings

Change-Id: I06a8344d0ed62de7a0f3e2dd8fba69b17eeb3626
Signed-off-by: Christopher Head <chead@zaber.com>
Reviewed-on: http://openocd.zylin.com/5783
Tested-by: jenkins
Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
This commit is contained in:
Christopher Head 2020-07-17 14:54:46 -07:00 committed by Tomas Vanek
parent cd06642314
commit 998e60e917
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/flash/nor/stm32h7x.c
View File

@ -262,7 +262,7 @@ static int stm32x_wait_flash_op_queue(struct flash_bank *bank, int timeout)
break; break;
if (timeout-- <= 0) { if (timeout-- <= 0) {
LOG_ERROR("wait_flash_op_queue, time out expired, status: 0x%" PRIx32 "", status); LOG_ERROR("wait_flash_op_queue, time out expired, status: 0x%" PRIx32, status);
return ERROR_FAIL; return ERROR_FAIL;
} }
alive_sleep(1); alive_sleep(1);
@ -311,7 +311,7 @@ static int stm32x_unlock_reg(struct flash_bank *bank)
return retval; return retval;
if (ctrl & FLASH_LOCK) { if (ctrl & FLASH_LOCK) {
LOG_ERROR("flash not unlocked STM32_FLASH_CRx: %" PRIx32, ctrl); LOG_ERROR("flash not unlocked STM32_FLASH_CRx: 0x%" PRIx32, ctrl);
return ERROR_TARGET_FAILURE; return ERROR_TARGET_FAILURE;
} }
return ERROR_OK; return ERROR_OK;
@ -342,7 +342,7 @@ static int stm32x_unlock_option_reg(struct flash_bank *bank)
return retval; return retval;
if (ctrl & OPT_LOCK) { if (ctrl & OPT_LOCK) {
LOG_ERROR("options not unlocked STM32_FLASH_OPTCR: %" PRIx32, ctrl); LOG_ERROR("options not unlocked STM32_FLASH_OPTCR: 0x%" PRIx32, ctrl);
return ERROR_TARGET_FAILURE; return ERROR_TARGET_FAILURE;
} }
@ -396,7 +396,7 @@ static int stm32x_write_option(struct flash_bank *bank, uint32_t reg_offset, uin
break; break;
if (timeout-- <= 0) { if (timeout-- <= 0) {
LOG_ERROR("waiting for OBL launch, time out expired, OPTSR: 0x%" PRIx32 "", status); LOG_ERROR("waiting for OBL launch, time out expired, OPTSR: 0x%" PRIx32, status);
retval = ERROR_FAIL; retval = ERROR_FAIL;
goto flash_options_lock; goto flash_options_lock;
} }
@ -626,7 +626,7 @@ static int stm32x_write_block(struct flash_bank *bank, const uint8_t *buffer,
LOG_ERROR("flash memory write protected"); LOG_ERROR("flash memory write protected");
if ((flash_sr & FLASH_ERROR) != 0) { if ((flash_sr & FLASH_ERROR) != 0) {
LOG_ERROR("flash write failed, FLASH_SR = %08" PRIx32, flash_sr); LOG_ERROR("flash write failed, FLASH_SR = 0x%08" PRIx32, flash_sr);
/* Clear error + EOP flags but report errors */ /* Clear error + EOP flags but report errors */
stm32x_write_flash_reg(bank, FLASH_CCR, flash_sr); stm32x_write_flash_reg(bank, FLASH_CCR, flash_sr);
retval = ERROR_FAIL; retval = ERROR_FAIL;
@ -747,7 +747,7 @@ static int stm32x_probe(struct flash_bank *bank)
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
LOG_DEBUG("device id = 0x%08" PRIx32 "", stm32x_info->idcode); LOG_DEBUG("device id = 0x%08" PRIx32, stm32x_info->idcode);
device_id = stm32x_info->idcode & 0xfff; device_id = stm32x_info->idcode & 0xfff;
@ -779,7 +779,7 @@ static int stm32x_probe(struct flash_bank *bank)
/* read error when device has invalid value, set max flash size */ /* read error when device has invalid value, set max flash size */
flash_size_in_kb = stm32x_info->part_info->max_flash_size_kb; flash_size_in_kb = stm32x_info->part_info->max_flash_size_kb;
} else } else
LOG_INFO("flash size probed value %d", flash_size_in_kb); LOG_INFO("flash size probed value %" PRIu16, flash_size_in_kb);
@ -830,8 +830,8 @@ static int stm32x_probe(struct flash_bank *bank)
} }
} }
LOG_INFO("Bank (%u) size is %d kb, base address is 0x%" PRIx32, LOG_INFO("Bank (%u) size is %" PRIu16 " kb, base address is " TARGET_ADDR_FMT,
bank->bank_number, flash_size_in_kb, (uint32_t) bank->base); bank->bank_number, flash_size_in_kb, bank->base);
/* if the user sets the size manually then ignore the probed value /* if the user sets the size manually then ignore the probed value
* this allows us to work around devices that have an invalid flash size register value */ * this allows us to work around devices that have an invalid flash size register value */
@ -923,7 +923,7 @@ static int stm32x_get_info(struct flash_bank *bank, char *buf, int buf_size)
stm32x_info->part_info->device_str, rev_str); stm32x_info->part_info->device_str, rev_str);
} else { } else {
snprintf(buf, buf_size, snprintf(buf, buf_size,
"%s - Rev: unknown (0x%04x)", "%s - Rev: unknown (0x%04" PRIx16 ")",
stm32x_info->part_info->device_str, rev_id); stm32x_info->part_info->device_str, rev_id);
} }
} else { } else {
@ -1100,7 +1100,7 @@ COMMAND_HANDLER(stm32x_handle_option_read_command)
if (ERROR_OK != retval) if (ERROR_OK != retval)
return retval; return retval;
command_print(CMD, "Option Register: <0x%" PRIx32 "> = 0x%" PRIx32 "", command_print(CMD, "Option Register: <0x%" PRIx32 "> = 0x%" PRIx32,
stm32x_get_flash_reg(bank, reg_offset), value); stm32x_get_flash_reg(bank, reg_offset), value);
return retval; return retval;