[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-414-gb05ae41

[Spencer O. <nt...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  b05ae413314f48832dd12c994b85c9aad8632967 (commit)
      from  d16f9259c2aa0be1ffde9c6faa04a6463819bb8e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b05ae413314f48832dd12c994b85c9aad8632967
Author: Spencer Oliver <nt...@us...>
Date:   Fri Jul 16 22:52:49 2010 +0100

    flash: use bkpt for str9 flash algo algorithm
    
    STR9 is ARMv5 arch so use bkpt instruction rather than
    waste a breakpoint.
    
    Signed-off-by: Spencer Oliver <nt...@us...>

diff --git a/src/flash/nor/str9x.c b/src/flash/nor/str9x.c
index 103af16..528e52e 100644
--- a/src/flash/nor/str9x.c
+++ b/src/flash/nor/str9x.c
@@ -369,7 +369,7 @@ static int str9x_write_block(struct flash_bank *bank,
 		0xe2522001,	/*	subs r2, r2, #1		*/
 		0x1affffed,	/*	bne write			*/
 					/* exit:				*/
-		0xeafffffe,	/*	b exit				*/
+		0xe1200070,	/*	bkpt #0				*/
 	};
 
 	/* flash write code */
@@ -421,8 +421,7 @@ static int str9x_write_block(struct flash_bank *bank,
 
 		if ((retval = target_run_algorithm(target, 0, NULL, 4, reg_params,
 				str9x_info->write_algorithm->address,
-				str9x_info->write_algorithm->address + (sizeof(str9x_flash_write_code) - 4),
-				10000, &armv4_5_info)) != ERROR_OK)
+				0, 10000, &armv4_5_info)) != ERROR_OK)
 		{
 			LOG_ERROR("error executing str9x flash write algorithm");
 			retval = ERROR_FLASH_OPERATION_FAILED;

-----------------------------------------------------------------------

Summary of changes:
 src/flash/nor/str9x.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository