[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-297-g9132f70

[Øyvind H. <go...@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  9132f7083d01510eb1c2471a7c3f3247e35cdf3b (commit)
      from  b6a82540654f02dbf4caaed1be538044220dd3dc (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 9132f7083d01510eb1c2471a7c3f3247e35cdf3b
Author: Øyvind Harboe <oyv...@zy...>
Date:   Mon Jun 14 15:42:39 2010 +0200

    cfi: add LOG_ERROR() in case of unsupported intel erase algorithm
    
    found by code inspection. There are many other places in
    CFI where LOG_ERROR() should be called similarly...
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index c134317..96aca48 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -979,7 +979,10 @@ static int cfi_intel_protect(struct flash_bank *bank, int set, int first, int la
 	 * instant individual block locking (bit 5).
 	 */
 	if (!(pri_ext->feature_support & 0x28))
+	{
+		LOG_ERROR("lock/unlock not supported on flash");
 		return ERROR_FLASH_OPERATION_FAILED;
+	}
 
 	cfi_intel_clear_status_register(bank);
 

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

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


hooks/post-receive
-- 
Main OpenOCD repository