[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-294-g18918a0

[Ø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  18918a0423e04180f580a4a9453e190488aab17d (commit)
      from  aa2de47d3ce4d484c124f0449702f511aab49112 (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 18918a0423e04180f580a4a9453e190488aab17d
Author: Øyvind Harboe <oyv...@zy...>
Date:   Mon Jun 14 09:47:33 2010 +0200

    cfi: fix gaffe introduced in previous version
    
    flash probe broke w/in last commit.
    
    ecc8041c0f4c30a7310c0f8414a5261ee7a090ca
    
    Signed-off-by: Øyvind Harboe <oyv...@zy...>

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index f911bb7..714cbe4 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -2473,10 +2473,10 @@ static int cfi_probe(struct flash_bank *bank)
 			(1 << cfi_info->chip_erase_timeout_max) * (1 << cfi_info->chip_erase_timeout_typ));
 
 		uint8_t data;
-		retval = 1 << cfi_query_u8(bank, 0, 0x27, &data);
+		retval = cfi_query_u8(bank, 0, 0x27, &data);
 		if (retval != ERROR_OK)
 			return retval;
-		cfi_info->dev_size = data;
+		cfi_info->dev_size = 1 << data;
 
 		retval = cfi_query_u16(bank, 0, 0x28, &cfi_info->interface_desc);
 		if (retval != ERROR_OK)

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

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


hooks/post-receive
-- 
Main OpenOCD repository