zcy
/
tinyriscv-openocd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stlink: add usb pid for v2.1 without mass storage device 

New version of ST-Link/V2.1 without mass storage device.
From debug point of view, it is compatible with existing ST-Link/V2.1
It uses a new USB PID because the USB endpoints and interfaces are
different from usual ST-Link/V2.1

Add the new PID in the driver, in the tcl interface script and in the
udev configuration script.

Change-Id: Id2e1b5a5d0347c5d951a86a9cdb76be52cfd4ea3
Signed-off-by: Antonio Borneo <borneo.antonio@gmail.com>
Reviewed-on: http://openocd.zylin.com/4702
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
log_output
Antonio Borneo 2018-09-23 09:53:30 +02:00 committed by Spencer Oliver
parent 9d67f00670
commit 5d9dad6de1
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/60-openocd.rules
View File

@ -63,6 +63,7 @@ ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE="660", GROUP="plugdev",
# STLink v2-1 # STLink v2-1
ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374b", MODE="660", GROUP="plugdev", TAG+="uaccess" ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374b", MODE="660", GROUP="plugdev", TAG+="uaccess"
ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3752", MODE="660", GROUP="plugdev", TAG+="uaccess"
# Cypress KitProg in KitProg mode # Cypress KitProg in KitProg mode
ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="f139", MODE="660", GROUP="plugdev", TAG+="uaccess" ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="f139", MODE="660", GROUP="plugdev", TAG+="uaccess"

2
src/jtag/drivers/stlink_usb.c
View File

@ -63,6 +63,7 @@
#define STLINK_V1_PID (0x3744) #define STLINK_V1_PID (0x3744)
#define STLINK_V2_PID (0x3748) #define STLINK_V2_PID (0x3748)
#define STLINK_V2_1_PID (0x374B) #define STLINK_V2_1_PID (0x374B)
#define STLINK_V2_1_NO_MSD_PID (0x3752)
/* the current implementation of the stlink limits /* the current implementation of the stlink limits
* 8bit read/writes to max 64 bytes. */ * 8bit read/writes to max 64 bytes. */
@ -2063,6 +2064,7 @@ static int stlink_usb_open(struct hl_interface_param_s *param, void **fd)
h->trace_ep = STLINK_TRACE_EP; h->trace_ep = STLINK_TRACE_EP;
break; break;
case STLINK_V2_1_PID: case STLINK_V2_1_PID:
case STLINK_V2_1_NO_MSD_PID:
h->version.stlink = 2; h->version.stlink = 2;
h->tx_ep = STLINK_V2_1_TX_EP; h->tx_ep = STLINK_V2_1_TX_EP;
h->trace_ep = STLINK_V2_1_TRACE_EP; h->trace_ep = STLINK_V2_1_TRACE_EP;

2
tcl/interface/stlink.cfg
View File

@ -6,7 +6,7 @@
interface hla interface hla
hla_layout stlink hla_layout stlink
hla_device_desc "ST-LINK" hla_device_desc "ST-LINK"
hla_vid_pid 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b hla_vid_pid 0x0483 0x3744 0x0483 0x3748 0x0483 0x374b 0x0483 0x3752
# Optionally specify the serial number of ST-LINK/V2 usb device. ST-LINK/V2 # Optionally specify the serial number of ST-LINK/V2 usb device. ST-LINK/V2
# devices seem to have serial numbers with unreadable characters. ST-LINK/V2 # devices seem to have serial numbers with unreadable characters. ST-LINK/V2