[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.5.0-367-g769064d

[OpenOCD-Gerrit <ope...@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  769064de4bd8fc59804c37a418b83fcdba6fd36f (commit)
      from  8959fccc1926e8748e914730b8e05ca7e8b8d05b (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 769064de4bd8fc59804c37a418b83fcdba6fd36f
Author: Spencer Oliver <sp...@sp...>
Date:   Tue Jan 17 16:05:44 2012 +0000

    flash: update stellaris_set_flash_timing for target class
    
    stellaris_set_flash_timing should only be used for Sandstorm and Fury
    device classes.
    
    Change-Id: Ib5eff9d954c039f2c5726a8ecc3ee45d1694cfd3
    Signed-off-by: Spencer Oliver <sp...@sp...>
    Reviewed-on: http://openocd.zylin.com/389
    Tested-by: jenkins

diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c
index 69a9d05..b14c078 100644
--- a/src/flash/nor/stellaris.c
+++ b/src/flash/nor/stellaris.c
@@ -528,6 +528,10 @@ static void stellaris_set_flash_timing(struct flash_bank *bank)
 	struct target *target = bank->target;
 	uint32_t usecrl = (stellaris_info->mck_freq/1000000ul-1);
 
+	/* only valid for Sandstorm and Fury class devices */
+	if (stellaris_info->target_class < 2)
+		return;
+
 	LOG_DEBUG("usecrl = %i",(int)(usecrl));
 	target_write_u32(target, SCB_BASE | USECRL, usecrl);
 }

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

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


hooks/post-receive
-- 
Main OpenOCD repository