6 files changed, 2 insertions, 12 deletions
diff --git a/tcl/board/topas910.cfg b/tcl/board/topas910.cfg
index 01ace63e..ce7c87a4 100644
--- a/tcl/board/topas910.cfg
+++ b/tcl/board/topas910.cfg
@@ -99,7 +99,7 @@ proc topas910_init { } {
 	mww 0xf4300004 0x00000000
 
 	sleep 10
-#	jtag_speed 10000
+#	jtag_khz NNNN
 
 # remap off in case of IROM boot
 	mww 0xf0000004 0x00000001
diff --git a/tcl/board/topasa900.cfg b/tcl/board/topasa900.cfg
index 699b42ea..a8a6caf6 100644
--- a/tcl/board/topasa900.cfg
+++ b/tcl/board/topasa900.cfg
@@ -105,7 +105,7 @@ proc topasa900_init { } {
 	mww 0xf4300004 0x00000000
 
 	sleep 10
-#	jtag_speed 10000
+#	jtag_khz NNNN
 
 # remap off in case of IROM boot
 	mww 0xf0000004 0x00000001
diff --git a/tcl/interface/calao-usb-a9260.cfg b/tcl/interface/calao-usb-a9260.cfg
index 57c68d61..a9d7dec4 100644
--- a/tcl/interface/calao-usb-a9260.cfg
+++ b/tcl/interface/calao-usb-a9260.cfg
@@ -5,12 +5,7 @@
 #
 # See calao-usb-a9260-c01.cfg and calao-usb-a9260-c02.cfg.
 #
-# Note: You must have an OpenOCD version where jtag_speed sets two values.
-#       trunk r606 contains the fix for this particular issue which can
-#       be seen if jtag_speed does not set two separate values.
-#
 
-jtag_speed 1200 0
 jtag_nsrst_delay 200
 jtag_ntrst_delay 200
 
diff --git a/tcl/interface/openocd-usb.cfg b/tcl/interface/openocd-usb.cfg
index 8bb9ffe6..4000b23f 100644
--- a/tcl/interface/openocd-usb.cfg
+++ b/tcl/interface/openocd-usb.cfg
@@ -9,6 +9,3 @@ ft2232_vid_pid 0x0403 0x6010
 ft2232_device_desc "Dual RS232"
 ft2232_layout "oocdlink"
 ft2232_latency 2
-# 6/(1+n) Mhz TCLK
-jtag_speed 1
-
diff --git a/tcl/interface/parport.cfg b/tcl/interface/parport.cfg
index 6aaf80b7..2a2668d5 100644
--- a/tcl/interface/parport.cfg
+++ b/tcl/interface/parport.cfg
@@ -5,5 +5,4 @@
 interface parport
 parport_port 0xc8b8
 parport_cable wiggler
-jtag_speed 0
 
diff --git a/tcl/interface/parport_dlc5.cfg b/tcl/interface/parport_dlc5.cfg
index defda3f3..0f94c656 100644
--- a/tcl/interface/parport_dlc5.cfg
+++ b/tcl/interface/parport_dlc5.cfg
@@ -7,5 +7,4 @@
 interface parport
 parport_port /dev/parport0
 parport_cable dlc5
-jtag_speed 0