scripts: use adapter_khz not deprecated jtag_khz

Change-Id: Ibaeebf564a95360dcf21a0921ec99f5263f11915
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/202
Tested-by: jenkins
Reviewed-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>

diff --git a/tcl/board/at91cap7a-stk-sdram.cfg b/tcl/board/at91cap7a-stk-sdram.cfg
index 849d8cf2b9ae44f30c7e171a9f3919c5533b7dc7..95f1d06e2c9c4c9da120f8c18d140ed0bd3a440d 100644 (file)
--- a/tcl/board/at91cap7a-stk-sdram.cfg
+++ b/tcl/board/at91cap7a-stk-sdram.cfg
@@ -28,7 +28,7 @@ target create $_TARGETNAME arm7tdmi -endian $_ENDIAN -chain-position $_TARGETNAM
 
 $_TARGETNAME configure -event reset-start {
        # start off real slow when we're running off internal RC oscillator
-       jtag_khz 32
+       adapter_khz 32
 }
 
 proc peek32 {address} {
@@ -78,7 +78,7 @@ $_TARGETNAME configure -event reset-init {
        echo "Master clock ok."
        
        # Now that we're up and running, crank up speed!
-       global post_reset_khz ; jtag_khz $post_reset_khz
+       global post_reset_khz ; adapter_khz $post_reset_khz
        
        echo "Configuring the SDRAM controller..."
 

diff --git a/tcl/board/mcb1700.cfg b/tcl/board/mcb1700.cfg
index 845c7e20fb6b8154190c2241dacda83a51168bed..5f3e9e91534d755713e59f3dd5802a0cda4dc754 100644 (file)
--- a/tcl/board/mcb1700.cfg
+++ b/tcl/board/mcb1700.cfg
@@ -11,7 +11,7 @@ set MCB1700_CCLK $CCLK
 $_TARGETNAME configure -event reset-start {
        # Start *real slow* as we do not know the
     # state the boot rom left the clock in
-       jtag_khz 10
+       adapter_khz 10
 }
 
 # Set up 100MHz clock to CPU
@@ -55,7 +55,7 @@ $_TARGETNAME configure -event reset-init {
        #
        # 
        global MCB1700_CCLK
-       jtag_khz [expr $MCB1700_CCLK / 8]
+       adapter_khz [expr $MCB1700_CCLK / 8]
 
        # Do not remap 0x0000-0x0020 to anything but the flash (i.e. select
        # "User Flash Mode" where interrupt vectors are _not_ remapped,

diff --git a/tcl/interface/hilscher_nxhx10_etm.cfg b/tcl/interface/hilscher_nxhx10_etm.cfg
index de443227342853372ebf78ca803e5ba2b7efb2d0..b16ed1a53ca0a5322756a196ebeeacfa98686fc9 100644 (file)
--- a/tcl/interface/hilscher_nxhx10_etm.cfg
+++ b/tcl/interface/hilscher_nxhx10_etm.cfg
@@ -8,4 +8,4 @@ interface ft2232
 ft2232_device_desc "NXHX 10-ETM"
 ft2232_layout comstick
 ft2232_vid_pid 0x0640 0x0028
-jtag_khz 6000
+adapter_khz 6000

diff --git a/tcl/interface/hilscher_nxhx500_etm.cfg b/tcl/interface/hilscher_nxhx500_etm.cfg
index 5df2854a12a0858510c66a53f9d946e27daa0d7e..840ffaf6cc7482a9055c3c6368ad90485f181b3a 100644 (file)
--- a/tcl/interface/hilscher_nxhx500_etm.cfg
+++ b/tcl/interface/hilscher_nxhx500_etm.cfg
@@ -8,4 +8,4 @@ interface ft2232
 ft2232_device_desc "NXHX 500-ETM"
 ft2232_layout comstick
 ft2232_vid_pid 0x0640 0x0028
-jtag_khz 6000
+adapter_khz 6000

diff --git a/tcl/interface/hilscher_nxhx500_re.cfg b/tcl/interface/hilscher_nxhx500_re.cfg
index eb31c7713913dd9501d0498044455921431a829a..1d1b754268ac321e8dce4459beadf83ab767efc4 100644 (file)
--- a/tcl/interface/hilscher_nxhx500_re.cfg
+++ b/tcl/interface/hilscher_nxhx500_re.cfg
@@ -8,4 +8,4 @@ interface ft2232
 ft2232_device_desc "NXHX 500-RE"
 ft2232_layout comstick
 ft2232_vid_pid 0x0640 0x0028
-jtag_khz 6000
+adapter_khz 6000

diff --git a/tcl/interface/hilscher_nxhx50_etm.cfg b/tcl/interface/hilscher_nxhx50_etm.cfg
index 561409f4205ef1a4d466380b5416b99f738e1428..ff98c2800e0e56733531b14150381b5949782073 100644 (file)
--- a/tcl/interface/hilscher_nxhx50_etm.cfg
+++ b/tcl/interface/hilscher_nxhx50_etm.cfg
@@ -8,4 +8,4 @@ interface ft2232
 ft2232_device_desc "NXHX 50-ETM"
 ft2232_layout comstick
 ft2232_vid_pid 0x0640 0x0028
-jtag_khz 6000
+adapter_khz 6000

diff --git a/tcl/interface/hilscher_nxhx50_re.cfg b/tcl/interface/hilscher_nxhx50_re.cfg
index 46a365d39fd12b8e3d11d331ffefdad229fa1ebf..0573e0311d7fc34561ee2a5ca57fa33460773da0 100644 (file)
--- a/tcl/interface/hilscher_nxhx50_re.cfg
+++ b/tcl/interface/hilscher_nxhx50_re.cfg
@@ -8,4 +8,4 @@ interface ft2232
 ft2232_device_desc "NXHX50-RE"
 ft2232_layout comstick
 ft2232_vid_pid 0x0640 0x0028
-jtag_khz 6000
+adapter_khz 6000

diff --git a/tcl/target/lpc1768.cfg b/tcl/target/lpc1768.cfg
index 6478b2cb064e746dc5cdb66e7be74261f35f17c9..d1734ddb11c854c0c0c9145e1cf24f175fb4c442 100644 (file)
--- a/tcl/target/lpc1768.cfg
+++ b/tcl/target/lpc1768.cfg
@@ -52,7 +52,7 @@ flash bank $_FLASHNAME lpc2000 0x0 0x80000 0 0 $_TARGETNAME \
 # Run with *real slow* clock by default since the
 # boot rom could have been playing with the PLL, so
 # we have no idea what clock the target is running at.
-jtag_khz 10
+adapter_khz 10
 
 $_TARGETNAME configure -event reset-init {
        # Do not remap 0x0000-0x0020 to anything but the flash (i.e. select

diff --git a/tcl/target/stm32f2x.cfg b/tcl/target/stm32f2x.cfg
index a47b115d22bf9227f9f73df7937060e934b07130..49b53d7e45323554747ece2e80696a585d3763c5 100644 (file)
--- a/tcl/target/stm32f2x.cfg
+++ b/tcl/target/stm32f2x.cfg
@@ -26,7 +26,7 @@ if { [info exists WORKAREASIZE] } {
 # bit more to be on the safe side. Perhaps superstition, but if are
 # running off a crystal, we can run closer to the limit. Note
 # that there can be a pretty wide band where things are more or less stable.
-jtag_khz 1000
+adapter_khz 1000
 
 jtag_nsrst_delay 100
 jtag_ntrst_delay 100