This is an automated email from Gerrit.
"Wolfram Sang <w...@kernel.org>" just uploaded a new patch set to Gerrit, which
you can find at https://review.openocd.org/c/openocd/+/7523
-- gerrit
commit d37b59431834f7dcc7582c88aa26c9bacc003b01
Author: Wolfram Sang <w...@kernel.org>
Date: Sun Mar 5 08:30:07 2023 +0100
tcl/interface/calao: add more entries to generic setup
These entries are valid for both existing Calao configs and a third one
to be added soon. Remove web address which is defunct now.
Signed-off-by: Wolfram Sang <w...@kernel.org>
Change-Id: I41f3977b0f747cdcc39b244ba2e6580576e4da70
diff --git a/tcl/interface/calao-usb-a9260.cfg
b/tcl/interface/calao-usb-a9260.cfg
deleted file mode 100644
index ff652ef8fb..0000000000
--- a/tcl/interface/calao-usb-a9260.cfg
+++ /dev/null
@@ -1,12 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-#
-# CALAO Systems USB-A9260 common -C01 -C02 setup
-#
-# http://www.calao-systems.com/
-#
-# See calao-usb-a9260-c01.cfg and calao-usb-a9260-c02.cfg.
-#
-
-adapter srst delay 200
-jtag_ntrst_delay 200
diff --git a/tcl/interface/calao-usb-a9xxx.cfg
b/tcl/interface/calao-usb-a9xxx.cfg
new file mode 100644
index 0000000000..8413fce5f7
--- /dev/null
+++ b/tcl/interface/calao-usb-a9xxx.cfg
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+# CALAO Systems USB-A9xxx common setup
+#
+# See ftdi/calao-usb-a9*.cfg
+
+ftdi layout_init 0x0c08 0x0f1b
+ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
+ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
+transport select jtag
+
+adapter srst delay 200
+jtag_ntrst_delay 200
diff --git a/tcl/interface/ftdi/calao-usb-a9260-c01.cfg
b/tcl/interface/ftdi/calao-usb-a9260-c01.cfg
index 171e73a531..5f2c10607e 100644
--- a/tcl/interface/ftdi/calao-usb-a9260-c01.cfg
+++ b/tcl/interface/ftdi/calao-usb-a9260-c01.cfg
@@ -6,10 +6,5 @@ adapter driver ftdi
ftdi device_desc "USB-A9260"
ftdi vid_pid 0x0403 0x6010
-ftdi layout_init 0x0c08 0x0f1b
-ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
-transport select jtag
-
-script interface/calao-usb-a9260.cfg
+script interface/calao-usb-a9xxx.cfg
script target/at91sam9260.cfg
diff --git a/tcl/interface/ftdi/calao-usb-a9260-c02.cfg
b/tcl/interface/ftdi/calao-usb-a9260-c02.cfg
index cc4de52812..d87d69d756 100644
--- a/tcl/interface/ftdi/calao-usb-a9260-c02.cfg
+++ b/tcl/interface/ftdi/calao-usb-a9260-c02.cfg
@@ -6,10 +6,5 @@ adapter driver ftdi
ftdi device_desc "USB-A9260"
ftdi vid_pid 0x0403 0x6001
-ftdi layout_init 0x0c08 0x0f1b
-ftdi layout_signal nTRST -data 0x0100 -noe 0x0400
-ftdi layout_signal nSRST -data 0x0200 -noe 0x0800
-transport select jtag
-
-script interface/calao-usb-a9260.cfg
+script interface/calao-usb-a9xxx.cfg
script target/at91sam9260.cfg
--
