[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.5.0-428-gf6b50b8

[OpenOCD-Gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  f6b50b8ea24f744c87b7cf04d5cc4bd3a0e9c80c (commit)
       via  897981c318e3b9bb4c825c1b1305fee14888c9e6 (commit)
      from  2f944a34100e2824afe199fe744904465482d6d1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit f6b50b8ea24f744c87b7cf04d5cc4bd3a0e9c80c
Author: Spencer Oliver <sp...@sp...>
Date:   Tue Feb 21 10:41:39 2012 +0000

    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 <sp...@sp...>
    Reviewed-on: http://openocd.zylin.com/476
    Tested-by: jenkins
    Reviewed-by: Mathias Küster <ke...@fr...>

diff --git a/src/jtag/stlink/stlink_interface.c b/src/jtag/stlink/stlink_interface.c
index 9c0215f..389ab3f 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;
 		}

commit 897981c318e3b9bb4c825c1b1305fee14888c9e6
Author: Spencer Oliver <sp...@sp...>
Date:   Tue Feb 21 10:34:48 2012 +0000

    docs: fix more texinfo warnings
    
    A period or comma must follow the closing brace of an @xref.
    
    Change-Id: Ida5dc3600eca328d95b0a8f6b5c9fe0a0f3ba820
    Signed-off-by: Spencer Oliver <sp...@sp...>
    Reviewed-on: http://openocd.zylin.com/475
    Tested-by: jenkins
    Reviewed-by: Mathias Küster <ke...@fr...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 4bff740..1aaac58 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -1890,7 +1890,7 @@ The easiest way to convert ``linear'' config files to @code{init_targets} versio
 
 For an example of this scheme see LPC2000 target config files.
 
-The @code{init_boards} procedure is a similar concept concerning board config files (@xref{The init_board procedure}).
+The @code{init_boards} procedure is a similar concept concerning board config files (@xref{The init_board procedure}.)
 
 @subsection ARM Core Specific Hacks
 

-----------------------------------------------------------------------

Summary of changes:
 doc/openocd.texi                   |    2 +-
 src/jtag/stlink/stlink_interface.c |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository