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

- change error message for image_open error 

- changed run_size to size_read in argument of image_read_section
(thanks to oyvind Harboe for this patch)

git-svn-id: svn://svn.berlios.de/openocd/trunk@234 b42882b7-edfa-0310-969c-e2dbd0fdcd60
__archive__
mifi 2007-12-16 18:19:43 +00:00
parent b642f42199
commit f328fb8a6c
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/flash/flash.c
View File

@ -563,11 +563,12 @@ int handle_flash_write_image_command(struct command_context_s *cmd_ctx, char *cm
} }
image.start_address_set = 0; image.start_address_set = 0;
if (image_open(&image, args[0], (argc == 4) ? args[2] : NULL) != ERROR_OK) retval = image_open(&image, args[0], (argc == 4) ? args[2] : NULL);
if (retval != ERROR_OK)
{ {
command_print(cmd_ctx, "flash write error: %s", image.error_str); command_print(cmd_ctx, "image_open error: %s", image.error_str);
return ERROR_OK; return retval;
} }
failed = malloc(sizeof(int) * image.num_sections); failed = malloc(sizeof(int) * image.num_sections);
@ -849,7 +850,7 @@ int flash_write(target_t *target, image_t *image, u32 *written, char **error_str
size_read = image->sections[section].size - section_offset; size_read = image->sections[section].size - section_offset;
if ((retval = image_read_section(image, section, section_offset, if ((retval = image_read_section(image, section, section_offset,
run_size, buffer + buffer_size, &size_read)) != ERROR_OK || size_read == 0) size_read, buffer + buffer_size, &size_read)) != ERROR_OK || size_read == 0)
{ {
free(buffer); free(buffer);