There are no variants of arm7tdmi target

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

diff --git a/tcl/target/netx500.cfg b/tcl/target/netx500.cfg
index 66f4a2eb87c5c6119e662106e5e85d6f6ce191a2..04a267babeadf2b6f013e67c851d7c9fac3a2a08 100644 (file)
--- a/tcl/target/netx500.cfg
+++ b/tcl/target/netx500.cfg
@@ -1,6 +1,5 @@
 #Hilscher netX 500 CPU
 
-
 if { [info exists CHIPNAME] } {
    set  _CHIPNAME $CHIPNAME
 } else {
@@ -16,19 +15,18 @@ if { [info exists ENDIAN] } {
 if { [info exists CPUTAPID ] } {
    set _CPUTAPID $CPUTAPID
 } else {
-  # force an error till we get a good number
-   set _CPUTAPID 0xffffffff
+   set _CPUTAPID 0x07926021
 }
 
-
-#use combined on interfaces or targets that can't set TRST/SRST separately
+# FIXME most reset config belongs in board code
 reset_config trst_and_srst
-#jtag scan chain
-#
-jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
-jtag_nsrst_delay 100
+adapter_nsrst_delay 100
 jtag_ntrst_delay 100
 
+# jtag scan chain
+jtag newtap $_CHIPNAME cpu -irlen 4 -ircapture 0x1 -irmask 0xf -expected-id $_CPUTAPID
+
+# that TAP is associated with a target
 set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs
+target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME