This is an automated email from Gerrit. Antonio Borneo ([email protected]) just uploaded a new patch set to Gerrit, which you can find at http://openocd.zylin.com/4716
-- gerrit commit 00762ed3a01c5e8b226f931b05f2df70e954d38a Author: Antonio Borneo <[email protected]> Date: Mon Oct 1 10:25:35 2018 +0200 stlink: fix printed version for new STM8 nucleo board The ST-LINK/V2.1 embedded in the new nucleo boards for STM8 does not follow the normal versioning rules, and puts mass-storage and swim version in the field normally used respectively for jtag and mass-storage version. Apply the check suggested by STMicroelectronics to discriminate the two cases and print the correct version. Change-Id: I0dd1da11013be3f1e56084489e28cfba98bb07af Signed-off-by: Antonio Borneo <[email protected]> diff --git a/src/jtag/drivers/stlink_usb.c b/src/jtag/drivers/stlink_usb.c index 5837393..ffe4d68 100644 --- a/src/jtag/drivers/stlink_usb.c +++ b/src/jtag/drivers/stlink_usb.c @@ -665,10 +665,17 @@ static int stlink_usb_version(void *handle) switch (h->pid) { case STLINK_V2_1_PID: case STLINK_V2_1_NO_MSD_PID: - /* JxMy : STM32 V2.1 - JTAG/SWD only */ - jtag = x; - msd = y; - swim = 0; + if ((x <= 22 && y == 7) || (x >= 25 && y >= 7 && y <= 12)) { + /* MxSy : STM8 V2.1 - SWIM only */ + msd = x; + swim = y; + jtag = 0; + } else { + /* JxMy : STM32 V2.1 - JTAG/SWD only */ + jtag = x; + msd = y; + swim = 0; + } break; default: jtag = x; -- _______________________________________________ OpenOCD-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openocd-devel
