zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

flash: print bank usage on failure 

This makes use of the newly introduced usage field in the flash bank
structure.

Also remove the assertion if usage field is null and
lets print a DEBUG_LOG message instead.

Change-Id: I384bf0e2c444fcc99deef73aec9ef01149a91c76
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/391
Tested-by: jenkins
__archive__
Spencer Oliver 2012-01-19 15:08:50 +00:00
parent 23ece85f33
commit 9db465810a
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/flash/nand/tcl.c
View File

@ -581,7 +581,6 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c); retval = CALL_COMMAND_HANDLER(controller->nand_device_command, c);
if (ERROR_OK != retval) if (ERROR_OK != retval)
{ {
assert(controller->usage != NULL);
LOG_ERROR("'%s' driver rejected nand flash. Usage: %s", LOG_ERROR("'%s' driver rejected nand flash. Usage: %s",
controller->name, controller->name,
controller->usage); controller->usage);
@ -589,6 +588,9 @@ static COMMAND_HELPER(create_nand_device, const char *bank_name,
return retval; return retval;
} }
if (controller->usage == NULL)
LOG_DEBUG("'%s' driver usage field missing", controller->name);
nand_device_add(c); nand_device_add(c);
return ERROR_OK; return ERROR_OK;

7
src/flash/nor/tcl.c
View File

@ -834,12 +834,15 @@ COMMAND_HANDLER(handle_flash_bank_command)
retval = CALL_COMMAND_HANDLER(driver->flash_bank_command, c); retval = CALL_COMMAND_HANDLER(driver->flash_bank_command, c);
if (ERROR_OK != retval) if (ERROR_OK != retval)
{ {
LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32, LOG_ERROR("'%s' driver rejected flash bank at 0x%8.8" PRIx32 "Usage %s",
driver_name, c->base); driver_name, c->base, driver->usage);
free(c); free(c);
return retval; return retval;
} }
if (driver->usage == NULL)
LOG_DEBUG("'%s' driver usage field missing", driver_name);
flash_bank_add(c); flash_bank_add(c);
return ERROR_OK; return ERROR_OK;