[openocd-svn] Main OpenOCD repository branch, master, updated. v0.3.0-134-g6881c1b

[David B. <dbr...@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  6881c1b6d686c91a8cd604bdcd6098ab62d4dcb9 (commit)
       via  85944d4144a1df0647e4324d1cf8ae9a276b70e5 (commit)
      from  627bd197689d71f7beb3e9cd11e2993fe0d4d880 (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 6881c1b6d686c91a8cd604bdcd6098ab62d4dcb9
Author: David Brownell <dbr...@us...>
Date:   Tue Nov 10 09:25:26 2009 -0800

    target.cfg: (re)move some bogus reset_config lines
    
    General rule, this is all board-specific and doesn't belong
    in target config files.  Some of these were just cosmetic.
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/tcl/board/atmel_sam3u_ek.cfg b/tcl/board/atmel_sam3u_ek.cfg
index f7501d0..13d930b 100644
--- a/tcl/board/atmel_sam3u_ek.cfg
+++ b/tcl/board/atmel_sam3u_ek.cfg
@@ -1 +1,4 @@
 source [find target/at91sam3u4e.cfg]
+
+reset_config srst_only
+
diff --git a/tcl/target/aduc702x.cfg b/tcl/target/aduc702x.cfg
index f7c5ee4..b60c967 100644
--- a/tcl/target/aduc702x.cfg
+++ b/tcl/target/aduc702x.cfg
@@ -1,7 +1,3 @@
-## -*- tcl -*-
-##
-
-
 if { [info exists CHIPNAME] } {
    set  _CHIPNAME $CHIPNAME
 } else {
@@ -21,14 +17,9 @@ if { [info exists CPUTAPID] } {
    set  _CPUTAPID 0x3f0f0f0f
 }
 
-
 jtag_nsrst_delay 200
 jtag_ntrst_delay 200
 
-# This is for the case that TRST/SRST is not wired on your JTAG adaptor.
-# Don't really need them anyways.
-reset_config none
-
 ## JTAG scan chain
 #format L IRC IRCM IDCODE (Length, IR Capture, IR Capture Mask, IDCODE)
 jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
diff --git a/tcl/target/at91sam3uXX.cfg b/tcl/target/at91sam3uXX.cfg
index 985e052..b948c64 100644
--- a/tcl/target/at91sam3uXX.cfg
+++ b/tcl/target/at91sam3uXX.cfg
@@ -35,8 +35,6 @@ target create $_TARGETNAME cortex_m3 -endian $_ENDIAN -chain-position $_TARGETNA
 # 16K is plenty, the smallest chip has this much
 $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size 16384 -work-area-backup 0
 
-reset_config srst_only
-
 $_TARGETNAME configure -event gdb-flash-erase-start {
     halt
 }
diff --git a/tcl/target/str730.cfg b/tcl/target/str730.cfg
index fe70802..c98d56c 100644
--- a/tcl/target/str730.cfg
+++ b/tcl/target/str730.cfg
@@ -21,7 +21,6 @@ if { [info exists CPUTAPID] } {
 }
 
 #use combined on interfaces or targets that can't set TRST/SRST separately
-#reset_config trst_and_srst srst_pulls_trst
 reset_config trst_and_srst srst_pulls_trst
 
 #jtag scan chain
diff --git a/tcl/target/str750.cfg b/tcl/target/str750.cfg
index 22d87f8..5439c33 100644
--- a/tcl/target/str750.cfg
+++ b/tcl/target/str750.cfg
@@ -22,7 +22,6 @@ if { [info exists CPUTAPID] } {
 jtag_khz 10
 
 #use combined on interfaces or targets that can't set TRST/SRST separately
-#reset_config trst_and_srst srst_pulls_trst
 reset_config trst_and_srst srst_pulls_trst
 
 #jtag scan chain

commit 85944d4144a1df0647e4324d1cf8ae9a276b70e5
Author: Thomas Kindler <mai...@t-...>
Date:   Tue Nov 10 09:16:12 2009 -0800

    stm32.cfg: remove reset_config
    
    Here's a patch for the double-reset problem on STM32.  I've tested
    downloading and debugging with GDB and Eclipse, and everything seems
    to work fine.
    
    This effectively sets reset_config to none. trst_only would also
    be ok, but that's better left to a board configuration file since
    not all boards wire it up.
    
    The NVIC is used to trigger reset, which at least on this chip also
    pulses nSRST so the whole system does get rest -- exactly once.
    
    Signed-off-by: David Brownell <dbr...@us...>

diff --git a/tcl/target/stm32.cfg b/tcl/target/stm32.cfg
index 619824c..242bbbe 100644
--- a/tcl/target/stm32.cfg
+++ b/tcl/target/stm32.cfg
@@ -26,9 +26,6 @@ jtag_khz 1000
 jtag_nsrst_delay 100
 jtag_ntrst_delay 100
 
-#use combined on interfaces or targets that can't set TRST/SRST separately
-reset_config trst_and_srst
-
 #jtag scan chain
 if { [info exists CPUTAPID ] } {
    set _CPUTAPID $CPUTAPID

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

Summary of changes:
 tcl/board/atmel_sam3u_ek.cfg |    3 +++
 tcl/target/aduc702x.cfg      |    9 ---------
 tcl/target/at91sam3uXX.cfg   |    2 --
 tcl/target/stm32.cfg         |    3 ---
 tcl/target/str730.cfg        |    1 -
 tcl/target/str750.cfg        |    1 -
 6 files changed, 3 insertions(+), 16 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository