interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

jlink: Added hardware version number for JLink firmware on LPC-Link2 

JLink firmware on LPC-Link2 has unique hardware version number(0x12).

Change-Id: I76b6e27c47d236da75c61dd6b83d6a823615968d
Signed-off-by: Nemui Trinomius <nemuisan_kawausogasuki@live.jp>
Reviewed-on: http://openocd.zylin.com/2298
Tested-by: jenkins
Reviewed-by: Anders Oleson <anders@openpuma.org>
Reviewed-by: Xiaofan <xiaofanc@gmail.com>
Reviewed-by: Paul Fertser <fercerpav@gmail.com>
This commit is contained in:
Nemui Trinomius 2014-09-13 07:44:55 +09:00 committed by Paul Fertser
parent d7792a684e
commit d66f48d1f6
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/jtag/drivers/jlink.c
View File

@ -195,17 +195,9 @@ static const char * const jlink_cap_str[] = {
#define JLINK_HW_TYPE_FLASHER 2 #define JLINK_HW_TYPE_FLASHER 2
#define JLINK_HW_TYPE_JLINK_PRO 3 #define JLINK_HW_TYPE_JLINK_PRO 3
#define JLINK_HW_TYPE_JLINK_LITE_ADI 5 #define JLINK_HW_TYPE_JLINK_LITE_ADI 5
#define JLINK_HW_TYPE_MAX 6 #define JLINK_HW_TYPE_LPCLINK2 18
static const char * const jlink_hw_type_str[] = {
"J-Link",
"J-Trace",
"Flasher",
"J-Link Pro",
"Unknown",
"J-Link Lite-ADI",
};
/* Interface selection */
#define JLINK_TIF_JTAG 0 #define JLINK_TIF_JTAG 0
#define JLINK_TIF_SWD 1 #define JLINK_TIF_SWD 1
#define JLINK_SWD_DIR_IN 0 #define JLINK_SWD_DIR_IN 0
@ -964,10 +956,29 @@ static int jlink_get_version_info(void)
LOG_INFO("J-Link hw version %i", (int)jlink_hw_version); LOG_INFO("J-Link hw version %i", (int)jlink_hw_version);
if (jlink_hw_type >= JLINK_HW_TYPE_MAX) switch (jlink_hw_type) {
LOG_INFO("J-Link hw type unknown 0x%" PRIx32, jlink_hw_type); case JLINK_HW_TYPE_JLINK:
else LOG_INFO("J-Link hw type J-Link");
LOG_INFO("J-Link hw type %s", jlink_hw_type_str[jlink_hw_type]); break;
case JLINK_HW_TYPE_JTRACE:
LOG_INFO("J-Link hw type J-Trace");
break;
case JLINK_HW_TYPE_FLASHER:
LOG_INFO("J-Link hw type Flasher");
break;
case JLINK_HW_TYPE_JLINK_PRO:
LOG_INFO("J-Link hw type J-Link Pro");
break;
case JLINK_HW_TYPE_JLINK_LITE_ADI:
LOG_INFO("J-Link hw type J-Link Lite-ADI");
break;
case JLINK_HW_TYPE_LPCLINK2:
LOG_INFO("J-Link hw type J-Link on LPC-Link2");
break;
default:
LOG_INFO("J-Link hw type unknown 0x%" PRIx32, jlink_hw_type);
break;
}
} }
if (jlink_caps & (1 << EMU_CAP_GET_MAX_BLOCK_SIZE)) { if (jlink_caps & (1 << EMU_CAP_GET_MAX_BLOCK_SIZE)) {