- reverted some of the changes that possibly broke arm926ejs. Waiting

for a bit more info before I can tell with confidence whether or not
this would have any effect.
- worked on error propagation and output for flash

git-svn-id: svn://svn.berlios.de/openocd/trunk@539 b42882b7-edfa-0310-969c-e2dbd0fdcd60

1 files changed, 4 insertions, 5 deletions

diff --git a/src/target/target.c b/src/target/target.c
index f90834d1..7673f5d2 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -2053,14 +2053,13 @@ int handle_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, ch
 	
 	if (argc < 1)
 	{
-		command_print(cmd_ctx, "usage: verify_image <file> [offset] [type]");
-		return ERROR_OK;
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 	
 	if (!target)
 	{
 		LOG_ERROR("no target selected");
-		return ERROR_OK;
+		return ERROR_FAIL;
 	}
 	
 	duration_start_measure(&duration);
@@ -2078,9 +2077,9 @@ int handle_verify_image_command(struct command_context_s *cmd_ctx, char *cmd, ch
 
 	image.start_address_set = 0;
 
-	if (image_open(&image, args[0], (argc == 3) ? args[2] : NULL) != ERROR_OK)
+	if ((retval=image_open(&image, args[0], (argc == 3) ? args[2] : NULL)) != ERROR_OK)
 	{
-		return ERROR_OK;
+		return retval;
 	}
 	
 	image_size = 0x0;