target.cfg: TAP id for Hilscher netX 500

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

diff --git a/tcl/target/netx500.cfg b/tcl/target/netx500.cfg
index c639017b93f24d3b59c9e5b9103e8fe359f68326..90315afda0212a3195d93bef616459a8288eeded 100644 (file)
--- a/tcl/target/netx500.cfg
+++ b/tcl/target/netx500.cfg
@@ -1,34 +1,32 @@
 #Hilscher netX 500 CPU
 
-
-if { [info exists CHIPNAME] } {        
-   set  _CHIPNAME $CHIPNAME    
-} else {        
+if { [info exists CHIPNAME] } {
+   set  _CHIPNAME $CHIPNAME
+} else {
    set  _CHIPNAME netx500
 }
 
-if { [info exists ENDIAN] } {  
-   set  _ENDIAN $ENDIAN    
-} else {        
+if { [info exists ENDIAN] } {
+   set  _ENDIAN $ENDIAN
+} else {
    set  _ENDIAN little
 }
 
 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
 jtag_ntrst_delay 100
 
-set _TARGETNAME [format "%s.cpu" $_CHIPNAME]
-target create $_TARGETNAME arm926ejs -endian $_ENDIAN -chain-position $_TARGETNAME -variant arm926ejs
+# 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