Merge branch 'master' into from_upstream

Conflicts: .gitmodules .travis.yml jimtcl src/jtag/core.c src/jtag/drivers/ftdi.c src/jtag/drivers/libjaylink src/jtag/drivers/mpsse.c src/jtag/drivers/stlink_usb.c src/rtos/hwthread.c src/target/riscv/riscv-013.c src/target/riscv/riscv.c tcl/board/sifive-hifive1-revb.cfg Change-Id: I2d26ebeffb4c1374730d2e20e6e2a7710403657c
2020-06-23 13:05:43 -07:00
parent 4579dd9358 8833c889da
commit e07613de33
766 changed files with 21771 additions and 5946 deletions
@@ -4,7 +4,7 @@
 # http://www.altera.com/literature/ug/ug_usb_blstr.pdf
 #

-interface usb_blaster
+adapter driver usb_blaster
 usb_blaster_lowlevel_driver ftdi
 # These are already the defaults.
 # usb_blaster_vid_pid 0x09FB 0x6001
@@ -2,7 +2,7 @@
 # Altera USB-Blaster II
 #

-interface usb_blaster
+adapter driver usb_blaster
 usb_blaster_vid_pid 0x09fb 0x6010 0x09fb 0x6810
 usb_blaster_lowlevel_driver ublast2
 usb_blaster_firmware /path/to/quartus/blaster_6810.hex
@@ -4,5 +4,4 @@
 # http://www.olimex.com/dev/arm-jtag-ew.html
 #

-interface arm-jtag-ew
-
+adapter driver arm-jtag-ew
@@ -4,6 +4,5 @@
 # TODO: URL?
 #

-interface at91rm9200
+adapter driver at91rm9200
 at91rm9200_device rea_ecr
-
@@ -4,7 +4,7 @@
 # http://dangerousprototypes.com/bus-pirate-manual/
 #

-interface buspirate
+adapter driver buspirate

 # you need to specify port on which BP lives
 #buspirate_port /dev/ttyUSB0
@@ -23,4 +23,3 @@ buspirate_speed normal ;# or fast

 # this depends on the cable, you are safe with this option
 reset_config srst_only
-
@@ -6,6 +6,5 @@
 # See calao-usb-a9260-c01.cfg and calao-usb-a9260-c02.cfg.
 #

-adapter_nsrst_delay 200
+adapter srst delay 200
 jtag_ntrst_delay 200
-
@@ -4,6 +4,5 @@
 # http://www.amontec.com/chameleon.shtml
 #

-interface parport
+adapter driver parport
 parport_cable chameleon
-
@@ -4,7 +4,7 @@
 # http://www.keil.com/support/man/docs/dapdebug/
 #

-interface cmsis-dap
+adapter driver cmsis-dap

 # Optionally specify the serial number of CMSIS-DAP usb device.
 #cmsis_dap_serial 02200201E6661E601B98E3B9
@@ -2,5 +2,4 @@
 # Dummy interface (for testing purposes)
 #

-interface dummy
-
+adapter driver dummy
@@ -4,4 +4,4 @@
 # http://code.google.com/p/estick-jtag/
 #

-interface opendous
+adapter driver opendous
@@ -11,6 +11,6 @@ if { [info exists PARPORTADDR] } {
   set _PARPORTADDR 0
 }

-interface parport
+adapter driver parport
 parport_port $_PARPORTADDR
 parport_cable flashlink
@@ -1,2 +1,2 @@
-interface ft232r
-adapter_khz 1000
+adapter driver ft232r
+adapter speed 1000
@@ -7,7 +7,7 @@
 # https://blog.matthiasbock.net/wp-content/uploads/2015/04/100ask-JTAGv3.pdf
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "USB<=>JTAG&RS232"
 ftdi_vid_pid 0x1457 0x5118

@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Symphony SoundBite"
 ftdi_vid_pid 0x0403 0x6010

@@ -1,4 +1,3 @@
-#
 # FTDI USB Hi-Speed to MPSSE Cable
 #
 # http://www.ftdichip.com/Products/Cables/USBMPSSE.htm
@@ -6,10 +5,52 @@
 # C232HM-DDHSL-0 and C232HM-EDSL-0 provide 3.3V and 5V on pin 1 (Red),
 # respectively.
 #
+# Adapter: http://www.ftdichip.com/Support/Documents/DataSheets/Cables/DS_C232HM_MPSSE_CABLE.PDF
+# Chip: http://www.ftdichip.com/Support/Documents/DataSheets/ICs/DS_FT232H.pdf
+# See pinout/colors at end of this file.
+#
+# Tech notes:
+# http://www.ftdichip.com/Support/Documents/AppNotes/AN_135_MPSSE_Basics.pdf
+# http://www.ftdichip.com/Support/Documents/AppNotes/AN_129_FTDI_Hi_Speed_USB_To_JTAG_Example.pdf

-interface ftdi
+adapter driver ftdi
 #ftdi_device_desc "C232HM-DDHSL-0"
 #ftdi_device_desc "C232HM-EDHSL-0"
+
+# Common PID for FT232H
 ftdi_vid_pid 0x0403 0x6014

-ftdi_layout_init 0x0008 0x000b
+# Layout
+# High data byte 0x40 configures red LED on ACBUS6 initially high (unlit, since active-low)
+# Low data byte 0x08 configures TMS on ACBUS3 initially high (asserted); TCK, TDI low
+# High direction byte 0x40 configures red LED on ACBUS6 as high (output)
+# Low direction byte 0x0b configures TDO on ACBUS2 as low (input)
+ftdi_layout_init 0x4008 0x400b
+
+# ---A*BUS-------CCCCCCCC|DDDDDDDD
+# --------\______76543210|76543210
+# LED	0x4000 = 01000000|00000000 = ACBUS6
+#GPIOL0	0x0010 = 00000000|00010000 = ADBUS4
+#GPIOL1	0x0020 = 00000000|00100000 = ADBUS5
+#GPIOL2	0x0040 = 00000000|01000000 = ADBUS6
+#GPIOL3	0x0080 = 00000000|10000000 = ADBUS7
+# -ndata treats the LED as active-low for expected behavior (toggle when transferring)
+ftdi_layout_signal LED -ndata 0x4000
+# Available for aliasing as desired
+ftdi_layout_signal GPIOL0 -data 0x0010 -oe 0x0010
+ftdi_layout_signal GPIOL1 -data 0x0020 -oe 0x0020
+ftdi_layout_signal GPIOL2 -data 0x0040 -oe 0x0040
+ftdi_layout_signal GPIOL3 -data 0x0080 -oe 0x0080
+
+# C232HM		FT232H	JTAG/Other
+# Num	Color	Name	Func
+# 1		Red		VCC		Optionally, can power the board if it is not using its own power supply.
+# 2		Orange	ADBUS0	TCK
+# 3		Yellow  ADBUS1	TDI
+# 4		Green	ADBUS2	TDO
+# 5		Brown   ADBUS3	TMS
+# 6		Grey	ADBUS4	GPIOL0
+# 7		Purple	ADBUS5	GPIOL1
+# 8		White	ADBUS6	GPIOL2
+# 9		Blue	ADBUS7	GPIOL3
+# 10	Black	GND		Connect to ground
@@ -10,7 +10,7 @@ echo "interface uses the same layout as configs that were verified. Please repor
 echo "experience with this file to openocd-devel mailing list, so it could be marked"
 echo "as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "USB-A9260"
 ftdi_vid_pid 0x0403 0x6010

@@ -10,7 +10,7 @@ echo "interface uses the same layout as configs that were verified. Please repor
 echo "experience with this file to openocd-devel mailing list, so it could be marked"
 echo "as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "USB-A9260"
 ftdi_vid_pid 0x0403 0x6001

@@ -4,7 +4,7 @@
 # http://www.hitex.com/index.php?id=cortino
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Cortino"
 ftdi_vid_pid 0x0640 0x0032

@@ -1,7 +1,7 @@
 # this supports JTAG-HS1 and JTAG-SMT1
 # (the later being the OEM on-board version)

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Digilent Adept USB Device"
 ftdi_vid_pid 0x0403 0x6010
 # channel 1 does not have any functionality
@@ -1,6 +1,6 @@
 # this supports JTAG-HS2 (and apparently Nexys4 as well)

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Digilent Adept USB Device"
 ftdi_vid_pid 0x0403 0x6014

@@ -2,7 +2,7 @@
 # Digilent JTAG-HS3
 #

-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6014
 ftdi_device_desc "Digilent USB Device"

@@ -7,7 +7,7 @@
 # http://electronix.ru/forum/index.php?showtopic=114633&view=findpost&p=1215497 and ZedBoard schematics
 #

-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6014

 ftdi_layout_init 0x2088 0x3f8b
@@ -10,7 +10,7 @@
 # Note that the digilent_jtag_smt2 layout does not work and hangs while
 # the ftdi_device_desc from digilent_hs2 is wrong.

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Digilent USB Device"
 ftdi_vid_pid 0x0403 0x6014
 ftdi_channel 0
@@ -12,7 +12,7 @@ echo "This file was not tested with real interface, it is based on schematics an
 echo "in ft2232.c. Please report your experience with this file to openocd-devel"
 echo "mailing list, so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010

@@ -11,7 +11,7 @@
 echo "Info : If you need SWD support, flash KT-Link buffer from https://github.com/bharrisau/busblaster
 and use dp_busblaster_kt-link.cfg instead"

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010

@@ -9,7 +9,7 @@
 # http://dangerousprototypes.com/docs/Bus_Blaster
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010

@@ -17,7 +17,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010

@@ -17,7 +17,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6010
 ftdi_device_desc "FLOSS-JTAG"
 #ftdi_serial "FJ000001"
@@ -4,7 +4,7 @@
 # http://www.tincantools.com/product.php?productid=16134
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Flyswatter"
 ftdi_vid_pid 0x0403 0x6010

@@ -4,7 +4,7 @@
 # http://www.tincantools.com/product.php?productid=16153
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Flyswatter2"
 ftdi_vid_pid 0x0403 0x6010

@@ -6,7 +6,7 @@
 #
 #

-interface ftdi
+adapter driver ftdi

 ftdi_vid_pid 0x0403 0x6014

@@ -15,7 +15,7 @@ ftdi_vid_pid 0x0403 0x6014
 ftdi_layout_init 0x0030 0x003b
 # 0xfff8 0xfffb
 # Those signal are only required on some platforms or may required to be
-# enabled explicitely (e.g. nrf5x chips).
+# enabled explicitly (e.g. nrf5x chips).
 ftdi_layout_signal nSRST -data 0x0010 -oe 0x0010
 ftdi_layout_signal nTRST -data 0x0020 -oe 0x0020

@@ -17,7 +17,7 @@
 #   BDBUS1 TXD (input)
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "USB-JTAG"
 ftdi_vid_pid 0x0403 0x6010

@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "NXHX 10-ETM"
 ftdi_vid_pid 0x0640 0x0028

@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "NXHX 500-ETM"
 ftdi_vid_pid 0x0640 0x0028

@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "NXHX 500-RE"
 ftdi_vid_pid 0x0640 0x0028

@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "NXHX 50-ETM"
 ftdi_vid_pid 0x0640 0x0028

@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "NXHX50-RE"
 ftdi_vid_pid 0x0640 0x0028

@@ -5,11 +5,10 @@
 #


-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "LPC1768-Stick"
 ftdi_vid_pid 0x0640 0x0026

 ftdi_layout_init 0x0388 0x038b
 ftdi_layout_signal nTRST -data 0x0100
 ftdi_layout_signal nSRST -data 0x0080 -noe 0x200
-
@@ -4,7 +4,7 @@
 # http://www.hitex.com/index.php?id=383
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "STR9-comStick"
 ftdi_vid_pid 0x0640 0x002c

@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "ICEbear JTAG adapter"
 ftdi_vid_pid 0x0403 0xc140

@@ -0,0 +1,28 @@
+#
+# Configuration file for NXP MC-IMX8MP-EVK on-board internal JTAG
+#
+# Using this interface requires enabling "remote mode" for the board using the
+# NXP bcu tool (see https://github.com/NXPmicro/bcu)
+#
+#	bcu set_gpio remote_en 1 -board=imx8mpevk
+#
+# The REMOTE_EN gpio is accessible through the same FTDI adapter but it's
+# behind an I2C GPIO expander.
+#
+
+adapter driver ftdi
+ftdi_vid_pid 0x0403 0x6011
+ftdi_channel 0
+
+ftdi_layout_init 0x00f8 0x000b
+
+ftdi_layout_signal RESET_B	-data 0x0010 -oe 0x0010
+# Called SYS_nRST in schematics
+ftdi_layout_signal nSRST	-data 0x0020 -oe 0x0020
+ftdi_layout_signal IO_nRST	-data 0x0040 -oe 0x0040
+ftdi_layout_signal ONOFF_B	-data 0x0080 -oe 0x0080
+
+ftdi_layout_signal GPIO1	-data 0x0100 -oe 0x0100
+ftdi_layout_signal GPIO2	-data 0x0200 -oe 0x0200
+ftdi_layout_signal GPIO3	-data 0x0400 -oe 0x0400
+ftdi_layout_signal GPIO4	-data 0x0800 -oe 0x0800
@@ -6,7 +6,7 @@
 # http://wiki.in-circuit.de/images/0/06/610000158A_openocd.pdf
 #

-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6010

 ftdi_layout_init 0x0508 0x0f1b
@@ -3,7 +3,7 @@
 # https://github.com/iot-lab/iot-lab/wiki
 #

-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6010

 ftdi_layout_init 0x0008 0x000b
@@ -0,0 +1,27 @@
+# isodebug v1
+# 5 kV isolated JTAG/SWD + UART adapter by Unjo AB
+
+adapter driver ftdi
+ftdi_vid_pid 0x22b7 0x150d
+
+ftdi_layout_init 0x0ff8 0xfffb
+
+ftdi_layout_signal LED -ndata 0x0100
+ftdi_layout_signal nTRST -data 0x0200
+ftdi_layout_signal nSRST -noe 0x0400
+ftdi_layout_signal SWDIO_OE -data 0x0008
+
+# Mode signals, either of these needs to be high to drive the JTAG/SWD pins.
+# The power-on state is low for both signals but the init setting above sets
+# JTAG_EN high.
+ftdi_layout_signal SWD_EN -data 0x1000
+ftdi_layout_signal JTAG_EN -data 0x0800
+
+# In SWD mode, the JTAG_EN signal doubles as SWO_EN_N which switches the
+# second FTDI channel UART RxD to the SWO pin instead of the separate RxD
+# pin. Note that the default init state has this pin high so when OpenOCD
+# starts in SWD mode, SWO is by default disabled. To enable SWO tracing,
+# issue the command 'ftdi_set_signal SWO_EN 1' where tracing is configured.
+# To switch back to using the separate UART, SWO_EN needs to be disabled
+# before exiting OpenOCD, or the adapter replugged.
+ftdi_layout_signal SWO_EN -nalias JTAG_EN
@@ -4,7 +4,7 @@
 # http://www.distortec.com
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "JTAG-lock-pick Tiny 2"
 ftdi_vid_pid 0x0403 0x8220

@@ -4,7 +4,7 @@
 # http://www.amontec.com/jtagkey.shtml
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Amontec JTAGkey"
 ftdi_vid_pid 0x0403 0xcff8

@@ -4,7 +4,7 @@
 # http://www.amontec.com/jtagkey2.shtml
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Amontec JTAGkey-2"
 ftdi_vid_pid 0x0403 0xcff8

@@ -4,7 +4,7 @@
 # http://www.amontec.com/jtagkey2p.shtml
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Amontec JTAGkey-2P"
 ftdi_vid_pid 0x0403 0xcff8

@@ -4,7 +4,7 @@
 # http://www.kristech.eu
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "KT-LINK"
 ftdi_vid_pid 0x0403 0xbbe2

@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on schematics an
 echo "in ft2232.c. Please report your experience with this file to openocd-devel"
 echo "mailing list, so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Lisa/L"
 ftdi_vid_pid 0x0403 0x6010
 ftdi_channel 1
@@ -15,7 +15,7 @@
 # http://www.luminarymicro.com/products/ek-lm3s9b92.html
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Luminary Micro ICDI Board"
 ftdi_vid_pid 0x0403 0xbcda

@@ -11,7 +11,7 @@
 # need to use the "luminary_icdi" layout to work correctly.
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "LM3S811 Evaluation Board"
 ftdi_vid_pid 0x0403 0xbcd9

@@ -24,7 +24,7 @@
 # firmware via the ITM module as well as profile data.
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Stellaris Evaluation Board"
 ftdi_vid_pid 0x0403 0xbcd9

@@ -4,7 +4,7 @@
 # http://www.denx-cs.de/?q=M53EVK
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010

@@ -9,7 +9,7 @@
 # and http://www.marsohod.org/plata-marsokhod3 for details.
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010

@@ -34,7 +34,7 @@ Supports SWD using the FT2232H or FT4232H minimodule.
 # CN2-22  -  nRESET
 #

-interface ftdi
+adapter driver ftdi

 #Select your module type and channel

@@ -4,7 +4,7 @@
 # http://www.ftdichip.com/Support/Documents/DataSheets/Modules/DS_FT2232H_Mini_Module.pdf
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "FT2232H MiniModule"
 ftdi_vid_pid 0x0403 0x6010

@@ -1,6 +1,6 @@
 # https://www.scarabhardware.com/minispartan6/
 # https://github.com/scarabhardware/miniSpartan6-plus/raw/master/miniSpartan6%2B_Rev_B.pdf
-interface ftdi
+adapter driver ftdi
 # The miniSpartan6+ sadly doesn't have a custom device description, so we just
 # have to hope you got it right.
 #ftdi_device_desc "Dual RS232-HS"
@@ -12,4 +12,4 @@ ftdi_layout_init 0x0008 0x000b
 reset_config none
 # this generally works fast: the fpga can handle 30MHz, the spi flash can handle
 # 54MHz with simple read, no dummy cycles, and wait-for-write-completion
-adapter_khz 30000
+adapter speed 30000
@@ -4,7 +4,7 @@
 # http://wiki.openmoko.org/wiki/Debug_Board_v3
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Debug Board for Neo1973"
 ftdi_vid_pid 0x1457 0x5118

@@ -10,7 +10,7 @@ echo "interface uses the same layout as configs that were verified. Please repor
 echo "experience with this file to openocd-devel mailing list, so it could be marked"
 echo "as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "NGX JTAG"
 ftdi_vid_pid 0x0403 0x6010

@@ -4,7 +4,7 @@
 # http://www.olimex.com/dev/arm-usb-ocd-h.html
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Olimex OpenOCD JTAG ARM-USB-OCD-H"
 ftdi_vid_pid 0x15ba 0x002b

@@ -4,7 +4,7 @@
 # http://www.olimex.com/dev/arm-usb-ocd.html
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Olimex OpenOCD JTAG"
 ftdi_vid_pid 0x15ba 0x0003

@@ -4,7 +4,7 @@
 # http://www.olimex.com/dev/arm-usb-tiny-h.html
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Olimex OpenOCD JTAG ARM-USB-TINY-H"
 ftdi_vid_pid 0x15ba 0x002a

@@ -4,7 +4,7 @@
 # http://www.olimex.com/dev/arm-usb-tiny.html
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Olimex OpenOCD JTAG TINY"
 ftdi_vid_pid 0x15ba 0x0004

@@ -10,7 +10,7 @@ echo "interface uses the same layout as configs that were verified. Please repor
 echo "experience with this file to openocd-devel mailing list, so it could be marked"
 echo "as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "OOCDLink"
 ftdi_vid_pid 0x0403 0xbaf8

@@ -7,7 +7,7 @@
 # (and it has a different pid number).
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010
 ftdi_channel 1
@@ -4,7 +4,7 @@
 # http://shop.embedded-projects.net/index.php?module=artikel&action=artikel&id=14
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232-HS"
 ftdi_vid_pid 0x0403 0x6010

@@ -4,7 +4,7 @@
 # http://www.hs-augsburg.de/~hhoegl/proj/usbjtag/usbjtag.html
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Dual RS232"
 ftdi_vid_pid 0x0403 0x6010

@@ -4,7 +4,7 @@
 # http://www.marvell.com/products/embedded_processors/developer/kirkwood/openrd.jsp
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "OpenRD JTAGKey FT2232D B"
 ftdi_vid_pid 0x0403 0x9e90
 ftdi_channel 0
@@ -1,6 +1,6 @@
 # http://pipistrello.saanlima.com/
 # http://www.saanlima.com/download/pipistrello-v2.0/pipistrello_v2_schematic.pdf
-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Pipistrello LX45"
 ftdi_vid_pid 0x0403 0x6010
 # interface 1 is the uart
@@ -10,4 +10,4 @@ ftdi_layout_init 0x0008 0x000b
 reset_config none
 # this generally works fast: the fpga can handle 30MHz, the spi flash can handle
 # 54MHz with simple read, no dummy cycles, and wait-for-write-completion
-adapter_khz 10000
+adapter speed 10000
@@ -13,7 +13,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6010

 ftdi_layout_init 0x0c08 0x0c2b
@@ -13,7 +13,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x6010
 ftdi_channel 1

@@ -4,7 +4,7 @@
 # http://www.marvell.com/products/embedded_processors/developer/kirkwood/sheevaplug.jsp
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "SheevaPlug JTAGKey FT2232D B"
 ftdi_vid_pid 0x9e88 0x9e8f
 ftdi_channel 0
@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Signalyzer LITE"
 ftdi_vid_pid 0x0403 0xbca1

@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on code in ft223
 echo "Please report your experience with this file to openocd-devel mailing list,"
 echo "so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Signalyzer"
 ftdi_vid_pid 0x0403 0xbca0

@@ -4,7 +4,7 @@
 # http://www.hitex.com/index.php?id=340
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "STM32-PerformanceStick"
 ftdi_vid_pid 0x0640 0x002d

@@ -6,7 +6,7 @@
 # support) but the USB IDs are different.
 #

-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0451 0xc32a

 ftdi_layout_init 0x00a8 0x00eb
@@ -4,7 +4,7 @@
 # http://www.diygadget.com/tiao-usb-multi-protocol-adapter-lite-jtag-spi-i2c-serial.html
 #

-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x8a99

 ftdi_layout_init 0x0038 0x087b
@@ -4,7 +4,7 @@
 # http://www.diygadget.com/tiao-usb-multi-protocol-adapter-jtag-spi-i2c-serial.html
 #

-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0x8a98 0x0403 0x6010

 ftdi_layout_init 0x0038 0x087b
@@ -9,7 +9,7 @@ echo "This file was not tested with real interface, it is based on schematics an
 echo "in ft2232.c. Please report your experience with this file to openocd-devel"
 echo "mailing list, so it could be marked as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Turtelizer JTAG/RS232 Adapter"
 ftdi_vid_pid 0x0403 0xbdc8

@@ -4,7 +4,7 @@
 # http://www.ethernut.de/en/hardware/turtelizer/index.html
 #

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "Turtelizer JTAG/RS232 Adapter"
 ftdi_vid_pid 0x0403 0xbdc8

@@ -7,7 +7,7 @@
 # Note that UM232H and UM232H-B are 3.3V only.
 #

-interface ftdi
+adapter driver ftdi
 #ftdi_device_desc "UM232H"
 ftdi_vid_pid 0x0403 0x6014

@@ -10,7 +10,7 @@ echo "interface uses the same layout as configs that were verified. Please repor
 echo "experience with this file to openocd-devel mailing list, so it could be marked"
 echo "as working or fixed."

-interface ftdi
+adapter driver ftdi
 ftdi_device_desc "VPACLink"
 ftdi_vid_pid 0x0403 0x6010

@@ -7,7 +7,7 @@
 # to the registered TI users.
 #

-interface ftdi
+adapter driver ftdi
 ftdi_vid_pid 0x0403 0xa6d0 0x0403 0x6010

 ftdi_layout_init 0x0038 0x597b
@@ -7,7 +7,7 @@
 #
 #

-interface imx_gpio
+adapter driver imx_gpio

 # For most IMX processors 0x0209c000
 imx_gpio_peripheral_base 0x0209c000
@@ -32,4 +32,4 @@ imx_gpio_swd_nums 1 6
 # reset_config srst_only srst_push_pull

 # or if you have both connected,
-# reset_config trst_and_srst srst_push_pull
+# reset_config trst_and_srst srst_push_pull
@@ -4,7 +4,7 @@
 # http://www.segger.com/jlink.html
 #

-interface jlink
+adapter driver jlink

 # The serial number can be used to select a specific device in case more than
 # one is connected to the host.
@@ -1,4 +1,4 @@
-interface jtag_vpi
+adapter driver jtag_vpi

 # Set the VPI JTAG server port
 if { [info exists VPI_PORT] } {
@@ -6,7 +6,7 @@
 # interface driver or switch the KitProg to KitProg mode.
 #

-interface kitprog
+adapter driver kitprog

 # Optionally specify the serial number of the KitProg you want to use.
 #kitprog_serial 1926402735485200
@@ -4,12 +4,12 @@
 # http://www.andestech.com
 #

-interface aice
+adapter driver aice
 aice desc "Andes AICE adapter"
 aice serial "C001-42163"
 aice vid_pid 0x1CFC 0x0000
 aice port aice_usb
 reset_config trst_and_srst
-adapter_khz 24000
+adapter speed 24000
 aice retry_times 50
 aice count_to_check_dbger 30
@@ -4,4 +4,4 @@
 # http://code.google.com/p/opendous-jtag/
 #

-interface opendous
+adapter driver opendous
@@ -4,5 +4,5 @@
 # www.openjtag.org
 #

-interface openjtag
-openjtag_device_desc "Open JTAG Project"
+adapter driver openjtag
+openjtag_device_desc "Open JTAG Project"
@@ -3,5 +3,5 @@
 #
 # http://pemicro.com/osbdm/
 #
-interface osbdm
+adapter driver osbdm
 reset_config srst_only
@@ -14,6 +14,6 @@ if { [info exists PARPORTADDR] } {
   }
 }

-interface parport
+adapter driver parport
 parport_port $_PARPORTADDR
 parport_cable wiggler
@@ -10,7 +10,6 @@ if { [info exists PARPORTADDR] } {
   set _PARPORTADDR 0
 }

-interface parport
+adapter driver parport
 parport_port $_PARPORTADDR
 parport_cable dlc5
-
@@ -8,7 +8,7 @@
 # Do not forget the GND connection, pin 6 of the expansion header.
 #

-interface bcm2835gpio
+adapter driver bcm2835gpio

 bcm2835gpio_peripheral_base 0x20000000

@@ -8,7 +8,7 @@
 # Do not forget the GND connection, pin 6 of the expansion header.
 #

-interface bcm2835gpio
+adapter driver bcm2835gpio

 bcm2835gpio_peripheral_base 0x3F000000

@@ -4,5 +4,4 @@
 # http://www.mcu-raisonance.com/~rlink-debugger-programmer__microcontrollers__tool~tool__T018:4cn9ziz4bnx6.html
 #

-interface rlink
-
+adapter driver rlink
@@ -0,0 +1,6 @@
+#
+# BlueField SoC in-circuit debugger/programmer
+#
+
+adapter driver rshim
+transport select dapdirect_swd
@@ -0,0 +1,20 @@
+#
+# STMicroelectronics ST-LINK/V1, ST-LINK/V2, ST-LINK/V2-1, STLINK-V3 in-circuit
+# debugger/programmer
+#
+# This new interface driver creates a ST-Link wrapper for ARM-DAP named "dapdirect"
+# Old ST-LINK/V1 and ST-LINK/V2 pre version V2J24 don't support "dapdirect"
+#
+# SWIM transport is natively supported
+#
+
+adapter driver st-link
+st-link vid_pid 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374e 0x0483 0x374f 0x0483 0x3752 0x0483 0x3753
+
+# transport select dapdirect_jtag
+# transport select dapdirect_swd
+# transport select swim
+
+# Optionally specify the serial number of usb device
+# e.g.
+# st-link serial "\xaa\xbc\x6e\x06\x50\x75\xff\x55\x17\x42\x19\x3f"
@@ -3,7 +3,7 @@
 # debugger/programmer
 #

-interface hla
+adapter driver hla
 hla_layout stlink
 hla_device_desc "ST-LINK"
 hla_vid_pid 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374e 0x0483 0x374f 0x0483 0x3752 0x0483 0x3753
@@ -14,4 +14,3 @@ hla_vid_pid 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b 0x0483 0x374d 0x0483 0x374
 # number reset issues.
 # eg.
 #hla_serial "\xaa\xbc\x6e\x06\x50\x75\xff\x55\x17\x42\x19\x3f"
-
--- a/Show More
+++ b/Show More