forked from auracaster/openocd
Tcl commands: Fix improper return status in flash commands and load_image.
Nand write command : nand_fileio_cleanup() always returns ERROR_OK. Due to this, handle_nand_write_command() retuns ERROR_OK in the case of nand failure. ERROR_FAIL should be returned. Flash erase_sector command : handle_flash_erase_command() always returns ERROR_OK even if the erase functionality of actual driver implementation fails. retval value should be returned. Flash write_bank command : handle_flash_write_bank_command() returns ERROR_OK even if fileio_open() and fileio_read fails. ERROR_FAIL should be returned. Load_image command : handle_load_image_command() retuns ERROR_OK even if image_open() fails. ERROR_FAIL should be returned. When the buffer is null, breaking the loop without setting retval = ERROR_FAIL would cause load_image to return ERROR_OK. Change-Id: Ice32f6036971ab5e8e4dd65edf54b394b001c80c Signed-off-by: HarishKumar <harishpresent@gmail.com> Reviewed-on: http://openocd.zylin.com/2431 Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com> Tested-by: jenkins
This commit is contained in:
committed by
Freddie Chopin
parent
d3445cd146
commit
b10037a0b7
@@ -3166,7 +3166,7 @@ COMMAND_HANDLER(handle_load_image_command)
|
||||
duration_start(&bench);
|
||||
|
||||
if (image_open(&image, CMD_ARGV[0], (CMD_ARGC >= 3) ? CMD_ARGV[2] : NULL) != ERROR_OK)
|
||||
return ERROR_OK;
|
||||
return ERROR_FAIL;
|
||||
|
||||
image_size = 0x0;
|
||||
retval = ERROR_OK;
|
||||
@@ -3176,6 +3176,7 @@ COMMAND_HANDLER(handle_load_image_command)
|
||||
command_print(CMD_CTX,
|
||||
"error allocating buffer for section (%d bytes)",
|
||||
(int)(image.sections[i].size));
|
||||
retval = ERROR_FAIL;
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user