Merge commit 'origin/master'

[fw/openocd] / tcl / target / imx31.cfg

diff --git a/tcl/target/imx31.cfg b/tcl/target/imx31.cfg
index fa7e2d21f31d21747c5ea0fde865f2d46da932d8..f579d6e9260e6cde9e60abe920aed7ca4d5892d7 100644 (file)
--- a/tcl/target/imx31.cfg
+++ b/tcl/target/imx31.cfg
@@ -1,17 +1,17 @@
 # imx31 config
 #
 
-reset_config trst_and_srst
+reset_config trst_and_srst srst_nogate
 
-if { [info exists CHIPNAME] } {        
-   set  _CHIPNAME $CHIPNAME    
-} else {        
+if { [info exists CHIPNAME] } {
+   set  _CHIPNAME $CHIPNAME
+} else {
    set  _CHIPNAME imx31
 }
 
-if { [info exists ENDIAN] } {  
-   set  _ENDIAN $ENDIAN    
-} else {        
+if { [info exists ENDIAN] } {
+   set  _ENDIAN $ENDIAN
+} else {
    set  _ENDIAN little
 }
 
@@ -28,7 +28,7 @@ if { [info exists SDMATAPID ] } {
 }
 
 #========================================
-# The "system jtag controller" 
+# The "system jtag controller"
 # IMX31 reference manual, page 6-28 - figure 6-14
 if { [info exists SJCTAPID ] } {
    set _SJCTAPID $SJCTAPID
@@ -42,8 +42,8 @@ jtag newtap $_CHIPNAME sjc -irlen 4 -ircapture 0x0 -irmask 0x0 -expected-id $_SJ
 # See diagram: 6-14
 #   SIGNAL NAME:
 #    SJC_MOD - controls multiplexer - disables ARM1136
-#    SDMA_BYPASS - disables SDMA    - 
-#  
+#    SDMA_BYPASS - disables SDMA    -
+#
 # Per ARM: DDI0211J_arm1136_r1p5_trm.pdf - the ARM 1136 as a 5 bit IR register
 jtag newtap $_CHIPNAME cpu -irlen 5 -ircapture 0x1 -irmask 0x1f -expected-id $_CPUTAPID
 
@@ -58,5 +58,5 @@ set _TARGETNAME $_CHIPNAME.cpu
 target create $_TARGETNAME arm11 -endian $_ENDIAN -chain-position $_TARGETNAME
 
 
-proc power_restore {} { puts "Sensed power restore. No action." } 
+proc power_restore {} { puts "Sensed power restore. No action." }
 proc srst_deasserted {} { puts "Sensed nSRST deasserted. No action." }