diff options
| author | Mahavir Jain <mjain@marvell.com> | 2015-03-05 17:42:54 +0530 |
|---|---|---|
| committer | Spencer Oliver <spen@spen-soft.co.uk> | 2015-03-25 21:39:48 +0000 |
| commit | f618725e1a857838bc4ad4488522b3751265ff72 (patch) | |
| tree | 8e0f7ec5306b60eb449a3503c74160c0c4f362e9 /src/flash/nor/mrvlqspi.c | |
| parent | d90b86d8e35f4f681eb341ca534985eb1046cc59 (diff) | |
| download | riscv-openocd-f618725e1a857838bc4ad4488522b3751265ff72.zip riscv-openocd-f618725e1a857838bc4ad4488522b3751265ff72.tar.gz riscv-openocd-f618725e1a857838bc4ad4488522b3751265ff72.tar.bz2 | |
flash/nor: mrvlqspi: fix printf formatting issues
Change-Id: I74cfce7bb8dbc13fbc3005b5a96213417f93a9f2
Signed-off-by: Mahavir Jain <mjain@marvell.com>
Reviewed-on: http://openocd.zylin.com/2577
Tested-by: jenkins
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
Reviewed-by: Stian Skjelstad <stian@nixia.no>
Diffstat (limited to 'src/flash/nor/mrvlqspi.c')
| -rw-r--r-- | src/flash/nor/mrvlqspi.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/flash/nor/mrvlqspi.c b/src/flash/nor/mrvlqspi.c index a5cc1ca..0dfe6f8 100644 --- a/src/flash/nor/mrvlqspi.c +++ b/src/flash/nor/mrvlqspi.c @@ -161,7 +161,7 @@ static int mrvlqspi_set_ss_state(struct flash_bank *bank, bool state, int timeou mrvlqspi_get_reg(bank, CNTL), ®val); if (retval != ERROR_OK) return retval; - LOG_DEBUG("status: 0x%x", regval); + LOG_DEBUG("status: 0x%08" PRIx32, regval); if ((regval & XFER_RDY) == XFER_RDY) break; if (timeout-- <= 0) { @@ -216,7 +216,7 @@ static int mrvlqspi_stop_transfer(struct flash_bank *bank) mrvlqspi_get_reg(bank, CNTL), ®val); if (retval != ERROR_OK) return retval; - LOG_DEBUG("status: 0x%x", regval); + LOG_DEBUG("status: 0x%08" PRIx32, regval); if ((regval & (XFER_RDY | WFIFO_EMPTY)) == (XFER_RDY | WFIFO_EMPTY)) break; @@ -245,7 +245,7 @@ static int mrvlqspi_stop_transfer(struct flash_bank *bank) mrvlqspi_get_reg(bank, CONF), ®val); if (retval != ERROR_OK) return retval; - LOG_DEBUG("status: 0x%x", regval); + LOG_DEBUG("status: 0x%08" PRIx32, regval); if ((regval & XFER_START) == 0) break; if (timeout-- <= 0) { @@ -286,7 +286,7 @@ static int mrvlqspi_fifo_flush(struct flash_bank *bank, int timeout) mrvlqspi_get_reg(bank, CONF), &val); if (retval != ERROR_OK) return retval; - LOG_DEBUG("status: 0x%x", val); + LOG_DEBUG("status: 0x%08" PRIX32, val); if ((val & FIFO_FLUSH) == 0) break; if (timeout-- <= 0) { @@ -310,7 +310,7 @@ static int mrvlqspi_read_byte(struct flash_bank *bank, uint8_t *data) mrvlqspi_get_reg(bank, CNTL), &val); if (retval != ERROR_OK) return retval; - LOG_DEBUG("status: 0x%x", val); + LOG_DEBUG("status: 0x%08" PRIx32, val); if ((val & RFIFO_EMPTY) == 0) break; usleep(10); @@ -455,7 +455,8 @@ static int mrvlqspi_read_id(struct flash_bank *bank, uint32_t *id) return retval; } - LOG_DEBUG("ID is 0x%x 0x%x 0x%x", id_buf[0], id_buf[1], id_buf[2]); + LOG_DEBUG("ID is 0x%02" PRIx8 " 0x%02" PRIx8 " 0x%02" PRIx8, + id_buf[0], id_buf[1], id_buf[2]); retval = mrvlqspi_set_ss_state(bank, QSPI_SS_DISABLE, QSPI_TIMEOUT); if (retval != ERROR_OK) return retval; @@ -854,11 +855,11 @@ static int mrvlqspi_probe(struct flash_bank *bank) } if (!mrvlqspi_info->dev) { - LOG_ERROR("Unknown flash device ID 0x%08x", id); + LOG_ERROR("Unknown flash device ID 0x%08" PRIx32, id); return ERROR_FAIL; } - LOG_INFO("Found flash device \'%s\' ID 0x%08x", + LOG_INFO("Found flash device \'%s\' ID 0x%08" PRIx32, mrvlqspi_info->dev->name, mrvlqspi_info->dev->device_id); /* Set correct size value */ @@ -918,7 +919,7 @@ int mrvlqspi_get_info(struct flash_bank *bank, char *buf, int buf_size) } snprintf(buf, buf_size, "\nQSPI flash information:\n" - " Device \'%s\' ID 0x%08x\n", + " Device \'%s\' ID 0x%08" PRIx32 "\n", mrvlqspi_info->dev->name, mrvlqspi_info->dev->device_id); return ERROR_OK; |