X-Git-Url: https://review.openocd.org/gitweb?a=blobdiff_plain;f=tcl%2Ftarget%2Fis5114.cfg;h=31f1aa1aa0b66f6d5c01056e1a242568e36f2608;hb=1f37b94859e01c565219a7e7d6ddd85d122f7892;hp=091bfc2f158a0d3aaeec88cb010d6e348f58ad3e;hpb=3e6f9e8d1e65c4da505ff78481d54a115520d3d1;p=openocd.git

diff --git a/tcl/target/is5114.cfg b/tcl/target/is5114.cfg
index 091bfc2f15..31f1aa1aa0 100644
--- a/tcl/target/is5114.cfg
+++ b/tcl/target/is5114.cfg
@@ -3,47 +3,44 @@
 # ATMEL sold his product line to Insilica...
 
 if { [info exists CHIPNAME] } {
-   set  _CHIPNAME $CHIPNAME
+   set _CHIPNAME $CHIPNAME
 } else {
-   set  _CHIPNAME is5114
+   set _CHIPNAME is5114
 }
 
 if { [info exists ENDIAN] } {
-   set  _ENDIAN $ENDIAN
+   set _ENDIAN $ENDIAN
 } else {
   # this defaults to a little endian
-   set  _ENDIAN little
+   set _ENDIAN little
 }
 
-if { [info exists CPUTAPID ] } {
+if { [info exists CPUTAPID] } {
    set _CPUTAPID $CPUTAPID
 } else {
-  # force an error till we get a good number
+   # Force an error until we get a good number.
    set _CPUTAPID 0xffffffff
 }
 
 # jtag speed. We need to stick to 16kHz until we've finished reset.
-jtag_rclk 16
+adapter_khz 16
 
 reset_config trst_and_srst
 
 # Do not specify a tap id here...
-#OLD SYNTAX: jtag_device 8 0x1 0x1 0xfe
 jtag newtap $_CHIPNAME unknown1 -irlen 8 -ircapture 0x01 -irmask 1
-#OLD SYNTAX: jtag_device 4 0x1 0xf 0xe
 # This is the "arm946" chip.
 jtag newtap $_CHIPNAME cpu      -irlen 4 -ircapture 0x0e -irmask 0xf
-#OLD SYNTAX: jtag_device 5 0x1 0x1 0x1e
 jtag newtap $_CHIPNAME unknown2 -irlen 5 -ircapture 1 -irmask 1
 
 
 #arm946e-s and
 set _TARGETNAME $_CHIPNAME.cpu
-target create $_TARGETNAME arm966e -endian $_ENDIAN  -chain-position $_TARGETNAME  -variant arm966e
+target create $_TARGETNAME arm966e -endian $_ENDIAN -chain-position $_TARGETNAME
 
-$_TARGETNAME configure -event reset-start { jtag_rclk 16 }
+$_TARGETNAME configure -event reset-start { adapter_khz 16 }
 $_TARGETNAME configure -event reset-init {
 	# We can increase speed now that we know the target is halted.
-	jtag_rclk 3000
+	adapter_khz 3000
 }
 $_TARGETNAME configure -work-area-phys 0x50000000 -work-area-size 16384 -work-area-backup 1