From c7e9f85de2b204d6889c1c44b8ef4e587d0eb6a9 Mon Sep 17 00:00:00 2001
From: Sebastien Bourdeauducq <sb@m-labs.hk>
Date: Fri, 25 Jun 2021 17:01:02 +0800
Subject: [PATCH] openocd: adapt to newer version

---
 openocd/digilent-hs2.cfg | 2 +-
 openocd/kasli_soc.cfg    | 8 ++++----
 openocd/redpitaya.cfg    | 2 +-
 openocd/zc706.cfg        | 2 +-
 openocd/zynq-7000.cfg    | 5 +++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/openocd/digilent-hs2.cfg b/openocd/digilent-hs2.cfg
index 5c42e02..6e43d98 100644
--- a/openocd/digilent-hs2.cfg
+++ b/openocd/digilent-hs2.cfg
@@ -3,7 +3,7 @@
 
 # this supports JTAG-HS2 (and apparently Nexys4 as well)
 
-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6014
 
 ftdi_channel 0
diff --git a/openocd/kasli_soc.cfg b/openocd/kasli_soc.cfg
index bfeead9..f5b79fa 100644
--- a/openocd/kasli_soc.cfg
+++ b/openocd/kasli_soc.cfg
@@ -1,11 +1,11 @@
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Quad RS232-HS"
 ftdi_vid_pid 0x0403 0x6011
 ftdi_channel 0
 # some GPIOs need to be set, otherwise the FTDI chip craps out for some reason.
 ftdi_layout_init 0x0098 0x008b
 transport select jtag
-adapter_khz 1000
+adapter speed 1000
 
 set PL_TAPID 0x1372c093
 set SMP 1
@@ -14,8 +14,8 @@ source ./zynq-7000.cfg
 
 ftdi_layout_signal nSRST -oe 0x0004
 reset_config srst_only srst_open_drain
-adapter_nsrst_assert_width 250
-adapter_nsrst_delay 400
+adapter srst pulse_width 250
+adapter srst delay 400
 
 set XC7_JSHUTDOWN 0x0d
 set XC7_JPROGRAM 0x0b
diff --git a/openocd/redpitaya.cfg b/openocd/redpitaya.cfg
index becaa37..e5fa719 100644
--- a/openocd/redpitaya.cfg
+++ b/openocd/redpitaya.cfg
@@ -1,5 +1,5 @@
 source ./digilent-hs2.cfg
-adapter_khz 1000
+adapter speed 1000
 
 set PL_TAPID 0x13722093
 set SMP 1
diff --git a/openocd/zc706.cfg b/openocd/zc706.cfg
index 4d9d802..3ff346d 100644
--- a/openocd/zc706.cfg
+++ b/openocd/zc706.cfg
@@ -1,5 +1,5 @@
 source [find interface/ftdi/olimex-arm-usb-tiny-h.cfg]
-adapter_khz 1000
+adapter speed 1000
 
 set PL_TAPID 0x23731093
 set SMP 1
diff --git a/openocd/zynq-7000.cfg b/openocd/zynq-7000.cfg
index 1db8cac..b2647f0 100644
--- a/openocd/zynq-7000.cfg
+++ b/openocd/zynq-7000.cfg
@@ -81,15 +81,16 @@ jtag newtap $_CHIPNAME dap -irlen 4 -ircapture 0x01 -irmask 0x03 \
 set _TARGETNAME_0 $_CHIPNAME.cpu.0
 set _TARGETNAME_1 $_CHIPNAME.cpu.1
 
+dap create $_CHIPNAME.dap -chain-position $_CHIPNAME.dap
 target create $_TARGETNAME_0 cortex_a -coreid 0 \
     -endian $_ENDIAN \
-    -chain-position $_CHIPNAME.dap \
+    -dap $_CHIPNAME.dap \
     -dbgbase 0x80090000
 if { $_SMP } {
     echo "Zynq CPU1."
     target create $_TARGETNAME_1 cortex_a -coreid 1 \
         -endian $_ENDIAN \
-        -chain-position $_CHIPNAME.dap \
+        -dap $_CHIPNAME.dap \
         -dbgbase 0x80092000
     target smp $_TARGETNAME_0 $_TARGETNAME_1
 }