interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Mahavir Jain 2015-03-05 17:42:54 +05:30 committed by Spencer Oliver
parent d90b86d8e3
commit f618725e1a
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/flash/nor/mrvlqspi.c
View File

@ -161,7 +161,7 @@ static int mrvlqspi_set_ss_state(struct flash_bank *bank, bool state, int timeou
mrvlqspi_get_reg(bank, CNTL), &regval); mrvlqspi_get_reg(bank, CNTL), &regval);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
LOG_DEBUG("status: 0x%x", regval); LOG_DEBUG("status: 0x%08" PRIx32, regval);
if ((regval & XFER_RDY) == XFER_RDY) if ((regval & XFER_RDY) == XFER_RDY)
break; break;
if (timeout-- <= 0) { if (timeout-- <= 0) {
@ -216,7 +216,7 @@ static int mrvlqspi_stop_transfer(struct flash_bank *bank)
mrvlqspi_get_reg(bank, CNTL), &regval); mrvlqspi_get_reg(bank, CNTL), &regval);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
LOG_DEBUG("status: 0x%x", regval); LOG_DEBUG("status: 0x%08" PRIx32, regval);
if ((regval & (XFER_RDY | WFIFO_EMPTY)) == if ((regval & (XFER_RDY | WFIFO_EMPTY)) ==
(XFER_RDY | WFIFO_EMPTY)) (XFER_RDY | WFIFO_EMPTY))
break; break;
@ -245,7 +245,7 @@ static int mrvlqspi_stop_transfer(struct flash_bank *bank)
mrvlqspi_get_reg(bank, CONF), &regval); mrvlqspi_get_reg(bank, CONF), &regval);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
LOG_DEBUG("status: 0x%x", regval); LOG_DEBUG("status: 0x%08" PRIx32, regval);
if ((regval & XFER_START) == 0) if ((regval & XFER_START) == 0)
break; break;
if (timeout-- <= 0) { if (timeout-- <= 0) {
@ -286,7 +286,7 @@ static int mrvlqspi_fifo_flush(struct flash_bank *bank, int timeout)
mrvlqspi_get_reg(bank, CONF), &val); mrvlqspi_get_reg(bank, CONF), &val);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
LOG_DEBUG("status: 0x%x", val); LOG_DEBUG("status: 0x%08" PRIX32, val);
if ((val & FIFO_FLUSH) == 0) if ((val & FIFO_FLUSH) == 0)
break; break;
if (timeout-- <= 0) { 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); mrvlqspi_get_reg(bank, CNTL), &val);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
LOG_DEBUG("status: 0x%x", val); LOG_DEBUG("status: 0x%08" PRIx32, val);
if ((val & RFIFO_EMPTY) == 0) if ((val & RFIFO_EMPTY) == 0)
break; break;
usleep(10); usleep(10);
@ -455,7 +455,8 @@ static int mrvlqspi_read_id(struct flash_bank *bank, uint32_t *id)
return retval; 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); retval = mrvlqspi_set_ss_state(bank, QSPI_SS_DISABLE, QSPI_TIMEOUT);
if (retval != ERROR_OK) if (retval != ERROR_OK)
return retval; return retval;
@ -854,11 +855,11 @@ static int mrvlqspi_probe(struct flash_bank *bank)
} }
if (!mrvlqspi_info->dev) { 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; 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); mrvlqspi_info->dev->name, mrvlqspi_info->dev->device_id);
/* Set correct size value */ /* 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" 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); mrvlqspi_info->dev->name, mrvlqspi_info->dev->device_id);
return ERROR_OK; return ERROR_OK;