[openocd-svn] Main OpenOCD repository branch, master, updated. v0.4.0-260-g82ef847

[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  82ef8472bf6986d09f595dbea151413502b42280 (commit)
       via  c0cdb7c63189edf0d96a1b0242d80c94532b30e7 (commit)
      from  72ba8ec90e42a3fc4470e7e0d1c0f8b1d060529a (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 82ef8472bf6986d09f595dbea151413502b42280
Author: Spencer Oliver <nt...@us...>
Date:   Fri May 21 11:45:40 2010 +0100

    cfg: update stm32 performance stick config
    
     - As this is a complete unit, including jtag we might as welli nclude
    the jtag cfg.
     - Add missing id for the str750 that is also in the jtag chain.
     - Reduce jtag startup speed to 500kHz.
    
    Signed-off-by: Spencer Oliver <nt...@us...>

diff --git a/tcl/board/hitex_stm32-performancestick.cfg b/tcl/board/hitex_stm32-performancestick.cfg
index 509f98a..515f7e0 100644
--- a/tcl/board/hitex_stm32-performancestick.cfg
+++ b/tcl/board/hitex_stm32-performancestick.cfg
@@ -1,9 +1,16 @@
 # Hitex stm32 performance stick
 
+reset_config trst_and_srst
+
+source [find interface/stm32-stick.cfg]
+
 set  CHIPNAME stm32_hitex
 source [find target/stm32.cfg]
 
 # configure str750 connected to jtag chain
 # FIXME -- source [find target/str750.cfg] after cleaning that up
-jtag newtap $_CHIPNAME unknown -irlen 4 -ircapture 0x1 -irmask 0x0f
+jtag newtap str750 cpu -irlen 4 -ircapture 0x1 -irmask 0x0f -expected-id 0x4f1f0041
+
+# for some reason this board like to startup @ 500kHz
+adapter_khz 500
 

commit c0cdb7c63189edf0d96a1b0242d80c94532b30e7
Author: Spencer Oliver <nt...@us...>
Date:   Fri May 21 11:43:17 2010 +0100

    arm_adi_v5: correct ahbap_debugport_init mem-ap id (bug #23)
    
    We request a id register read at the end of ahbap_debugport_init
    but we never actually run the queue. In some cases this causes a
    segfault.
    
    Signed-off-by: Spencer Oliver <nt...@us...>

diff --git a/src/target/arm_adi_v5.c b/src/target/arm_adi_v5.c
index 8b18fa3..8f43f78 100644
--- a/src/target/arm_adi_v5.c
+++ b/src/target/arm_adi_v5.c
@@ -967,6 +967,9 @@ int ahbap_debugport_init(struct adiv5_dap *dap)
 	retval = dap_queue_ap_read(dap, AP_REG_IDR, &idreg);
 	retval = dap_queue_ap_read(dap, AP_REG_BASE, &romaddr);
 
+	if ((retval = dap_run(dap)) != ERROR_OK)
+		return retval;
+
 	LOG_DEBUG("MEM-AP #%" PRId32 " ID Register 0x%" PRIx32
 		", Debug ROM Address 0x%" PRIx32,
 		dap->apsel, idreg, romaddr);

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

Summary of changes:
 src/target/arm_adi_v5.c                    |    3 +++
 tcl/board/hitex_stm32-performancestick.cfg |    9 ++++++++-
 2 files changed, 11 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository