aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSpencer Oliver <spen@spen-soft.co.uk>2012-02-21 10:41:39 +0000
committerSpencer Oliver <spen@spen-soft.co.uk>2012-02-22 20:55:23 +0000
commitf6b50b8ea24f744c87b7cf04d5cc4bd3a0e9c80c (patch)
tree89cb1d9763853286f651bb2d7a0a78b7e6964c95 /src
parent897981c318e3b9bb4c825c1b1305fee14888c9e6 (diff)
stlink: support expected-id 0
This brings the stlink driver inline with the rest of OpenOCD. If the user configures the tap as -expected-id 0 then the IDCODE will be treated as a wildcard and ignored. Change-Id: I99160c69b2b40f5b1f608bb59ab6630894502fd8 Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk> Reviewed-on: http://openocd.zylin.com/476 Tested-by: jenkins Reviewed-by: Mathias Küster <kesmtp@freenet.de>
Diffstat (limited to 'src')
-rw-r--r--src/jtag/stlink/stlink_interface.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/jtag/stlink/stlink_interface.c b/src/jtag/stlink/stlink_interface.c
index 9c0215f0..389ab3ff 100644
--- a/src/jtag/stlink/stlink_interface.c
+++ b/src/jtag/stlink/stlink_interface.c
@@ -67,7 +67,8 @@ int stlink_interface_init_target(struct target *t)
for (ii = 0; ii < limit; ii++) {
uint32_t expected = t->tap->expected_ids[ii];
- if (t->tap->idcode == expected) {
+ /* treat "-expected-id 0" as a "don't-warn" wildcard */
+ if (!expected || (t->tap->idcode == expected)) {
found = 1;
break;
}