target: Remove "-variant" argument

[openocd.git] / tcl / target / pxa270.cfg

diff --git a/tcl/target/pxa270.cfg b/tcl/target/pxa270.cfg
index 6ca057caaa9cf0440548fdc6b038b68d48293334..95f7f16f0767bce66b4c682411cdcbb32df0bd75 100644 (file)
--- a/tcl/target/pxa270.cfg
+++ b/tcl/target/pxa270.cfg
@@ -1,44 +1,50 @@
 #Marvell/Intel PXA270 Script
 
 if { [info exists CHIPNAME] } {
-   set  _CHIPNAME $CHIPNAME
+   set _CHIPNAME $CHIPNAME
 } else {
-   set  _CHIPNAME pxa270
+   set _CHIPNAME pxa270
 }
 
 if { [info exists ENDIAN] } {
-   set  _ENDIAN $ENDIAN
+   set _ENDIAN $ENDIAN
 } else {
-   set  _ENDIAN little
+   set _ENDIAN little
 }
 
 #IDs for pxa270. Are there more?
-if { [info exists CPUTAPID ] } {
+if { [info exists CPUTAPID] } {
    set _CPUTAPID $CPUTAPID
 } else {
   # set useful default
    set _CPUTAPID 0x49265013
 }
 
-if { [info exists CPUTAPID2 ] } {
+if { [info exists CPUTAPID2] } {
    set _CPUTAPID2 $CPUTAPID2
 } else {
   # set useful default
    set _CPUTAPID2 0x79265013
 }
 
+if { [info exists CPUTAPID3] } {
+   set _CPUTAPID2 $CPUTAPID3
+} else {
+  # set useful default
+   set _CPUTAPID3 0x89265013
+}
 
-# set jtag_nsrst_delay to the delay introduced by your reset circuit
+# set adapter_nsrst_delay to the delay introduced by your reset circuit
 # the rest of the needed delays are built into the openocd program
-jtag_nsrst_delay 260
+adapter_nsrst_delay 260
 # set the jtag_ntrst_delay to the delay introduced by a reset circuit
 # the rest of the needed delays are built into the openocd program
 jtag_ntrst_delay 250
 
 set _TARGETNAME $_CHIPNAME.cpu
-jtag newtap $_CHIPNAME cpu -irlen 7 -ircapture 0x1 -irmask 0x7f -expected-id $_CPUTAPID -expected-id $_CPUTAPID2
+jtag newtap $_CHIPNAME cpu -irlen 7 -ircapture 0x1 -irmask 0x7f -expected-id $_CPUTAPID -expected-id $_CPUTAPID2 -expected-id $_CPUTAPID3
 
-target create $_TARGETNAME xscale -endian $_ENDIAN -chain-position $_TARGETNAME -variant pxa27x
+target create $_TARGETNAME xscale -endian $_ENDIAN -chain-position $_TARGETNAME
 # maps to PXA internal RAM. If you are using a PXA255
 # you must initialize SDRAM or leave this option off
 $_TARGETNAME configure -work-area-phys 0x5c000000 -work-area-size 0x10000 -work-area-backup 0