openocd-commit — OpenOCD commit maling list - read only

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-78-g96aaa77f7

[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  96aaa77f72a721f058f3863f270c2ba3d8d68871 (commit)
       via  5bf4640639c1855e4f2968b629e55bfffbdcdd76 (commit)
       via  69adc83a5fff2eff63f223d951c3bc2aaf6deae0 (commit)
       via  87479e379a4015af126b9ff093c1b561c8d9f476 (commit)
       via  98ab7a4eba683a29ee6c969d76c600460519f38d (commit)
      from  ba4cc258d2a350efe7deea1845ad3ee72e8578fc (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 96aaa77f72a721f058f3863f270c2ba3d8d68871
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Dec 12 11:50:56 2020 +0100

    LICENSES: add 'license-rules.txt'
    
    Add a file to the LICENSES directory to describe how file licenses
    should be described in all the OpenOCD files, using the SPDX
    identifier, as well as where all licenses should be in the source
    tree for people to refer to (LICENSES/).
    
    This file is mainly copied from the Linux kernel file in
            Documentation/process/license-rules.rst
    originally written by Thomas Gleixner <tg...@li...>, with
    specific adaptations for OpenOCD.
    
    Change-Id: I7a98fc756df90dc86dbc6e0c47c009a610a0318d
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5973
    Tested-by: jenkins
    Reviewed-by: Tim Newsome <ti...@si...>

diff --git a/COPYING b/COPYING
index b95181f53..0e8db929e 100644
--- a/COPYING
+++ b/COPYING
@@ -7,4 +7,10 @@ later, according with:
 
 	LICENSES/preferred/GPL-2.0
 
+In addition, other licenses may also apply. Please see:
+
+	LICENSES/license-rules.txt
+
+for more details.
+
 All contributions to OpenOCD are subject to this COPYING file.
diff --git a/LICENSES/license-rules.txt b/LICENSES/license-rules.txt
new file mode 100644
index 000000000..8d0c0a0ee
--- /dev/null
+++ b/LICENSES/license-rules.txt
@@ -0,0 +1,218 @@
+# SPDX-License-Identifier: GPL-2.0-or-later OR GFDL-1.2-no-invariants-or-later
+
+OpenOCD licensing rules
+=======================
+
+The OpenOCD source code is provided under the terms of the GNU General
+Public License version 2 or later (GPL-2.0-or-later), as provided in
+LICENSES/preferred/GPL-2.0.
+
+The OpenOCD documentation is provided under the terms of the GNU Free
+Documentation License version 1.2 or later without Invariant Sections
+(GFDL-1.2-no-invariants-or-later).
+
+Few stand-alone applications coexist in the same code tree of OpenOCD
+and are provided under the terms of the GNU General Public License
+version 3 (GPL-3.0), as provided in LICENSES/stand-alone/GPL-3.0.
+
+This documentation file provides a description of how each source file
+should be annotated to make its license clear and unambiguous.
+It doesn't replace the OpenOCD's license.
+
+The license described in the COPYING file applies to the OpenOCD source
+as a whole, though individual source files can have a different license
+which is required to be compatible with the GPL-2.0:
+
+    GPL-1.0-or-later  : GNU General Public License v1.0 or later
+    GPL-2.0-or-later  : GNU General Public License v2.0 or later
+    LGPL-2.0          : GNU Library General Public License v2 only
+    LGPL-2.0-or-later : GNU Library General Public License v2 or later
+    LGPL-2.1          : GNU Lesser General Public License v2.1 only
+    LGPL-2.1-or-later : GNU Lesser General Public License v2.1 or later
+
+Aside from that, individual files can be provided under a dual license,
+e.g. one of the compatible GPL variants and alternatively under a
+permissive license like BSD, MIT etc.
+
+The common way of expressing the license of a source file is to add the
+matching boilerplate text into the top comment of the file. Due to
+formatting, typos etc. these "boilerplates" are hard to validate for
+tools which are used in the context of license compliance.
+
+An alternative to boilerplate text is the use of Software Package Data
+Exchange (SPDX) license identifiers in each source file. SPDX license
+identifiers are machine parsable and precise shorthands for the license
+under which the content of the file is contributed. SPDX license
+identifiers are managed by the SPDX Workgroup at the Linux Foundation and
+have been agreed on by partners throughout the industry, tool vendors, and
+legal teams. For further information see https://spdx.org/
+
+OpenOCD requires the precise SPDX identifier in all source files.
+The valid identifiers used in OpenOCD are explained in the section
+`License identifiers` and have been retrieved from the official SPDX
+license list at https://spdx.org/licenses/ along with the license texts.
+
+License identifier syntax
+-------------------------
+
+1. Placement:
+
+   The SPDX license identifier in OpenOCD files shall be added at the
+   first possible line in a file which can contain a comment. For the
+   majority of files this is the first line, except for scripts which
+   require the '#!PATH_TO_INTERPRETER' in the first line. For those
+   scripts the SPDX identifier goes into the second line.
+
+2. Style:
+
+   The SPDX license identifier is added in form of a comment. The comment
+   style depends on the file type::
+
+      C source:  // SPDX-License-Identifier: <SPDX License Expression>
+      C header:  /* SPDX-License-Identifier: <SPDX License Expression> */
+      ASM:       /* SPDX-License-Identifier: <SPDX License Expression> */
+      makefiles: # SPDX-License-Identifier: <SPDX License Expression>
+      scripts:   # SPDX-License-Identifier: <SPDX License Expression>
+      texinfo:   @c SPDX-License-Identifier: <SPDX License Expression>
+      text:      # SPDX-License-Identifier: <SPDX License Expression>
+
+   If a specific tool cannot handle the standard comment style, then the
+   appropriate comment mechanism which the tool accepts shall be used. This
+   is the reason for having the "/\* \*/" style comment in C header
+   files. There was build breakage observed with generated .lds files where
+   'ld' failed to parse the C++ comment. This has been fixed by now, but
+   there are still older assembler tools which cannot handle C++ style
+   comments.
+
+3. Syntax:
+
+   A <SPDX License Expression> is either an SPDX short form license
+   identifier found on the SPDX License List, or the combination of two
+   SPDX short form license identifiers separated by "WITH" when a license
+   exception applies. When multiple licenses apply, an expression consists
+   of keywords "AND", "OR" separating sub-expressions and surrounded by
+   "(", ")" .
+
+   License identifiers for licenses like [L]GPL with the 'or later' option
+   are constructed by using a "-or-later":
+
+      // SPDX-License-Identifier: GPL-2.0-or-later
+      // SPDX-License-Identifier: LGPL-2.1-or-later
+
+   WITH should be used when there is a modifier to a license needed.
+   Exceptions can only be used with particular License identifiers. The
+   valid License identifiers are listed in the tags of the exception text
+   file.
+
+   OR should be used if the file is dual licensed and only one license is
+   to be selected. For example, some source files are available under dual
+   licenses:
+
+      // SPDX-License-Identifier: GPL-2.0-or-later OR BSD-1-Clause
+      // SPDX-License-Identifier: GPL-2.0-or-later OR BSD-2-Clause
+      // SPDX-License-Identifier: GPL-2.0-or-later OR BSD-3-Clause
+
+   AND should be used if the file has multiple licenses whose terms all
+   apply to use the file. For example, if code is inherited from another
+   project and permission has been given to put it in OpenOCD, but the
+   original license terms need to remain in effect::
+
+      // SPDX-License-Identifier: GPL-2.0-or-later AND MIT
+
+License identifiers
+-------------------
+
+The licenses currently used, as well as the licenses for code added to
+OpenOCD, can be broken down into:
+
+1. `Preferred licenses`:
+
+   Whenever possible these licenses should be used as they are known to be
+   fully compatible and widely used. These licenses are available from the
+   directory:
+
+      LICENSES/preferred/
+
+   in the OpenOCD source tree.
+
+   The files in this directory contain the full license text and
+   `Metatags`. The file names are identical to the SPDX license
+   identifier which shall be used for the license in source files.
+
+   Examples:
+
+      LICENSES/preferred/GPL-2.0
+
+   Contains the GPL version 2 license text and the required metatags.
+
+   `Metatags`:
+
+   The following meta tags must be available in a license file:
+
+   - Valid-License-Identifier:
+
+     One or more lines which declare which License Identifiers are valid
+     inside the project to reference this particular license text. Usually
+     this is a single valid identifier, but e.g. for licenses with the 'or
+     later' options two identifiers are valid.
+
+   - SPDX-URL:
+
+     The URL of the SPDX page which contains additional information related
+     to the license.
+
+   - Usage-Guidance:
+
+     Freeform text for usage advice. The text must include correct examples
+     for the SPDX license identifiers as they should be put into source
+     files according to the `License identifier syntax` guidelines.
+
+   - License-Text:
+
+     All text after this tag is treated as the original license text
+
+   File format examples::
+
+      Valid-License-Identifier: GPL-2.0
+      Valid-License-Identifier: GPL-2.0-only
+      Valid-License-Identifier: GPL-2.0-or-later
+      SPDX-URL: https://spdx.org/licenses/GPL-2.0.html
+      Usage-Guide:
+        To use this license in source code, put one of the following SPDX
+        tag/value pairs into a comment according to the placement
+        guidelines in the licensing rules documentation.
+        For 'GNU General Public License (GPL) version 2 only' use:
+          SPDX-License-Identifier: GPL-2.0
+        or
+          SPDX-License-Identifier: GPL-2.0-only
+        For 'GNU General Public License (GPL) version 2 or any later version' use:
+          SPDX-License-Identifier: GPL-2.0-or-later
+      License-Text:
+        Full license text
+
+2. Stand-alone licenses:
+
+   These licenses should only be used for stand-alone applications that are
+   distributed with OpenOCD but are not included in the OpenOCD binary.
+   These licenses are available from the directory:
+
+     LICENSES/stand-alone/
+
+   in the OpenOCD source tree.
+
+   Examples:
+
+     SPDX-License-Identifier: GPL-3.0
+
+The format and requirements of the license files in the other sub-directories
+of directory
+
+   LICENSES
+
+have to follow the same format and requirements of the `Preferred licenses`.
+
+All SPDX license identifiers and exceptions must have a corresponding file
+in the LICENSES subdirectories. This is required to allow tool
+verification (e.g. checkpatch.pl) and to have the licenses ready to read
+and extract right from the source, which is recommended by various FOSS
+organizations, e.g. the `FSFE REUSE initiative <https://reuse.software/>`.
diff --git a/Makefile.am b/Makefile.am
index 21b7c418d..fc444f127 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,7 @@ EXTRA_DIST += \
 	README.macOS \
 	$(EXTRA_DIST_NEWS) \
 	Doxyfile.in \
+	LICENSES/license-rules.txt \
 	LICENSES/preferred/BSD-1-Clause \
 	LICENSES/preferred/BSD-2-Clause \
 	LICENSES/preferred/BSD-3-Clause \

commit 5bf4640639c1855e4f2968b629e55bfffbdcdd76
Author: Antonio Borneo <bor...@gm...>
Date:   Thu Dec 10 23:59:01 2020 +0100

    LICENSES: add the BSD 1-clause license
    
    Add the full text of the BSD 1-clause license.
    It was copied directly from:
    
            https://spdx.org/licenses/BSD-1-Clause.html#licenseText
    
    Add the required tags for reference and tooling.
    
    Change-Id: I71444e6a45d0e77fc57220cf1d579c010a27fdf3
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5972
    Tested-by: jenkins

diff --git a/LICENSES/preferred/BSD-1-Clause b/LICENSES/preferred/BSD-1-Clause
new file mode 100644
index 000000000..c63b05bf5
--- /dev/null
+++ b/LICENSES/preferred/BSD-1-Clause
@@ -0,0 +1,28 @@
+Valid-License-Identifier: BSD-1-Clause
+SPDX-URL: https://spdx.org/licenses/BSD-1-Clause.html
+Usage-Guide:
+  To use the BSD 1-clause License put the following SPDX
+  tag/value pair into a comment according to the placement guidelines in
+  the licensing rules documentation:
+    SPDX-License-Identifier: BSD-1-Clause
+License-Text:
+
+Copyright (c) <year> <owner> . All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/Makefile.am b/Makefile.am
index 8f52a395d..21b7c418d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,7 @@ EXTRA_DIST += \
 	README.macOS \
 	$(EXTRA_DIST_NEWS) \
 	Doxyfile.in \
+	LICENSES/preferred/BSD-1-Clause \
 	LICENSES/preferred/BSD-2-Clause \
 	LICENSES/preferred/BSD-3-Clause \
 	LICENSES/preferred/GFDL-1.2 \

commit 69adc83a5fff2eff63f223d951c3bc2aaf6deae0
Author: Thomas Gleixner <tg...@li...>
Date:   Thu Dec 28 16:27:16 2017 +0100

    LICENSES: add the BSD 3-clause "New" or "Revised" License
    
    Add the full text of the BSD 3-clause "New" or "Revised" License to
    OpenOCD tree. It was copied directly from:
    
      https://spdx.org/licenses/BSD-3-Clause.html#licenseText
    
    Add the required tags for reference and tooling.
    
    Change-Id: I0e7977ed92af9d58a4a72152dd792045b237f2f0
    Signed-off-by: Thomas Gleixner <tg...@li...>
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5971
    Tested-by: jenkins

diff --git a/LICENSES/preferred/BSD-3-Clause b/LICENSES/preferred/BSD-3-Clause
new file mode 100644
index 000000000..34c7f057c
--- /dev/null
+++ b/LICENSES/preferred/BSD-3-Clause
@@ -0,0 +1,36 @@
+Valid-License-Identifier: BSD-3-Clause
+SPDX-URL: https://spdx.org/licenses/BSD-3-Clause.html
+Usage-Guide:
+  To use the BSD 3-clause "New" or "Revised" License put the following SPDX
+  tag/value pair into a comment according to the placement guidelines in
+  the licensing rules documentation:
+    SPDX-License-Identifier: BSD-3-Clause
+License-Text:
+
+Copyright (c) <year> <owner> . All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from this
+   software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/Makefile.am b/Makefile.am
index 664430acb..8f52a395d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,7 @@ EXTRA_DIST += \
 	$(EXTRA_DIST_NEWS) \
 	Doxyfile.in \
 	LICENSES/preferred/BSD-2-Clause \
+	LICENSES/preferred/BSD-3-Clause \
 	LICENSES/preferred/GFDL-1.2 \
 	LICENSES/preferred/gfdl-1.2.texi.readme \
 	LICENSES/preferred/GPL-2.0 \

commit 87479e379a4015af126b9ff093c1b561c8d9f476
Author: Thomas Gleixner <tg...@li...>
Date:   Thu Dec 28 16:27:15 2017 +0100

    LICENSES: add the BSD 2-clause "Simplified" license
    
    Add the full text of the BSD 2-clause "Simplified" license to OpenOCD
    tree. It was copied directly from:
    
       https://spdx.org/licenses/BSD-2-Clause.html#licenseText
    
    Add the required tags for reference and tooling.
    
    Change-Id: I1c2fb8ad7510ddd0d745308c0a9acc2764c31f4e
    Signed-off-by: Thomas Gleixner <tg...@li...>
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5970
    Tested-by: jenkins

diff --git a/LICENSES/preferred/BSD-2-Clause b/LICENSES/preferred/BSD-2-Clause
new file mode 100644
index 000000000..da366e2ce
--- /dev/null
+++ b/LICENSES/preferred/BSD-2-Clause
@@ -0,0 +1,32 @@
+Valid-License-Identifier: BSD-2-Clause
+SPDX-URL: https://spdx.org/licenses/BSD-2-Clause.html
+Usage-Guide:
+  To use the BSD 2-clause "Simplified" License put the following SPDX
+  tag/value pair into a comment according to the placement guidelines in
+  the licensing rules documentation:
+    SPDX-License-Identifier: BSD-2-Clause
+License-Text:
+
+Copyright (c) <year> <owner> . All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+   this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
diff --git a/Makefile.am b/Makefile.am
index 8698c42c5..664430acb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,7 @@ EXTRA_DIST += \
 	README.macOS \
 	$(EXTRA_DIST_NEWS) \
 	Doxyfile.in \
+	LICENSES/preferred/BSD-2-Clause \
 	LICENSES/preferred/GFDL-1.2 \
 	LICENSES/preferred/gfdl-1.2.texi.readme \
 	LICENSES/preferred/GPL-2.0 \

commit 98ab7a4eba683a29ee6c969d76c600460519f38d
Author: Antonio Borneo <bor...@gm...>
Date:   Mon Dec 7 15:28:16 2020 +0100

    LICENSES: add the GFDL-1.2 license
    
    The documentation of OpenOCD is released under the GNU Free
    Documentation License, version 1.2, with embedded some part of
    OpenOCD code released under the GNU GPL-2.0-or-later.
    
    Update doc/fdl.texi with latest minor fixes as in
            https://www.gnu.org/licenses/old-licenses/fdl-1.2.texi
    Update doc/openocd.texi and move here the license chapter title
    Add license file LICENSES/preferred/GFDL-1.2 from
            https://www.gnu.org/licenses/old-licenses/fdl-1.2.txt
    and add the required tags for reference and tooling, coping
    mostly from the Linux kernel license file in the 'deprecated'
    folder.
    Add a readme file to link to the existing texinfo copy of the
    license.
    
    Change-Id: Ief96e0686257be7a70d4eeec442848bd6494763d
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5969
    Tested-by: jenkins

diff --git a/doc/fdl.texi b/LICENSES/preferred/GFDL-1.2
similarity index 64%
copy from doc/fdl.texi
copy to LICENSES/preferred/GFDL-1.2
index 33b2a1646..9217d9c8e 100644
--- a/doc/fdl.texi
+++ b/LICENSES/preferred/GFDL-1.2
@@ -1,32 +1,39 @@
-@c -*-texinfo-*-
-@node License
-@appendix The GNU Free Documentation License.
-@center Version 1.2, November 2002
+Valid-License-Identifier: GPL-2.0-or-later OR GFDL-1.2-no-invariants-or-later
+Valid-License-Identifier: GFDL-1.2-no-invariants-or-later
+SPDX-URL: https://spdx.org/licenses/GFDL-1.2-no-invariants-or-later.html
+Usage-Guide:
+  The GNU Free Documentation License should only be used without
+  Invariant Sections, Front-Cover Texts or Back-Cover Texts.
+  It should not be used for new documents.
+  To use the license in source code, put the following SPDX tag/value pair
+  into a comment according to the placement guidelines in the licensing
+  rules documentation:
+    SPDX-License-Identifier: GPL-2.0-or-later OR GFDL-1.2-no-invariants-or-later
+  or
+    SPDX-License-Identifier: GFDL-1.2-no-invariants-or-later
+License-Text:
 
-@c This file is intended to be included within another document,
-@c hence no sectioning command or @node.
+                GNU Free Documentation License
+                  Version 1.2, November 2002
 
-@display
-Copyright @copyright{} 2000,2001,2002 Free Software Foundation, Inc.
-51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA
 
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-@end display
+ Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
+     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-@enumerate 0
-@item
-PREAMBLE
+
+0. PREAMBLE
 
 The purpose of this License is to make a manual, textbook, or other
-functional and useful document @dfn{free} in the sense of freedom: to
+functional and useful document "free" in the sense of freedom: to
 assure everyone the effective freedom to copy and redistribute it,
 with or without modifying it, either commercially or noncommercially.
 Secondarily, this License preserves for the author and publisher a way
 to get credit for their work, while not being considered responsible
 for modifications made by others.
 
-This License is a kind of ``copyleft'', which means that derivative
+This License is a kind of "copyleft", which means that derivative
 works of the document must themselves be free in the same sense.  It
 complements the GNU General Public License, which is a copyleft
 license designed for free software.
@@ -39,35 +46,35 @@ it can be used for any textual work, regardless of subject matter or
 whether it is published as a printed book.  We recommend this License
 principally for works whose purpose is instruction or reference.
 
-@item
-APPLICABILITY AND DEFINITIONS
+
+1. APPLICABILITY AND DEFINITIONS
 
 This License applies to any manual or other work, in any medium, that
 contains a notice placed by the copyright holder saying it can be
 distributed under the terms of this License.  Such a notice grants a
 world-wide, royalty-free license, unlimited in duration, to use that
-work under the conditions stated herein.  The ``Document'', below,
+work under the conditions stated herein.  The "Document", below,
 refers to any such manual or work.  Any member of the public is a
-licensee, and is addressed as ``you''.  You accept the license if you
+licensee, and is addressed as "you".  You accept the license if you
 copy, modify or distribute the work in a way requiring permission
 under copyright law.
 
-A ``Modified Version'' of the Document means any work containing the
+A "Modified Version" of the Document means any work containing the
 Document or a portion of it, either copied verbatim, or with
 modifications and/or translated into another language.
 
-A ``Secondary Section'' is a named appendix or a front-matter section
-of the Document that deals exclusively with the relationship of the
-publishers or authors of the Document to the Document's overall
-subject (or to related matters) and contains nothing that could fall
-directly within that overall subject.  (Thus, if the Document is in
-part a textbook of mathematics, a Secondary Section may not explain
-any mathematics.)  The relationship could be a matter of historical
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall subject
+(or to related matters) and contains nothing that could fall directly
+within that overall subject.  (Thus, if the Document is in part a
+textbook of mathematics, a Secondary Section may not explain any
+mathematics.)  The relationship could be a matter of historical
 connection with the subject or with related matters, or of legal,
 commercial, philosophical, ethical or political position regarding
 them.
 
-The ``Invariant Sections'' are certain Secondary Sections whose titles
+The "Invariant Sections" are certain Secondary Sections whose titles
 are designated, as being those of Invariant Sections, in the notice
 that says that the Document is released under this License.  If a
 section does not fit the above definition of Secondary then it is not
@@ -75,12 +82,12 @@ allowed to be designated as Invariant.  The Document may contain zero
 Invariant Sections.  If the Document does not identify any Invariant
 Sections then there are none.
 
-The ``Cover Texts'' are certain short passages of text that are listed,
+The "Cover Texts" are certain short passages of text that are listed,
 as Front-Cover Texts or Back-Cover Texts, in the notice that says that
 the Document is released under this License.  A Front-Cover Text may
 be at most 5 words, and a Back-Cover Text may be at most 25 words.
 
-A ``Transparent'' copy of the Document means a machine-readable copy,
+A "Transparent" copy of the Document means a machine-readable copy,
 represented in a format whose specification is available to the
 general public, that is suitable for revising the document
 straightforwardly with generic text editors or (for images composed of
@@ -91,35 +98,33 @@ to text formatters.  A copy made in an otherwise Transparent file
 format whose markup, or absence of markup, has been arranged to thwart
 or discourage subsequent modification by readers is not Transparent.
 An image format is not Transparent if used for any substantial amount
-of text.  A copy that is not ``Transparent'' is called ``Opaque''.
+of text.  A copy that is not "Transparent" is called "Opaque".
 
 Examples of suitable formats for Transparent copies include plain
-@sc{ascii} without markup, Texinfo input format, La@TeX{} input
-format, @acronym{SGML} or @acronym{XML} using a publicly available
-@acronym{DTD}, and standard-conforming simple @acronym{HTML},
-PostScript or @acronym{PDF} designed for human modification.  Examples
-of transparent image formats include @acronym{PNG}, @acronym{XCF} and
-@acronym{JPG}.  Opaque formats include proprietary formats that can be
-read and edited only by proprietary word processors, @acronym{SGML} or
-@acronym{XML} for which the @acronym{DTD} and/or processing tools are
-not generally available, and the machine-generated @acronym{HTML},
-PostScript or @acronym{PDF} produced by some word processors for
-output purposes only.
-
-The ``Title Page'' means, for a printed book, the title page itself,
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification.  Examples of
+transparent image formats include PNG, XCF and JPG.  Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
 plus such following pages as are needed to hold, legibly, the material
 this License requires to appear in the title page.  For works in
-formats which do not have any title page as such, ``Title Page'' means
+formats which do not have any title page as such, "Title Page" means
 the text near the most prominent appearance of the work's title,
 preceding the beginning of the body of the text.
 
-A section ``Entitled XYZ'' means a named subunit of the Document whose
+A section "Entitled XYZ" means a named subunit of the Document whose
 title either is precisely XYZ or contains XYZ in parentheses following
 text that translates XYZ in another language.  (Here XYZ stands for a
-specific section name mentioned below, such as ``Acknowledgements'',
-``Dedications'', ``Endorsements'', or ``History''.)  To ``Preserve the Title''
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".)  To "Preserve the Title"
 of such a section when you modify the Document means that it remains a
-section ``Entitled XYZ'' according to this definition.
+section "Entitled XYZ" according to this definition.
 
 The Document may include Warranty Disclaimers next to the notice which
 states that this License applies to the Document.  These Warranty
@@ -128,8 +133,8 @@ License, but only as regards disclaiming warranties: any other
 implication that these Warranty Disclaimers may have is void and has
 no effect on the meaning of this License.
 
-@item
-VERBATIM COPYING
+
+2. VERBATIM COPYING
 
 You may copy and distribute the Document in any medium, either
 commercially or noncommercially, provided that this License, the
@@ -144,8 +149,8 @@ number of copies you must also follow the conditions in section 3.
 You may also lend copies, under the same conditions stated above, and
 you may publicly display copies.
 
-@item
-COPYING IN QUANTITY
+
+3. COPYING IN QUANTITY
 
 If you publish printed copies (or copies in media that commonly have
 printed covers) of the Document, numbering more than 100, and the
@@ -182,8 +187,8 @@ It is requested, but not required, that you contact the authors of the
 Document well before redistributing any large number of copies, to give
 them a chance to provide you with an updated version of the Document.
 
-@item
-MODIFICATIONS
+
+4. MODIFICATIONS
 
 You may copy and distribute a Modified Version of the Document under
 the conditions of sections 2 and 3 above, provided that you release
@@ -192,84 +197,53 @@ Version filling the role of the Document, thus licensing distribution
 and modification of the Modified Version to whoever possesses a copy
 of it.  In addition, you must do these things in the Modified Version:
 
-@enumerate A
-@item
-Use in the Title Page (and on the covers, if any) a title distinct
-from that of the Document, and from those of previous versions
-(which should, if there were any, be listed in the History section
-of the Document).  You may use the same title as a previous version
-if the original publisher of that version gives permission.
-
-@item
-List on the Title Page, as authors, one or more persons or entities
-responsible for authorship of the modifications in the Modified
-Version, together with at least five of the principal authors of the
-Document (all of its principal authors, if it has fewer than five),
-unless they release you from this requirement.
-
-@item
-State on the Title page the name of the publisher of the
-Modified Version, as the publisher.
-
-@item
-Preserve all the copyright notices of the Document.
-
-@item
-Add an appropriate copyright notice for your modifications
-adjacent to the other copyright notices.
-
-@item
-Include, immediately after the copyright notices, a license notice
-giving the public permission to use the Modified Version under the
-terms of this License, in the form shown in the Addendum below.
-
-@item
-Preserve in that license notice the full lists of Invariant Sections
-and required Cover Texts given in the Document's license notice.
-
-@item
-Include an unaltered copy of this License.
-
-@item
-Preserve the section Entitled ``History'', Preserve its Title, and add
-to it an item stating at least the title, year, new authors, and
-publisher of the Modified Version as given on the Title Page.  If
-there is no section Entitled ``History'' in the Document, create one
-stating the title, year, authors, and publisher of the Document as
-given on its Title Page, then add an item describing the Modified
-Version as stated in the previous sentence.
-
-@item
-Preserve the network location, if any, given in the Document for
-public access to a Transparent copy of the Document, and likewise
-the network locations given in the Document for previous versions
-it was based on.  These may be placed in the ``History'' section.
-You may omit a network location for a work that was published at
-least four years before the Document itself, or if the original
-publisher of the version it refers to gives permission.
-
-@item
-For any section Entitled ``Acknowledgements'' or ``Dedications'', Preserve
-the Title of the section, and preserve in the section all the
-substance and tone of each of the contributor acknowledgements and/or
-dedications given therein.
-
-@item
-Preserve all the Invariant Sections of the Document,
-unaltered in their text and in their titles.  Section numbers
-or the equivalent are not considered part of the section titles.
-
-@item
-Delete any section Entitled ``Endorsements''.  Such a section
-may not be included in the Modified Version.
-
-@item
-Do not retitle any existing section to be Entitled ``Endorsements'' or
-to conflict in title with any Invariant Section.
-
-@item
-Preserve any Warranty Disclaimers.
-@end enumerate
+A. Use in the Title Page (and on the covers, if any) a title distinct
+   from that of the Document, and from those of previous versions
+   (which should, if there were any, be listed in the History section
+   of the Document).  You may use the same title as a previous version
+   if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+   responsible for authorship of the modifications in the Modified
+   Version, together with at least five of the principal authors of the
+   Document (all of its principal authors, if it has fewer than five),
+   unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+   Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+   adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+   giving the public permission to use the Modified Version under the
+   terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+   and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+   to it an item stating at least the title, year, new authors, and
+   publisher of the Modified Version as given on the Title Page.  If
+   there is no section Entitled "History" in the Document, create one
+   stating the title, year, authors, and publisher of the Document as
+   given on its Title Page, then add an item describing the Modified
+   Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+   public access to a Transparent copy of the Document, and likewise
+   the network locations given in the Document for previous versions
+   it was based on.  These may be placed in the "History" section.
+   You may omit a network location for a work that was published at
+   least four years before the Document itself, or if the original
+   publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+   Preserve the Title of the section, and preserve in the section all
+   the substance and tone of each of the contributor acknowledgements
+   and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+   unaltered in their text and in their titles.  Section numbers
+   or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements".  Such a section
+   may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+   or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
 
 If the Modified Version includes new front-matter sections or
 appendices that qualify as Secondary Sections and contain no material
@@ -278,9 +252,9 @@ of these sections as invariant.  To do this, add their titles to the
 list of Invariant Sections in the Modified Version's license notice.
 These titles must be distinct from any other section titles.
 
-You may add a section Entitled ``Endorsements'', provided it contains
+You may add a section Entitled "Endorsements", provided it contains
 nothing but endorsements of your Modified Version by various
-parties---for example, statements of peer review or that the text has
+parties--for example, statements of peer review or that the text has
 been approved by an organization as the authoritative definition of a
 standard.
 
@@ -298,8 +272,8 @@ The author(s) and publisher(s) of the Document do not by this License
 give permission to use their names for publicity for or to assert or
 imply endorsement of any Modified Version.
 
-@item
-COMBINING DOCUMENTS
+
+5. COMBINING DOCUMENTS
 
 You may combine the Document with other documents released under this
 License, under the terms defined in section 4 above for modified
@@ -317,14 +291,14 @@ author or publisher of that section if known, or else a unique number.
 Make the same adjustment to the section titles in the list of
 Invariant Sections in the license notice of the combined work.
 
-In the combination, you must combine any sections Entitled ``History''
+In the combination, you must combine any sections Entitled "History"
 in the various original documents, forming one section Entitled
-``History''; likewise combine any sections Entitled ``Acknowledgements'',
-and any sections Entitled ``Dedications''.  You must delete all
-sections Entitled ``Endorsements.''
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications".  You must delete all sections
+Entitled "Endorsements".
+
 
-@item
-COLLECTIONS OF DOCUMENTS
+6. COLLECTIONS OF DOCUMENTS
 
 You may make a collection consisting of the Document and other documents
 released under this License, and replace the individual copies of this
@@ -337,12 +311,12 @@ it individually under this License, provided you insert a copy of this
 License into the extracted document, and follow this License in all
 other respects regarding verbatim copying of that document.
 
-@item
-AGGREGATION WITH INDEPENDENT WORKS
+
+7. AGGREGATION WITH INDEPENDENT WORKS
 
 A compilation of the Document or its derivatives with other separate
 and independent documents or works, in or on a volume of a storage or
-distribution medium, is called an ``aggregate'' if the copyright
+distribution medium, is called an "aggregate" if the copyright
 resulting from the compilation is not used to limit the legal rights
 of the compilation's users beyond what the individual works permit.
 When the Document is included in an aggregate, this License does not
@@ -357,8 +331,8 @@ electronic equivalent of covers if the Document is in electronic form.
 Otherwise they must appear on printed covers that bracket the whole
 aggregate.
 
-@item
-TRANSLATION
+
+8. TRANSLATION
 
 Translation is considered a kind of modification, so you may
 distribute translations of the Document under the terms of section 4.
@@ -373,13 +347,13 @@ of those notices and disclaimers.  In case of a disagreement between
 the translation and the original version of this License or a notice
 or disclaimer, the original version will prevail.
 
-If a section in the Document is Entitled ``Acknowledgements'',
-``Dedications'', or ``History'', the requirement (section 4) to Preserve
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
 its Title (section 1) will typically require changing the actual
 title.
 
-@item
-TERMINATION
+
+9. TERMINATION
 
 You may not copy, modify, sublicense, or distribute the Document except
 as expressly provided for under this License.  Any other attempt to
@@ -389,53 +363,44 @@ parties who have received copies, or rights, from you under this
 License will not have their licenses terminated so long as such
 parties remain in full compliance.
 
-@item
-FUTURE REVISIONS OF THIS LICENSE
+
+10. FUTURE REVISIONS OF THIS LICENSE
 
 The Free Software Foundation may publish new, revised versions
 of the GNU Free Documentation License from time to time.  Such new
 versions will be similar in spirit to the present version, but may
 differ in detail to address new problems or concerns.  See
-@uref{http://www.gnu.org/copyleft/}.
+https://www.gnu.org/licenses/.
 
 Each version of the License is given a distinguishing version number.
 If the Document specifies that a particular numbered version of this
-License ``or any later version'' applies to it, you have the option of
+License "or any later version" applies to it, you have the option of
 following the terms and conditions either of that specified version or
 of any later version that has been published (not as a draft) by the
 Free Software Foundation.  If the Document does not specify a version
 number of this License, you may choose any version ever published (not
 as a draft) by the Free Software Foundation.
-@end enumerate
 
-@unnumberedsec ADDENDUM: How to use this License for your documents
+
+ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of
 the License in the document and put the following copyright and
 license notices just after the title page:
 
-@smallexample
-@group
-  Copyright (C)  @var{year}  @var{your name}.
-  Permission is granted to copy, distribute and/or modify this document
-  under the terms of the GNU Free Documentation License, Version 1.2
-  or any later version published by the Free Software Foundation;
-  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
-  Texts.  A copy of the license is included in the section entitled ``GNU
-  Free Documentation License''.
-@end group
-@end smallexample
+    Copyright (c)  YEAR  YOUR NAME.
+    Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.2
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
 
 If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
-replace the ``with@dots{}Texts.'' line with this:
+replace the "with...Texts." line with this:
 
-@smallexample
-@group
-    with the Invariant Sections being @var{list their titles}, with
-    the Front-Cover Texts being @var{list}, and with the Back-Cover Texts
-    being @var{list}.
-@end group
-@end smallexample
+    with the Invariant Sections being LIST THEIR TITLES, with the
+    Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
 
 If you have Invariant Sections without Cover Texts, or some other
 combination of the three, merge those two alternatives to suit the
@@ -445,7 +410,3 @@ If your document contains nontrivial examples of program code, we
 recommend releasing these examples in parallel under your choice of
 free software license, such as the GNU General Public License,
 to permit their use in free software.
-
-@c Local Variables:
-@c ispell-local-pdict: "ispell-dict"
-@c End:
diff --git a/LICENSES/preferred/gfdl-1.2.texi.readme b/LICENSES/preferred/gfdl-1.2.texi.readme
new file mode 100644
index 000000000..9375c7913
--- /dev/null
+++ b/LICENSES/preferred/gfdl-1.2.texi.readme
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-or-later OR GFDL-1.2-no-invariants-or-later
+
+The texinfo version of the license gfdl-1.2 is distributed in the
+file doc/fdl.texi .
diff --git a/Makefile.am b/Makefile.am
index 83865e444..8698c42c5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,8 @@ EXTRA_DIST += \
 	README.macOS \
 	$(EXTRA_DIST_NEWS) \
 	Doxyfile.in \
+	LICENSES/preferred/GFDL-1.2 \
+	LICENSES/preferred/gfdl-1.2.texi.readme \
 	LICENSES/preferred/GPL-2.0 \
 	LICENSES/stand-alone/GPL-3.0 \
 	tools/logger.pl \
diff --git a/doc/fdl.texi b/doc/fdl.texi
index 33b2a1646..2189f80a6 100644
--- a/doc/fdl.texi
+++ b/doc/fdl.texi
@@ -1,6 +1,5 @@
 @c -*-texinfo-*-
-@node License
-@appendix The GNU Free Documentation License.
+@c The GNU Free Documentation License.
 @center Version 1.2, November 2002
 
 @c This file is intended to be included within another document,
@@ -396,7 +395,7 @@ The Free Software Foundation may publish new, revised versions
 of the GNU Free Documentation License from time to time.  Such new
 versions will be similar in spirit to the present version, but may
 differ in detail to address new problems or concerns.  See
-@uref{http://www.gnu.org/copyleft/}.
+@uref{https://www.gnu.org/licenses/}.
 
 Each version of the License is given a distinguishing version number.
 If the Document specifies that a particular numbered version of this
@@ -408,7 +407,8 @@ number of this License, you may choose any version ever published (not
 as a draft) by the Free Software Foundation.
 @end enumerate
 
-@unnumberedsec ADDENDUM: How to use this License for your documents
+@page
+@heading ADDENDUM: How to use this License for your documents
 
 To use this License in a document you have written, include a copy of
 the License in the document and put the following copyright and
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 45c9ffae8..2cba45ecd 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -11833,6 +11833,8 @@ foreach who @{A B C D E@}
 @}
 @end example
 
+@node License
+@appendix The GNU Free Documentation License.
 @include fdl.texi
 
 @node OpenOCD Concept Index

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

Summary of changes:
 COPYING                                     |   6 +
 LICENSES/license-rules.txt                  | 218 +++++++++++++++++++
 LICENSES/preferred/BSD-1-Clause             |  28 +++
 LICENSES/preferred/BSD-2-Clause             |  32 +++
 LICENSES/preferred/BSD-3-Clause             |  36 +++
 doc/fdl.texi => LICENSES/preferred/GFDL-1.2 | 327 ++++++++++++----------------
 LICENSES/preferred/gfdl-1.2.texi.readme     |   4 +
 Makefile.am                                 |   6 +
 doc/fdl.texi                                |   8 +-
 doc/openocd.texi                            |   2 +
 10 files changed, 480 insertions(+), 187 deletions(-)
 create mode 100644 LICENSES/license-rules.txt
 create mode 100644 LICENSES/preferred/BSD-1-Clause
 create mode 100644 LICENSES/preferred/BSD-2-Clause
 create mode 100644 LICENSES/preferred/BSD-3-Clause
 copy doc/fdl.texi => LICENSES/preferred/GFDL-1.2 (64%)
 create mode 100644 LICENSES/preferred/gfdl-1.2.texi.readme


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-73-gba4cc258d

[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  ba4cc258d2a350efe7deea1845ad3ee72e8578fc (commit)
       via  659e2e9da9a7d570827984cb3afdb2a44c3672e3 (commit)
      from  01030fb893546ddd522a1557d8c00868b3e45f60 (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 ba4cc258d2a350efe7deea1845ad3ee72e8578fc
Author: Antonio Borneo <bor...@gm...>
Date:   Mon Dec 7 23:25:39 2020 +0100

    LICENSES: add the GPL-3.0 license for stand-alone code
    
    The stand-alone application "contrib/itmdump.c" is released as
    GPL-3.0-or-later.
    
    Add GPL-3.0 license in the licenses list.
    Copy in subfolder stand-alone the GPL-3.0 from
            https://www.gnu.org/licenses/gpl-3.0.txt
    adding the header required by spdxcheck.py.
    
    Change-Id: I238efc411e07ed6bc1eba23edbc91b3825c3d2c7
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5968
    Tested-by: jenkins

diff --git a/LICENSES/stand-alone/GPL-3.0 b/LICENSES/stand-alone/GPL-3.0
new file mode 100644
index 000000000..97dde3ee8
--- /dev/null
+++ b/LICENSES/stand-alone/GPL-3.0
@@ -0,0 +1,690 @@
+Valid-License-Identifier: GPL-3.0
+Valid-License-Identifier: GPL-3.0-only
+Valid-License-Identifier: GPL-3.0-or-later
+SPDX-URL: https://spdx.org/licenses/GPL-3.0.html
+Usage-Guide:
+  To use this license in source code, put one of the following SPDX
+  tag/value pairs into a comment according to the placement
+  guidelines in the licensing rules documentation.
+  For 'GNU General Public License (GPL) version 3 only' use:
+    SPDX-License-Identifier: GPL-3.0
+  or
+    SPDX-License-Identifier: GPL-3.0-only
+  For 'GNU General Public License (GPL) version 3 or any later version' use:
+    SPDX-License-Identifier: GPL-3.0-or-later
+License-Text:
+
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/Makefile.am b/Makefile.am
index cdd4ccb42..83865e444 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,6 +51,7 @@ EXTRA_DIST += \
 	$(EXTRA_DIST_NEWS) \
 	Doxyfile.in \
 	LICENSES/preferred/GPL-2.0 \
+	LICENSES/stand-alone/GPL-3.0 \
 	tools/logger.pl \
 	tools/rlink_make_speed_table \
 	tools/st7_dtc_as \

commit 659e2e9da9a7d570827984cb3afdb2a44c3672e3
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Apr 25 17:19:28 2020 +0200

    LICENSES: move the GPL-2.0 license as required by checkpatch
    
    The script spdxcheck.py (used by checkpatch.pl) searches for the
    license files in a dedicated folder, split in the subfolders:
            "preferred", "dual", "deprecated", "exceptions".
    
    Move the GPL-2.0 license from COPYING to the subfolder preferred,
    adding the header required by spdxcheck.py.
    The header is copied from equivalent file in the Linux kernel,
    made by Thomas Gleixner <tg...@li...>.
    Note: the license in COPYING matches exactly
            https://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
    
    Add a minimalist COPYING in the top directory, as required by
    automake, pointing to the files in LICENSES.
    
    Change-Id: I1fd0abc57b554d74f0b00fabd6c8c822b2c4acb5
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5967
    Tested-by: jenkins

diff --git a/COPYING b/COPYING
index d159169d1..b95181f53 100644
--- a/COPYING
+++ b/COPYING
@@ -1,339 +1,10 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
+OpenOCD is provided under:
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+	SPDX-License-Identifier: GPL-2.0-or-later
 
-                            Preamble
+Being under the terms of the GNU General Public License version 2 or
+later, according with:
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
+	LICENSES/preferred/GPL-2.0
 
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+All contributions to OpenOCD are subject to this COPYING file.
diff --git a/COPYING b/LICENSES/preferred/GPL-2.0
similarity index 96%
copy from COPYING
copy to LICENSES/preferred/GPL-2.0
index d159169d1..2ca4651c3 100644
--- a/COPYING
+++ b/LICENSES/preferred/GPL-2.0
@@ -1,3 +1,19 @@
+Valid-License-Identifier: GPL-2.0
+Valid-License-Identifier: GPL-2.0-only
+Valid-License-Identifier: GPL-2.0-or-later
+SPDX-URL: https://spdx.org/licenses/GPL-2.0.html
+Usage-Guide:
+  To use this license in source code, put one of the following SPDX
+  tag/value pairs into a comment according to the placement
+  guidelines in the licensing rules documentation.
+  For 'GNU General Public License (GPL) version 2 only' use:
+    SPDX-License-Identifier: GPL-2.0
+  or
+    SPDX-License-Identifier: GPL-2.0-only
+  For 'GNU General Public License (GPL) version 2 or any later version' use:
+    SPDX-License-Identifier: GPL-2.0-or-later
+License-Text:
+
                     GNU GENERAL PUBLIC LICENSE
                        Version 2, June 1991
 
diff --git a/Makefile.am b/Makefile.am
index 85287c50f..cdd4ccb42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,6 +50,7 @@ EXTRA_DIST += \
 	README.macOS \
 	$(EXTRA_DIST_NEWS) \
 	Doxyfile.in \
+	LICENSES/preferred/GPL-2.0 \
 	tools/logger.pl \
 	tools/rlink_make_speed_table \
 	tools/st7_dtc_as \

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

Summary of changes:
 COPYING                               | 341 +----------------
 COPYING => LICENSES/preferred/GPL-2.0 |  16 +
 LICENSES/stand-alone/GPL-3.0          | 690 ++++++++++++++++++++++++++++++++++
 Makefile.am                           |   2 +
 4 files changed, 714 insertions(+), 335 deletions(-)
 copy COPYING => LICENSES/preferred/GPL-2.0 (96%)
 create mode 100644 LICENSES/stand-alone/GPL-3.0


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-71-g01030fb89

[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  01030fb893546ddd522a1557d8c00868b3e45f60 (commit)
      from  fed42ccfd3dff0c3dcfa7f017bbd26eff3d4f15c (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 01030fb893546ddd522a1557d8c00868b3e45f60
Author: Tomas Vanek <va...@fb...>
Date:   Tue Mar 23 09:12:26 2021 +0100

    drivers/cmsis-dap: tidy up buffer access
    
    Each one of CMSIS-DAP command handlers was responsible for setting
    HID report number, which in case of USB bulk transport was not used
    at all. The command had to be filled with 1 byte offset whereas
    the response was read without an offset.
    
    Introduce 'command' and 'response' pointers into struct cmsis_dap.
    Use them for filling the command and read the response respectively.
    CMSIS-DAP command parameter are now at positions as documented in
    https://arm-software.github.io/CMSIS_5/DAP/html/group__DAP__Commands__gr.html
    Adjust buffer allocation for HID and USB bulk transports.
    
    While on it, use h_u32_to_le() and h_u16_to_le() instead of per-byte
    writes.
    
    Change-Id: Ib0808d6826ba0e254c1007ace8b743405536332a
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reviewed-on: http://openocd.zylin.com/6120
    Reviewed-by: Adrian M Negreanu <adr...@nx...>
    Tested-by: jenkins
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>

diff --git a/src/jtag/drivers/cmsis_dap.c b/src/jtag/drivers/cmsis_dap.c
index 7a5acc314..eb973642c 100644
--- a/src/jtag/drivers/cmsis_dap.c
+++ b/src/jtag/drivers/cmsis_dap.c
@@ -307,17 +307,14 @@ static int cmsis_dap_xfer(struct cmsis_dap *dap, int txlen)
 static int cmsis_dap_cmd_DAP_SWJ_Pins(uint8_t pins, uint8_t mask, uint32_t delay, uint8_t *input)
 {
 	int retval;
-	uint8_t *buffer = cmsis_dap_handle->packet_buffer;
-
-	buffer[0] = 0;	/* report number */
-	buffer[1] = CMD_DAP_SWJ_PINS;
-	buffer[2] = pins;
-	buffer[3] = mask;
-	buffer[4] = delay & 0xff;
-	buffer[5] = (delay >> 8) & 0xff;
-	buffer[6] = (delay >> 16) & 0xff;
-	buffer[7] = (delay >> 24) & 0xff;
-	retval = cmsis_dap_xfer(cmsis_dap_handle, 8);
+	uint8_t *command = cmsis_dap_handle->command;
+
+	command[0] = CMD_DAP_SWJ_PINS;
+	command[1] = pins;
+	command[2] = mask;
+	h_u32_to_le(&command[3], delay);
+
+	retval = cmsis_dap_xfer(cmsis_dap_handle, 7);
 
 	if (retval != ERROR_OK) {
 		LOG_ERROR("CMSIS-DAP command CMD_DAP_SWJ_PINS failed.");
@@ -325,7 +322,7 @@ static int cmsis_dap_cmd_DAP_SWJ_Pins(uint8_t pins, uint8_t mask, uint32_t delay
 	}
 
 	if (input)
-		*input = buffer[1];
+		*input = cmsis_dap_handle->response[1];
 
 	return ERROR_OK;
 }
@@ -333,19 +330,17 @@ static int cmsis_dap_cmd_DAP_SWJ_Pins(uint8_t pins, uint8_t mask, uint32_t delay
 static int cmsis_dap_cmd_DAP_SWJ_Clock(uint32_t swj_clock)
 {
 	int retval;
-	uint8_t *buffer = cmsis_dap_handle->packet_buffer;
+	uint8_t *command = cmsis_dap_handle->command;
 
 	/* set clock in Hz */
 	swj_clock *= 1000;
-	buffer[0] = 0;	/* report number */
-	buffer[1] = CMD_DAP_SWJ_CLOCK;
-	buffer[2] = swj_clock & 0xff;
-	buffer[3] = (swj_clock >> 8) & 0xff;
-	buffer[4] = (swj_clock >> 16) & 0xff;
-	buffer[5] = (swj_clock >> 24) & 0xff;
-	retval = cmsis_dap_xfer(cmsis_dap_handle, 6);
 
-	if (retval != ERROR_OK || buffer[1] != DAP_OK) {
+	command[0] = CMD_DAP_SWJ_CLOCK;
+	h_u32_to_le(&command[1], swj_clock);
+
+	retval = cmsis_dap_xfer(cmsis_dap_handle, 5);
+
+	if (retval != ERROR_OK || cmsis_dap_handle->response[1] != DAP_OK) {
 		LOG_ERROR("CMSIS-DAP command CMD_DAP_SWJ_CLOCK failed.");
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
@@ -357,7 +352,7 @@ static int cmsis_dap_cmd_DAP_SWJ_Clock(uint32_t swj_clock)
 static int cmsis_dap_cmd_DAP_SWJ_Sequence(uint8_t s_len, const uint8_t *sequence)
 {
 	int retval;
-	uint8_t *buffer = cmsis_dap_handle->packet_buffer;
+	uint8_t *command = cmsis_dap_handle->command;
 
 #ifdef CMSIS_DAP_JTAG_DEBUG
 	LOG_DEBUG("cmsis-dap TMS sequence: len=%d", s_len);
@@ -367,14 +362,12 @@ static int cmsis_dap_cmd_DAP_SWJ_Sequence(uint8_t s_len, const uint8_t *sequence
 	printf("\n");
 #endif
 
-	buffer[0] = 0;	/* report number */
-	buffer[1] = CMD_DAP_SWJ_SEQ;
-	buffer[2] = s_len;
-	bit_copy(&buffer[3], 0, sequence, 0, s_len);
+	command[0] = CMD_DAP_SWJ_SEQ;
+	command[1] = s_len;
+	bit_copy(&command[2], 0, sequence, 0, s_len);
 
-	retval = cmsis_dap_xfer(cmsis_dap_handle, DIV_ROUND_UP(s_len, 8) + 3);
-
-	if (retval != ERROR_OK || buffer[1] != DAP_OK)
+	retval = cmsis_dap_xfer(cmsis_dap_handle, 2 + DIV_ROUND_UP(s_len, 8));
+	if (retval != ERROR_OK || cmsis_dap_handle->response[1] != DAP_OK)
 		return ERROR_FAIL;
 
 	return ERROR_OK;
@@ -383,19 +376,19 @@ static int cmsis_dap_cmd_DAP_SWJ_Sequence(uint8_t s_len, const uint8_t *sequence
 static int cmsis_dap_cmd_DAP_Info(uint8_t info, uint8_t **data)
 {
 	int retval;
-	uint8_t *buffer = cmsis_dap_handle->packet_buffer;
+	uint8_t *command = cmsis_dap_handle->command;
 
-	buffer[0] = 0;	/* report number */
-	buffer[1] = CMD_DAP_INFO;
-	buffer[2] = info;
-	retval = cmsis_dap_xfer(cmsis_dap_handle, 3);
+	command[0] = CMD_DAP_INFO;
+	command[1] = info;
+
+	retval = cmsis_dap_xfer(cmsis_dap_handle, 2);
 
 	if (retval != ERROR_OK) {
 		LOG_ERROR("CMSIS-DAP command CMD_INFO failed.");
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
 
-	*data = &(buffer[1]);
+	*data = &cmsis_dap_handle->response[1];
 
 	return ERROR_OK;
 }
@@ -403,15 +396,15 @@ static int cmsis_dap_cmd_DAP_Info(uint8_t info, uint8_t **data)
 static int cmsis_dap_cmd_DAP_LED(uint8_t led, uint8_t state)
 {
 	int retval;
-	uint8_t *buffer = cmsis_dap_handle->packet_buffer;
+	uint8_t *command = cmsis_dap_handle->command;
 
-	buffer[0] = 0;	/* report number */
-	buffer[1] = CMD_DAP_LED;
-	buffer[2] = led;
-	buffer[3] = state;
-	retval = cmsis_dap_xfer(cmsis_dap_handle, 4);
+	command[0] = CMD_DAP_LED;
+	command[1] = led;
+	command[2] = state;
+
+	retval = cmsis_dap_xfer(cmsis_dap_handle, 3);
 
-	if (retval != ERROR_OK || buffer[1] != 0x00) {
+	if (retval != ERROR_OK || cmsis_dap_handle->response[1] != DAP_OK) {
 		LOG_ERROR("CMSIS-DAP command CMD_LED failed.");
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
@@ -422,19 +415,19 @@ static int cmsis_dap_cmd_DAP_LED(uint8_t led, uint8_t state)
 static int cmsis_dap_cmd_DAP_Connect(uint8_t mode)
 {
 	int retval;
-	uint8_t *buffer = cmsis_dap_handle->packet_buffer;
+	uint8_t *command = cmsis_dap_handle->command;
 
-	buffer[0] = 0;	/* report number */
-	buffer[1] = CMD_DAP_CONNECT;
-	buffer[2] = mode;
-	retval = cmsis_dap_xfer(cmsis_dap_handle, 3);
+	command[0] = CMD_DAP_CONNECT;
+	command[1] = mode;
+
+	retval = cmsis_dap_xfer(cmsis_dap_handle, 2);
 
 	if (retval != ERROR_OK) {
 		LOG_ERROR("CMSIS-DAP command CMD_CONNECT failed.");
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
 
-	if (buffer[1] != mode) {
+	if (cmsis_dap_handle->response[1] != mode) {
 		LOG_ERROR("CMSIS-DAP failed to connect in mode (%d)", mode);
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
@@ -445,13 +438,13 @@ static int cmsis_dap_cmd_DAP_Connect(uint8_t mode)
 static int cmsis_dap_cmd_DAP_Disconnect(void)
 {
 	int retval;
-	uint8_t *buffer = cmsis_dap_handle->packet_buffer;
+	uint8_t *command = cmsis_dap_handle->command;
 
-	buffer[0] = 0;	/* report number */
-	buffer[1] = CMD_DAP_DISCONNECT;
-	retval = cmsis_dap_xfer(cmsis_dap_handle, 2);
+	command[0] = CMD_DAP_DISCONNECT;
+
+	retval = cmsis_dap_xfer(cmsis_dap_handle, 1);
 
-	if (retval != ERROR_OK || buffer[1] != DAP_OK) {
+	if (retval != ERROR_OK || cmsis_dap_handle->response[1] != DAP_OK) {
 		LOG_ERROR("CMSIS-DAP command CMD_DISCONNECT failed.");
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
@@ -462,18 +455,16 @@ static int cmsis_dap_cmd_DAP_Disconnect(void)
 static int cmsis_dap_cmd_DAP_TFER_Configure(uint8_t idle, uint16_t retry_count, uint16_t match_retry)
 {
 	int retval;
-	uint8_t *buffer = cmsis_dap_handle->packet_buffer;
-
-	buffer[0] = 0;	/* report number */
-	buffer[1] = CMD_DAP_TFER_CONFIGURE;
-	buffer[2] = idle;
-	buffer[3] = retry_count & 0xff;
-	buffer[4] = (retry_count >> 8) & 0xff;
-	buffer[5] = match_retry & 0xff;
-	buffer[6] = (match_retry >> 8) & 0xff;
-	retval = cmsis_dap_xfer(cmsis_dap_handle, 7);
+	uint8_t *command = cmsis_dap_handle->command;
+
+	command[0] = CMD_DAP_TFER_CONFIGURE;
+	command[1] = idle;
+	h_u16_to_le(&command[2], retry_count);
+	h_u16_to_le(&command[4], match_retry);
 
-	if (retval != ERROR_OK || buffer[1] != DAP_OK) {
+	retval = cmsis_dap_xfer(cmsis_dap_handle, 6);
+
+	if (retval != ERROR_OK || cmsis_dap_handle->response[1] != DAP_OK) {
 		LOG_ERROR("CMSIS-DAP command CMD_TFER_Configure failed.");
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
@@ -484,14 +475,14 @@ static int cmsis_dap_cmd_DAP_TFER_Configure(uint8_t idle, uint16_t retry_count,
 static int cmsis_dap_cmd_DAP_SWD_Configure(uint8_t cfg)
 {
 	int retval;
-	uint8_t *buffer = cmsis_dap_handle->packet_buffer;
+	uint8_t *command = cmsis_dap_handle->command;
 
-	buffer[0] = 0;	/* report number */
-	buffer[1] = CMD_DAP_SWD_CONFIGURE;
-	buffer[2] = cfg;
-	retval = cmsis_dap_xfer(cmsis_dap_handle, 3);
+	command[0] = CMD_DAP_SWD_CONFIGURE;
+	command[1] = cfg;
 
-	if (retval != ERROR_OK || buffer[1] != DAP_OK) {
+	retval = cmsis_dap_xfer(cmsis_dap_handle, 2);
+
+	if (retval != ERROR_OK || cmsis_dap_handle->response[1] != DAP_OK) {
 		LOG_ERROR("CMSIS-DAP command CMD_SWD_Configure failed.");
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
@@ -503,15 +494,14 @@ static int cmsis_dap_cmd_DAP_SWD_Configure(uint8_t cfg)
 static int cmsis_dap_cmd_DAP_Delay(uint16_t delay_us)
 {
 	int retval;
-	uint8_t *buffer = cmsis_dap_handle->packet_buffer;
+	uint8_t *command = cmsis_dap_handle->command;
+
+	command[0] = CMD_DAP_DELAY;
+	h_u16_to_le(&command[1], delay_us);
 
-	buffer[0] = 0;	/* report number */
-	buffer[1] = CMD_DAP_DELAY;
-	buffer[2] = delay_us & 0xff;
-	buffer[3] = (delay_us >> 8) & 0xff;
-	retval = cmsis_dap_xfer(cmsis_dap_handle, 4);
+	retval = cmsis_dap_xfer(cmsis_dap_handle, 3);
 
-	if (retval != ERROR_OK || buffer[1] != DAP_OK) {
+	if (retval != ERROR_OK || cmsis_dap_handle->response[1] != DAP_OK) {
 		LOG_ERROR("CMSIS-DAP command CMD_Delay failed.");
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
@@ -522,7 +512,7 @@ static int cmsis_dap_cmd_DAP_Delay(uint16_t delay_us)
 
 static void cmsis_dap_swd_write_from_queue(struct cmsis_dap *dap)
 {
-	uint8_t *buffer = dap->packet_buffer;
+	uint8_t *command = cmsis_dap_handle->command;
 	struct pending_request_block *block = &pending_fifo[pending_fifo_put_idx];
 
 	LOG_DEBUG_IO("Executing %d queued transactions from FIFO index %d", block->transfer_count, pending_fifo_put_idx);
@@ -535,11 +525,10 @@ static void cmsis_dap_swd_write_from_queue(struct cmsis_dap *dap)
 	if (block->transfer_count == 0)
 		goto skip;
 
-	size_t idx = 0;
-	buffer[idx++] = 0;	/* report number */
-	buffer[idx++] = CMD_DAP_TFER;
-	buffer[idx++] = 0x00;	/* DAP Index */
-	buffer[idx++] = block->transfer_count;
+	command[0] = CMD_DAP_TFER;
+	command[1] = 0x00;	/* DAP Index */
+	command[2] = block->transfer_count;
+	size_t idx = 3;
 
 	for (int i = 0; i < block->transfer_count; i++) {
 		struct pending_transfer_result *transfer = &(block->transfers[i]);
@@ -570,12 +559,10 @@ static void cmsis_dap_swd_write_from_queue(struct cmsis_dap *dap)
 			data &= ~CORUNDETECT;
 		}
 
-		buffer[idx++] = (cmd >> 1) & 0x0f;
+		command[idx++] = (cmd >> 1) & 0x0f;
 		if (!(cmd & SWD_CMD_RnW)) {
-			buffer[idx++] = (data) & 0xff;
-			buffer[idx++] = (data >> 8) & 0xff;
-			buffer[idx++] = (data >> 16) & 0xff;
-			buffer[idx++] = (data >> 24) & 0xff;
+			h_u32_to_le(&command[idx], data);
+			idx += 4;
 		}
 	}
 
@@ -601,7 +588,6 @@ skip:
 
 static void cmsis_dap_swd_read_process(struct cmsis_dap *dap, int timeout_ms)
 {
-	uint8_t *buffer = dap->packet_buffer;
 	struct pending_request_block *block = &pending_fifo[pending_fifo_get_idx];
 
 	if (pending_fifo_block_count == 0)
@@ -618,30 +604,33 @@ static void cmsis_dap_swd_read_process(struct cmsis_dap *dap, int timeout_ms)
 		goto skip;
 	}
 
-	if (buffer[2] & 0x08) {
-		LOG_DEBUG("CMSIS-DAP Protocol Error @ %d (wrong parity)", buffer[1]);
+	uint8_t *resp = dap->response;
+	uint8_t transfer_count = resp[1];
+	uint8_t ack = resp[2] & 0x07;
+	if (resp[2] & 0x08) {
+		LOG_DEBUG("CMSIS-DAP Protocol Error @ %d (wrong parity)", transfer_count);
 		queued_retval = ERROR_FAIL;
 		goto skip;
 	}
-	uint8_t ack = buffer[2] & 0x07;
 	if (ack != SWD_ACK_OK) {
-		LOG_DEBUG("SWD ack not OK @ %d %s", buffer[1],
+		LOG_DEBUG("SWD ack not OK @ %d %s", transfer_count,
 			  ack == SWD_ACK_WAIT ? "WAIT" : ack == SWD_ACK_FAULT ? "FAULT" : "JUNK");
 		queued_retval = ack == SWD_ACK_WAIT ? ERROR_WAIT : ERROR_FAIL;
 		goto skip;
 	}
 
-	if (block->transfer_count != buffer[1])
+	if (block->transfer_count != transfer_count)
 		LOG_ERROR("CMSIS-DAP transfer count mismatch: expected %d, got %d",
-			  block->transfer_count, buffer[1]);
+			  block->transfer_count, transfer_count);
 
-	LOG_DEBUG_IO("Received results of %d queued transactions FIFO index %d", buffer[1], pending_fifo_get_idx);
+	LOG_DEBUG_IO("Received results of %d queued transactions FIFO index %d",
+		 transfer_count, pending_fifo_get_idx);
 	size_t idx = 3;
-	for (int i = 0; i < buffer[1]; i++) {
+	for (int i = 0; i < transfer_count; i++) {
 		struct pending_transfer_result *transfer = &(block->transfers[i]);
 		if (transfer->cmd & SWD_CMD_RnW) {
 			static uint32_t last_read;
-			uint32_t data = le_to_h_u32(&buffer[idx]);
+			uint32_t data = le_to_h_u32(&resp[idx]);
 			uint32_t tmp = data;
 			idx += 4;
 
@@ -1145,20 +1134,21 @@ static void cmsis_dap_flush(void)
 	LOG_DEBUG_IO("Flushing %d queued sequences (%d bytes) with %d pending scan results to capture",
 		queued_seq_count, queued_seq_buf_end, pending_scan_result_count);
 
-	/* prep CMSIS-DAP packet */
-	uint8_t *buffer = cmsis_dap_handle->packet_buffer;
-	buffer[0] = 0;	/* report number */
-	buffer[1] = CMD_DAP_JTAG_SEQ;
-	buffer[2] = queued_seq_count;
-	memcpy(buffer + 3, queued_seq_buf, queued_seq_buf_end);
+	/* prepare CMSIS-DAP packet */
+	uint8_t *command = cmsis_dap_handle->command;
+	command[0] = CMD_DAP_JTAG_SEQ;
+	command[1] = queued_seq_count;
+	memcpy(&command[2], queued_seq_buf, queued_seq_buf_end);
 
 #ifdef CMSIS_DAP_JTAG_DEBUG
-	debug_parse_cmsis_buf(buffer, queued_seq_buf_end + 3);
+	debug_parse_cmsis_buf(command, queued_seq_buf_end + 2);
 #endif
 
 	/* send command to USB device */
-	int retval = cmsis_dap_xfer(cmsis_dap_handle, queued_seq_buf_end + 3);
-	if (retval != ERROR_OK || buffer[1] != DAP_OK) {
+	int retval = cmsis_dap_xfer(cmsis_dap_handle, queued_seq_buf_end + 2);
+
+	uint8_t *resp = cmsis_dap_handle->response;
+	if (retval != ERROR_OK || resp[1] != DAP_OK) {
 		LOG_ERROR("CMSIS-DAP command CMD_DAP_JTAG_SEQ failed.");
 		exit(-1);
 	}
@@ -1166,7 +1156,7 @@ static void cmsis_dap_flush(void)
 #ifdef CMSIS_DAP_JTAG_DEBUG
 	LOG_DEBUG_IO("USB response buf:");
 	for (int c = 0; c < queued_seq_buf_end + 3; ++c)
-		printf("%02X ", buffer[c]);
+		printf("%02X ", resp[c]);
 	printf("\n");
 #endif
 
@@ -1177,10 +1167,10 @@ static void cmsis_dap_flush(void)
 			i, pending_scan_result_count, scan->length, scan->first + 2, scan->buffer_offset);
 #ifdef CMSIS_DAP_JTAG_DEBUG
 		for (uint32_t b = 0; b < DIV_ROUND_UP(scan->length, 8); ++b)
-			printf("%02X ", buffer[2+scan->first+b]);
+			printf("%02X ", resp[2+scan->first+b]);
 		printf("\n");
 #endif
-		bit_copy(scan->buffer, scan->buffer_offset, buffer + 2 + scan->first, 0, scan->length);
+		bit_copy(scan->buffer, scan->buffer_offset, &resp[2 + scan->first], 0, scan->length);
 	}
 
 	/* reset */
@@ -1554,22 +1544,21 @@ COMMAND_HANDLER(cmsis_dap_handle_cmd_command)
 {
 	int retval;
 	unsigned i;
-	uint8_t *buffer = cmsis_dap_handle->packet_buffer;
-
-	buffer[0] = 0;	/* report number */
+	uint8_t *command = cmsis_dap_handle->command;
 
 	for (i = 0; i < CMD_ARGC; i++)
-		buffer[i + 1] = strtoul(CMD_ARGV[i], NULL, 16);
+		command[i] = strtoul(CMD_ARGV[i], NULL, 16);
 
-	retval = cmsis_dap_xfer(cmsis_dap_handle, CMD_ARGC + 1);
+	retval = cmsis_dap_xfer(cmsis_dap_handle, CMD_ARGC);
 
 	if (retval != ERROR_OK) {
 		LOG_ERROR("CMSIS-DAP command failed.");
 		return ERROR_JTAG_DEVICE_ERROR;
 	}
 
+	uint8_t *resp = cmsis_dap_handle->response;
 	LOG_INFO("Returned data %02" PRIx8 " %02" PRIx8 " %02" PRIx8 " %02" PRIx8,
-		buffer[1], buffer[2], buffer[3], buffer[4]);
+		resp[1], resp[2], resp[3], resp[4]);
 
 	return ERROR_OK;
 }
diff --git a/src/jtag/drivers/cmsis_dap.h b/src/jtag/drivers/cmsis_dap.h
index a096a95c0..c9f24c896 100644
--- a/src/jtag/drivers/cmsis_dap.h
+++ b/src/jtag/drivers/cmsis_dap.h
@@ -14,6 +14,8 @@ struct cmsis_dap {
 	int packet_count;
 	uint8_t *packet_buffer;
 	uint16_t packet_buffer_size;
+	uint8_t *command;
+	uint8_t *response;
 	uint8_t caps;
 	uint8_t mode;
 };
diff --git a/src/jtag/drivers/cmsis_dap_usb_bulk.c b/src/jtag/drivers/cmsis_dap_usb_bulk.c
index 7efea5166..c9ee53d2e 100644
--- a/src/jtag/drivers/cmsis_dap_usb_bulk.c
+++ b/src/jtag/drivers/cmsis_dap_usb_bulk.c
@@ -360,7 +360,7 @@ static int cmsis_dap_usb_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t p
 			}
 
 			dap->packet_size = packet_size;
-			dap->packet_buffer_size = packet_size + REPORT_ID_SIZE;
+			dap->packet_buffer_size = packet_size;
 			dap->bdata->usb_ctx = ctx;
 			dap->bdata->dev_handle = dev_handle;
 			dap->bdata->ep_out = ep_out;
@@ -374,6 +374,9 @@ static int cmsis_dap_usb_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t p
 				return ERROR_FAIL;
 			}
 
+			dap->command = dap->packet_buffer;
+			dap->response = dap->packet_buffer;
+
 			return ERROR_OK;
 		}
 
@@ -425,7 +428,7 @@ static int cmsis_dap_usb_write(struct cmsis_dap *dap, int txlen, int timeout_ms)
 
 	/* skip the first byte that is only used by the HID backend */
 	err = libusb_bulk_transfer(dap->bdata->dev_handle, dap->bdata->ep_out,
-							dap->packet_buffer + REPORT_ID_SIZE, txlen - REPORT_ID_SIZE, &transferred, timeout_ms);
+							dap->packet_buffer, txlen, &transferred, timeout_ms);
 	if (err) {
 		if (err == LIBUSB_ERROR_TIMEOUT) {
 			return ERROR_TIMEOUT_REACHED;
@@ -440,8 +443,7 @@ static int cmsis_dap_usb_write(struct cmsis_dap *dap, int txlen, int timeout_ms)
 
 static int cmsis_dap_usb_alloc(struct cmsis_dap *dap, unsigned int pkt_sz)
 {
-	unsigned int packet_buffer_size = pkt_sz + REPORT_ID_SIZE;
-	uint8_t *buf = malloc(packet_buffer_size);
+	uint8_t *buf = malloc(pkt_sz);
 	if (buf == NULL) {
 		LOG_ERROR("unable to allocate CMSIS-DAP packet buffer");
 		return ERROR_FAIL;
@@ -449,7 +451,10 @@ static int cmsis_dap_usb_alloc(struct cmsis_dap *dap, unsigned int pkt_sz)
 
 	dap->packet_buffer = buf;
 	dap->packet_size = pkt_sz;
-	dap->packet_buffer_size = packet_buffer_size;
+	dap->packet_buffer_size = pkt_sz;
+
+	dap->command = dap->packet_buffer;
+	dap->response = dap->packet_buffer;
 
 	return ERROR_OK;
 }
diff --git a/src/jtag/drivers/cmsis_dap_usb_hid.c b/src/jtag/drivers/cmsis_dap_usb_hid.c
index b290d6f81..e83ad1feb 100644
--- a/src/jtag/drivers/cmsis_dap_usb_hid.c
+++ b/src/jtag/drivers/cmsis_dap_usb_hid.c
@@ -164,6 +164,8 @@ static int cmsis_dap_hid_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t p
 		return ERROR_FAIL;
 	}
 
+	dap->command = dap->packet_buffer + REPORT_ID_SIZE;
+	dap->response = dap->packet_buffer;
 	return ERROR_OK;
 }
 
@@ -195,8 +197,10 @@ static int cmsis_dap_hid_write(struct cmsis_dap *dap, int txlen, int timeout_ms)
 {
 	(void) timeout_ms;
 
+	dap->packet_buffer[0] = 0; /* HID report number */
+
 	/* Pad the rest of the TX buffer with 0's */
-	memset(dap->packet_buffer + txlen, 0, dap->packet_buffer_size - txlen);
+	memset(dap->command + txlen, 0, dap->packet_size - txlen);
 
 	/* write data to device */
 	int retval = hid_write(dap->bdata->dev_handle, dap->packet_buffer, dap->packet_buffer_size);
@@ -221,6 +225,9 @@ static int cmsis_dap_hid_alloc(struct cmsis_dap *dap, unsigned int pkt_sz)
 	dap->packet_size = pkt_sz;
 	dap->packet_buffer_size = packet_buffer_size;
 
+	dap->command = dap->packet_buffer + REPORT_ID_SIZE;
+	dap->response = dap->packet_buffer;
+
 	return ERROR_OK;
 }
 

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

Summary of changes:
 src/jtag/drivers/cmsis_dap.c          | 221 ++++++++++++++++------------------
 src/jtag/drivers/cmsis_dap.h          |   2 +
 src/jtag/drivers/cmsis_dap_usb_bulk.c |  15 ++-
 src/jtag/drivers/cmsis_dap_usb_hid.c  |   9 +-
 4 files changed, 125 insertions(+), 122 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-70-gfed42ccfd

[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  fed42ccfd3dff0c3dcfa7f017bbd26eff3d4f15c (commit)
      from  68e50415a115f3b80b7d1a1b580287745b281a5c (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 fed42ccfd3dff0c3dcfa7f017bbd26eff3d4f15c
Author: Adrian Negreanu <adr...@nx...>
Date:   Fri Nov 6 11:57:04 2020 +0200

    cmsis-dap: don't update the packet size across backends.
    
    The hidapi cmsis-dap backend is using a packet_size of
    64+1: 64 is the bMaxPacketSize0 and 1 is the hid Report-Id.
    
    In hidapi::hid_write(), the packet_size is decremented by 1 and
    stored for the next transfer.
    The packet_size is now valid bMaxPacketSize0=64,
    so when hid_read() is called, libusb_bulk_transfer() finishes w/o timeout.
    
    For the libusb bulk backend, the same packet_size of 64+1 is used,
    but there's no hid_write() to decrement and store it for the next read.
    
    So the next time a read is done, it will try to read 64+1 bytes.
    
    Fix this by putting the packet logic within each backend.
    Use calloc() to allocate the struct cmsis_dap to be on safer side.
    
    Change-Id: I0c450adbc7674d5fcd8208dd23062d5cdd209efd
    Signed-off-by: Adrian Negreanu <adr...@nx...>
    Reviewed-on: http://openocd.zylin.com/5920
    Tested-by: jenkins
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/jtag/drivers/cmsis_dap.c b/src/jtag/drivers/cmsis_dap.c
index fd565398f..7a5acc314 100644
--- a/src/jtag/drivers/cmsis_dap.c
+++ b/src/jtag/drivers/cmsis_dap.c
@@ -225,16 +225,12 @@ static int cmsis_dap_open(void)
 {
 	const struct cmsis_dap_backend *backend = NULL;
 
-	struct cmsis_dap *dap = malloc(sizeof(struct cmsis_dap));
+	struct cmsis_dap *dap = calloc(1, sizeof(struct cmsis_dap));
 	if (dap == NULL) {
 		LOG_ERROR("unable to allocate memory");
 		return ERROR_FAIL;
 	}
 
-	dap->caps = 0;
-	dap->mode = 0;
-	dap->packet_size = 0; /* initialized by backend */
-
 	if (cmsis_dap_backend >= 0) {
 		/* Use forced backend */
 		backend = cmsis_dap_backends[cmsis_dap_backend];
@@ -257,17 +253,7 @@ static int cmsis_dap_open(void)
 		return ERROR_FAIL;
 	}
 
-	assert(dap->packet_size > 0);
-
 	dap->backend = backend;
-	dap->packet_buffer = malloc(dap->packet_size);
-
-	if (dap->packet_buffer == NULL) {
-		LOG_ERROR("unable to allocate memory");
-		dap->backend->close(dap);
-		free(dap);
-		return ERROR_FAIL;
-	}
 
 	cmsis_dap_handle = dap;
 
@@ -929,24 +915,20 @@ static int cmsis_dap_init(void)
 
 	if (data[0] == 2) {  /* short */
 		uint16_t pkt_sz = data[1] + (data[2] << 8);
+		if (pkt_sz != cmsis_dap_handle->packet_size) {
 
-		/* 4 bytes of command header + 5 bytes per register
-		 * write. For bulk read sequences just 4 bytes are
-		 * needed per transfer, so this is suboptimal. */
-		pending_queue_len = (pkt_sz - 4) / 5;
-
-		if (cmsis_dap_handle->packet_size != pkt_sz + 1) {
-			/* reallocate buffer */
-			cmsis_dap_handle->packet_size = pkt_sz + 1;
-			cmsis_dap_handle->packet_buffer = realloc(cmsis_dap_handle->packet_buffer,
-					cmsis_dap_handle->packet_size);
-			if (cmsis_dap_handle->packet_buffer == NULL) {
-				LOG_ERROR("unable to reallocate memory");
-				return ERROR_FAIL;
-			}
-		}
+			/* 4 bytes of command header + 5 bytes per register
+			 * write. For bulk read sequences just 4 bytes are
+			 * needed per transfer, so this is suboptimal. */
+			pending_queue_len = (pkt_sz - 4) / 5;
 
-		LOG_DEBUG("CMSIS-DAP: Packet Size = %" PRId16, pkt_sz);
+			free(cmsis_dap_handle->packet_buffer);
+			retval = cmsis_dap_handle->backend->packet_buffer_alloc(cmsis_dap_handle, pkt_sz);
+			if (retval != ERROR_OK)
+				return retval;
+
+			LOG_DEBUG("CMSIS-DAP: Packet Size = %" PRIu16, pkt_sz);
+		}
 	}
 
 	/* INFO_ID_PKT_CNT - byte */
diff --git a/src/jtag/drivers/cmsis_dap.h b/src/jtag/drivers/cmsis_dap.h
index 054621cd5..a096a95c0 100644
--- a/src/jtag/drivers/cmsis_dap.h
+++ b/src/jtag/drivers/cmsis_dap.h
@@ -13,6 +13,7 @@ struct cmsis_dap {
 	uint16_t packet_size;
 	int packet_count;
 	uint8_t *packet_buffer;
+	uint16_t packet_buffer_size;
 	uint8_t caps;
 	uint8_t mode;
 };
@@ -23,10 +24,13 @@ struct cmsis_dap_backend {
 	void (*close)(struct cmsis_dap *dap);
 	int (*read)(struct cmsis_dap *dap, int timeout_ms);
 	int (*write)(struct cmsis_dap *dap, int len, int timeout_ms);
+	int (*packet_buffer_alloc)(struct cmsis_dap *dap, unsigned int pkt_sz);
 };
 
 extern const struct cmsis_dap_backend cmsis_dap_hid_backend;
 extern const struct cmsis_dap_backend cmsis_dap_usb_backend;
 extern const struct command_registration cmsis_dap_usb_subcommand_handlers[];
 
+#define REPORT_ID_SIZE   1
+
 #endif
diff --git a/src/jtag/drivers/cmsis_dap_usb_bulk.c b/src/jtag/drivers/cmsis_dap_usb_bulk.c
index 0134c0376..7efea5166 100644
--- a/src/jtag/drivers/cmsis_dap_usb_bulk.c
+++ b/src/jtag/drivers/cmsis_dap_usb_bulk.c
@@ -50,6 +50,9 @@ struct cmsis_dap_backend_data {
 
 static int cmsis_dap_usb_interface = -1;
 
+static void cmsis_dap_usb_close(struct cmsis_dap *dap);
+static int cmsis_dap_usb_alloc(struct cmsis_dap *dap, unsigned int pkt_sz);
+
 static int cmsis_dap_usb_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t pids[], char *serial)
 {
 	int err;
@@ -356,12 +359,21 @@ static int cmsis_dap_usb_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t p
 				return ERROR_FAIL;
 			}
 
-			dap->packet_size = packet_size + 1; /* "+ 1" for compatibility with the HID backend */
+			dap->packet_size = packet_size;
+			dap->packet_buffer_size = packet_size + REPORT_ID_SIZE;
 			dap->bdata->usb_ctx = ctx;
 			dap->bdata->dev_handle = dev_handle;
 			dap->bdata->ep_out = ep_out;
 			dap->bdata->ep_in = ep_in;
 			dap->bdata->interface = interface_num;
+
+			dap->packet_buffer = malloc(dap->packet_buffer_size);
+			if (dap->packet_buffer == NULL) {
+				LOG_ERROR("unable to allocate memory");
+				cmsis_dap_usb_close(dap);
+				return ERROR_FAIL;
+			}
+
 			return ERROR_OK;
 		}
 
@@ -381,6 +393,8 @@ static void cmsis_dap_usb_close(struct cmsis_dap *dap)
 	libusb_exit(dap->bdata->usb_ctx);
 	free(dap->bdata);
 	dap->bdata = NULL;
+	free(dap->packet_buffer);
+	dap->packet_buffer = NULL;
 }
 
 static int cmsis_dap_usb_read(struct cmsis_dap *dap, int timeout_ms)
@@ -399,7 +413,7 @@ static int cmsis_dap_usb_read(struct cmsis_dap *dap, int timeout_ms)
 		}
 	}
 
-	memset(&dap->packet_buffer[transferred], 0, dap->packet_size - transferred);
+	memset(&dap->packet_buffer[transferred], 0, dap->packet_buffer_size - transferred);
 
 	return transferred;
 }
@@ -411,7 +425,7 @@ static int cmsis_dap_usb_write(struct cmsis_dap *dap, int txlen, int timeout_ms)
 
 	/* skip the first byte that is only used by the HID backend */
 	err = libusb_bulk_transfer(dap->bdata->dev_handle, dap->bdata->ep_out,
-							dap->packet_buffer + 1, txlen - 1, &transferred, timeout_ms);
+							dap->packet_buffer + REPORT_ID_SIZE, txlen - REPORT_ID_SIZE, &transferred, timeout_ms);
 	if (err) {
 		if (err == LIBUSB_ERROR_TIMEOUT) {
 			return ERROR_TIMEOUT_REACHED;
@@ -424,6 +438,22 @@ static int cmsis_dap_usb_write(struct cmsis_dap *dap, int txlen, int timeout_ms)
 	return transferred;
 }
 
+static int cmsis_dap_usb_alloc(struct cmsis_dap *dap, unsigned int pkt_sz)
+{
+	unsigned int packet_buffer_size = pkt_sz + REPORT_ID_SIZE;
+	uint8_t *buf = malloc(packet_buffer_size);
+	if (buf == NULL) {
+		LOG_ERROR("unable to allocate CMSIS-DAP packet buffer");
+		return ERROR_FAIL;
+	}
+
+	dap->packet_buffer = buf;
+	dap->packet_size = pkt_sz;
+	dap->packet_buffer_size = packet_buffer_size;
+
+	return ERROR_OK;
+}
+
 COMMAND_HANDLER(cmsis_dap_handle_usb_interface_command)
 {
 	if (CMD_ARGC == 1)
@@ -451,4 +481,5 @@ const struct cmsis_dap_backend cmsis_dap_usb_backend = {
 	.close = cmsis_dap_usb_close,
 	.read = cmsis_dap_usb_read,
 	.write = cmsis_dap_usb_write,
+	.packet_buffer_alloc = cmsis_dap_usb_alloc,
 };
diff --git a/src/jtag/drivers/cmsis_dap_usb_hid.c b/src/jtag/drivers/cmsis_dap_usb_hid.c
index 681aef171..b290d6f81 100644
--- a/src/jtag/drivers/cmsis_dap_usb_hid.c
+++ b/src/jtag/drivers/cmsis_dap_usb_hid.c
@@ -40,12 +40,13 @@
 
 #include "cmsis_dap.h"
 
-#define PACKET_SIZE       (64 + 1)	/* 64 bytes plus report id */
-
 struct cmsis_dap_backend_data {
 	hid_device *dev_handle;
 };
 
+static void cmsis_dap_hid_close(struct cmsis_dap *dap);
+static int cmsis_dap_hid_alloc(struct cmsis_dap *dap, unsigned int pkt_sz);
+
 static int cmsis_dap_hid_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t pids[], char *serial)
 {
 	hid_device *dev = NULL;
@@ -145,7 +146,7 @@ static int cmsis_dap_hid_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t p
 	 * without this info we cannot communicate with the adapter.
 	 * For the moment we have to hard code the packet size */
 
-	dap->packet_size = PACKET_SIZE;
+	unsigned int packet_size = 64;
 
 	/* atmel cmsis-dap uses 512 byte reports */
 	/* except when it doesn't e.g. with mEDBG on SAMD10 Xplained
@@ -153,10 +154,16 @@ static int cmsis_dap_hid_open(struct cmsis_dap *dap, uint16_t vids[], uint16_t p
 	/* TODO: HID report descriptor should be parsed instead of
 	 * hardcoding a match by VID */
 	if (target_vid == 0x03eb && target_pid != 0x2145 && target_pid != 0x2175)
-		dap->packet_size = 512 + 1;
+		packet_size = 512;
 
 	dap->bdata->dev_handle = dev;
 
+	int retval = cmsis_dap_hid_alloc(dap, packet_size);
+	if (retval != ERROR_OK) {
+		cmsis_dap_hid_close(dap);
+		return ERROR_FAIL;
+	}
+
 	return ERROR_OK;
 }
 
@@ -166,11 +173,13 @@ static void cmsis_dap_hid_close(struct cmsis_dap *dap)
 	hid_exit();
 	free(dap->bdata);
 	dap->bdata = NULL;
+	free(dap->packet_buffer);
+	dap->packet_buffer = NULL;
 }
 
 static int cmsis_dap_hid_read(struct cmsis_dap *dap, int timeout_ms)
 {
-	int retval = hid_read_timeout(dap->bdata->dev_handle, dap->packet_buffer, dap->packet_size, timeout_ms);
+	int retval = hid_read_timeout(dap->bdata->dev_handle, dap->packet_buffer, dap->packet_buffer_size, timeout_ms);
 
 	if (retval == 0) {
 		return ERROR_TIMEOUT_REACHED;
@@ -187,10 +196,10 @@ static int cmsis_dap_hid_write(struct cmsis_dap *dap, int txlen, int timeout_ms)
 	(void) timeout_ms;
 
 	/* Pad the rest of the TX buffer with 0's */
-	memset(dap->packet_buffer + txlen, 0, dap->packet_size - txlen);
+	memset(dap->packet_buffer + txlen, 0, dap->packet_buffer_size - txlen);
 
 	/* write data to device */
-	int retval = hid_write(dap->bdata->dev_handle, dap->packet_buffer, dap->packet_size);
+	int retval = hid_write(dap->bdata->dev_handle, dap->packet_buffer, dap->packet_buffer_size);
 	if (retval == -1) {
 		LOG_ERROR("error writing data: %ls", hid_error(dap->bdata->dev_handle));
 		return ERROR_FAIL;
@@ -199,10 +208,27 @@ static int cmsis_dap_hid_write(struct cmsis_dap *dap, int txlen, int timeout_ms)
 	return retval;
 }
 
+static int cmsis_dap_hid_alloc(struct cmsis_dap *dap, unsigned int pkt_sz)
+{
+	unsigned int packet_buffer_size = pkt_sz + REPORT_ID_SIZE;
+	uint8_t *buf = malloc(packet_buffer_size);
+	if (buf == NULL) {
+		LOG_ERROR("unable to allocate CMSIS-DAP packet buffer");
+		return ERROR_FAIL;
+	}
+
+	dap->packet_buffer = buf;
+	dap->packet_size = pkt_sz;
+	dap->packet_buffer_size = packet_buffer_size;
+
+	return ERROR_OK;
+}
+
 const struct cmsis_dap_backend cmsis_dap_hid_backend = {
 	.name = "hid",
 	.open = cmsis_dap_hid_open,
 	.close = cmsis_dap_hid_close,
 	.read = cmsis_dap_hid_read,
 	.write = cmsis_dap_hid_write,
+	.packet_buffer_alloc = cmsis_dap_hid_alloc,
 };

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

Summary of changes:
 src/jtag/drivers/cmsis_dap.c          | 44 +++++++++++------------------------
 src/jtag/drivers/cmsis_dap.h          |  4 ++++
 src/jtag/drivers/cmsis_dap_usb_bulk.c | 37 ++++++++++++++++++++++++++---
 src/jtag/drivers/cmsis_dap_usb_hid.c  | 40 +++++++++++++++++++++++++------
 4 files changed, 84 insertions(+), 41 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-69-g68e50415a

[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  68e50415a115f3b80b7d1a1b580287745b281a5c (commit)
       via  ef41652cafe093f21d30e3116029b023b40bbc50 (commit)
      from  5c53e2cd41ac9d35ba7a92a4b7b46e2e7c359f47 (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 68e50415a115f3b80b7d1a1b580287745b281a5c
Author: Antonio Borneo <bor...@gm...>
Date:   Tue Dec 29 22:07:41 2020 +0100

    openocd: drop dependency from libusb0
    
    Now that the old drivers have been converted to libusb1, there is
    no need to keep the build dependency from libusb0.
    
    Drop libusb0 from configure and makefiles, remove the libusb0
    helper and remove libusb0 and libusb-compat from the README files.
    
    Change-Id: Icc05be74ae5971ba6cbb67d39107c709a4d826e6
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5993
    Tested-by: jenkins

diff --git a/README b/README
index 1c5f19277..34dac0b1b 100644
--- a/README
+++ b/README
@@ -224,8 +224,7 @@ Additionally, for building from git:
 - automake >= 1.14
 - texinfo >= 5.0
 
-USB-based adapters depend on libusb-1.0 and some older drivers require
-libusb-0.1 or libusb-compat-0.1. A compatible implementation, such as
+USB-based adapters depend on libusb-1.0. A compatible implementation, such as
 FreeBSD's, additionally needs the corresponding .pc files.
 
 USB-Blaster, ASIX Presto and OpenJTAG interface adapter
diff --git a/README.Windows b/README.Windows
index 6c616f38a..7326a356c 100644
--- a/README.Windows
+++ b/README.Windows
@@ -40,10 +40,6 @@ WinUSB.sys to the composite parent instead of the specific
 interface. To do that one needs to activate an advanced option in the
 Zadig installer.
 
-For the old drivers that use libusb-0.1 API you might need to link
-against libusb-win32 headers and install the corresponding driver with
-Zadig.
-
 If you need to use the same adapter with other applications that may
 require another driver, a solution for Windows Vista and above is to
 activate the IgnoreHWSerNum registry setting for the USB device.
diff --git a/README.macOS b/README.macOS
index c532e67c6..91d5e9261 100644
--- a/README.macOS
+++ b/README.macOS
@@ -27,14 +27,14 @@ With Homebrew you can either run:
   brew install [--HEAD] openocd (where optional --HEAD asks brew to
                                  install the current git version)
     or
-  brew install libtool automake libusb [libusb-compat] [hidapi] [libftdi]
+  brew install libtool automake libusb [hidapi] [libftdi]
     (to install the needed dependencies and then proceed with the
      manual building procedure)
 
 
 For building with MacPorts you need to run:
   sudo port install libtool automake autoconf pkgconfig \
-    libusb [libusb-compat] [libftdi1]
+    libusb [libftdi1]
 
 You should also specify LDFLAGS and CPPFLAGS to allow configure to use
 MacPorts' libraries, so run configure like this:
diff --git a/configure.ac b/configure.ac
index 1a52ffb99..5c7dab570 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,9 +127,6 @@ m4_define([USB1_ADAPTERS],
 	[[usbprog], [USBProg JTAG Programmer], [USBPROG]],
 	[[aice], [Andes JTAG Programmer], [AICE]]])
 
-m4_define([USB0_ADAPTERS],
-	[])
-
 m4_define([HIDAPI_ADAPTERS],
 	[[[cmsis_dap], [CMSIS-DAP Compliant Debugger], [CMSIS_DAP_HID]],
 	[[nulink], [Nu-Link Programmer], [HLADAPTER_NULINK]]])
@@ -249,7 +246,6 @@ m4_define([AC_ARG_ADAPTERS], [
 
 AC_ARG_ADAPTERS([
   USB1_ADAPTERS,
-  USB0_ADAPTERS,
   HIDAPI_ADAPTERS,
   HIDAPI_USB1_ADAPTERS,
   LIBFTDI_ADAPTERS,
@@ -585,8 +581,6 @@ PKG_CHECK_MODULES([LIBUSB1], [libusb-1.0], [
 	AC_MSG_WARN([libusb-1.x not found, trying legacy libusb-0.1 as a fallback; consider installing libusb-1.x instead])
 ])
 
-PKG_CHECK_MODULES([LIBUSB0], [libusb], [use_libusb0=yes], [use_libusb0=no])
-
 AC_ARG_WITH([capstone],
 		AS_HELP_STRING([--with-capstone], [Use Capstone disassembly library (default=auto)])
 	, [
@@ -648,7 +642,6 @@ m4_define([PROCESS_ADAPTERS], [
 ])
 
 PROCESS_ADAPTERS([USB1_ADAPTERS], ["x$use_libusb1" = "xyes"], [libusb-1.x])
-PROCESS_ADAPTERS([USB0_ADAPTERS], ["x$use_libusb0" = "xyes"], [libusb-0.1])
 PROCESS_ADAPTERS([HIDAPI_ADAPTERS], ["x$use_hidapi" = "xyes"], [hidapi])
 PROCESS_ADAPTERS([HIDAPI_USB1_ADAPTERS], ["x$use_hidapi" = "xyes" -a "x$use_libusb1" = "xyes"], [hidapi and libusb-1.x])
 PROCESS_ADAPTERS([LIBFTDI_ADAPTERS], ["x$use_libftdi" = "xyes"], [libftdi])
@@ -705,7 +698,6 @@ AM_CONDITIONAL([REMOTE_BITBANG], [test "x$build_remote_bitbang" = "xyes"])
 AM_CONDITIONAL([BUSPIRATE], [test "x$build_buspirate" = "xyes"])
 AM_CONDITIONAL([SYSFSGPIO], [test "x$build_sysfsgpio" = "xyes"])
 AM_CONDITIONAL([XLNX_PCIE_XVC], [test "x$build_xlnx_pcie_xvc" = "xyes"])
-AM_CONDITIONAL([USE_LIBUSB0], [test "x$use_libusb0" = "xyes"])
 AM_CONDITIONAL([USE_LIBUSB1], [test "x$use_libusb1" = "xyes"])
 AM_CONDITIONAL([IS_CYGWIN], [test "x$is_cygwin" = "xyes"])
 AM_CONDITIONAL([IS_MINGW], [test "x$is_mingw" = "xyes"])
@@ -784,7 +776,7 @@ echo
 echo
 echo OpenOCD configuration summary
 echo --------------------------------------------------
-m4_foreach([adapter], [USB1_ADAPTERS, USB0_ADAPTERS,
+m4_foreach([adapter], [USB1_ADAPTERS,
 	HIDAPI_ADAPTERS, HIDAPI_USB1_ADAPTERS, LIBFTDI_ADAPTERS,
 	LIBFTDI_USB1_ADAPTERS,
 	LIBGPIOD_ADAPTERS,
diff --git a/src/jtag/aice/Makefile.am b/src/jtag/aice/Makefile.am
index 97e38258a..b6a7ba922 100644
--- a/src/jtag/aice/Makefile.am
+++ b/src/jtag/aice/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES += %D%/libocdaice.la
 
-%C%_libocdaice_la_CPPFLAGS = -I$(top_srcdir)/src/jtag/drivers $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS) $(LIBUSB0_CFLAGS)
+%C%_libocdaice_la_CPPFLAGS = -I$(top_srcdir)/src/jtag/drivers $(AM_CPPFLAGS) $(LIBUSB1_CFLAGS)
 %C%_libocdaice_la_SOURCES = \
 	%D%/aice_transport.c \
 	%D%/aice_interface.c \
diff --git a/src/jtag/drivers/Makefile.am b/src/jtag/drivers/Makefile.am
index f7a54b003..da60f366e 100644
--- a/src/jtag/drivers/Makefile.am
+++ b/src/jtag/drivers/Makefile.am
@@ -27,12 +27,6 @@ DRIVERFILES += %D%/libusb_helper.c
 %C%_libocdjtagdrivers_la_LIBADD += $(LIBUSB1_LIBS)
 endif
 
-if USE_LIBUSB0
-DRIVERFILES += %D%/usb_common.c
-%C%_libocdjtagdrivers_la_CPPFLAGS += $(LIBUSB0_CFLAGS)
-%C%_libocdjtagdrivers_la_LIBADD += $(LIBUSB0_LIBS)
-endif
-
 if USE_LIBFTDI
 %C%_libocdjtagdrivers_la_CPPFLAGS += $(LIBFTDI_CFLAGS)
 %C%_libocdjtagdrivers_la_LIBADD += $(LIBFTDI_LIBS)
@@ -203,7 +197,6 @@ DRIVERHEADERS = \
 	%D%/rlink_dtc_cmd.h \
 	%D%/rlink_ep1_cmd.h \
 	%D%/rlink_st7.h \
-	%D%/usb_common.h \
 	%D%/versaloon/usbtoxxx/usbtoxxx.h \
 	%D%/versaloon/usbtoxxx/usbtoxxx_internal.h \
 	%D%/versaloon/versaloon.h \
diff --git a/src/jtag/drivers/usb_common.c b/src/jtag/drivers/usb_common.c
deleted file mode 100644
index 1b7602d19..000000000
--- a/src/jtag/drivers/usb_common.c
+++ /dev/null
@@ -1,57 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2009 by Zachary T Welch <zw...@su...>          *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-#include "usb_common.h"
-#include "log.h"
-
-
-static bool jtag_usb_match(struct usb_device *dev,
-		const uint16_t vids[], const uint16_t pids[])
-{
-	for (unsigned i = 0; vids[i] && pids[i]; i++) {
-		if (dev->descriptor.idVendor == vids[i] &&
-			dev->descriptor.idProduct == pids[i])
-			return true;
-	}
-	return false;
-}
-
-int jtag_usb_open(const uint16_t vids[], const uint16_t pids[],
-		struct usb_dev_handle **out)
-{
-	usb_find_busses();
-	usb_find_devices();
-
-	struct usb_bus *busses = usb_get_busses();
-	for (struct usb_bus *bus = busses; bus; bus = bus->next) {
-		for (struct usb_device *dev = bus->devices; dev; dev = dev->next) {
-			if (!jtag_usb_match(dev, vids, pids))
-				continue;
-
-			*out = usb_open(dev);
-			if (NULL == *out) {
-				LOG_ERROR("usb_open() failed with %s", usb_strerror());
-				return ERROR_FAIL;
-			}
-			return ERROR_OK;
-		}
-	}
-	return ERROR_FAIL;
-}
diff --git a/src/jtag/drivers/usb_common.h b/src/jtag/drivers/usb_common.h
deleted file mode 100644
index 4d2bd2686..000000000
--- a/src/jtag/drivers/usb_common.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2009 by Zachary T Welch <zw...@su...>          *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef OPENOCD_JTAG_DRIVERS_USB_COMMON_H
-#define OPENOCD_JTAG_DRIVERS_USB_COMMON_H
-
-#include <usb.h>
-
-int jtag_usb_open(const uint16_t vids[], const uint16_t pids[],
-		struct usb_dev_handle **out);
-
-#endif /* OPENOCD_JTAG_DRIVERS_USB_COMMON_H */

commit ef41652cafe093f21d30e3116029b023b40bbc50
Author: Antonio Borneo <bor...@gm...>
Date:   Mon Dec 28 23:51:32 2020 +0100

    drivers/arm-jtag-ew: switch to libusb1
    
    Convert the driver from libusb0 to libusb1.
    
    Change-Id: Idef0b6cf10fab583bc8d13b3b4fadd5cc368c090
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5990
    Tested-by: jenkins

diff --git a/configure.ac b/configure.ac
index 800ced5e9..1a52ffb99 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,12 +122,13 @@ m4_define([USB1_ADAPTERS],
 	[[cmsis_dap_v2], [CMSIS-DAP v2 Compliant Debugger], [CMSIS_DAP_USB]],
 	[[osbdm], [OSBDM (JTAG only) Programmer], [OSBDM]],
 	[[opendous], [eStick/opendous JTAG Programmer], [OPENDOUS]],
+	[[armjtagew], [Olimex ARM-JTAG-EW Programmer], [ARMJTAGEW]],
 	[[rlink], [Raisonance RLink JTAG Programmer], [RLINK]],
 	[[usbprog], [USBProg JTAG Programmer], [USBPROG]],
 	[[aice], [Andes JTAG Programmer], [AICE]]])
 
 m4_define([USB0_ADAPTERS],
-	[[[armjtagew], [Olimex ARM-JTAG-EW Programmer], [ARMJTAGEW]]])
+	[])
 
 m4_define([HIDAPI_ADAPTERS],
 	[[[cmsis_dap], [CMSIS-DAP Compliant Debugger], [CMSIS_DAP_HID]],
diff --git a/src/jtag/drivers/arm-jtag-ew.c b/src/jtag/drivers/arm-jtag-ew.c
index 40d52acb9..d7afbe24d 100644
--- a/src/jtag/drivers/arm-jtag-ew.c
+++ b/src/jtag/drivers/arm-jtag-ew.c
@@ -22,8 +22,7 @@
 
 #include <jtag/interface.h>
 #include <jtag/commands.h>
-#include <usb.h>
-#include "usb_common.h"
+#include "libusb_helper.h"
 
 #define USB_VID						0x15ba
 #define USB_PID						0x001e
@@ -75,7 +74,7 @@ static void armjtagew_tap_append_scan(int length, uint8_t *buffer, struct scan_c
 
 /* ARM-JTAG-EW lowlevel functions */
 struct armjtagew {
-	struct usb_dev_handle *usb_handle;
+	struct libusb_device_handle *usb_handle;
 };
 
 static struct armjtagew *armjtagew_usb_open(void);
@@ -684,35 +683,37 @@ static int armjtagew_tap_execute(void)
 
 static struct armjtagew *armjtagew_usb_open(void)
 {
-	usb_init();
-
 	const uint16_t vids[] = { USB_VID, 0 };
 	const uint16_t pids[] = { USB_PID, 0 };
-	struct usb_dev_handle *dev;
-	if (jtag_usb_open(vids, pids, &dev) != ERROR_OK)
+	struct libusb_device_handle *dev;
+
+	if (jtag_libusb_open(vids, pids, NULL, &dev, NULL) != ERROR_OK)
 		return NULL;
 
 	struct armjtagew *result = malloc(sizeof(struct armjtagew));
 	result->usb_handle = dev;
 
 #if 0
-	/* usb_set_configuration required under win32 */
-	usb_set_configuration(dev, dev->config[0].bConfigurationValue);
+	/* libusb_set_configuration required under win32 */
+	struct libusb_config_descriptor *config;
+	struct libusb_device *usb_dev = libusb_get_device(dev);
+	libusb_get_config_descriptor(usb_dev, 0, &config);
+	libusb_set_configuration(dev, config->bConfigurationValue);
 #endif
-	usb_claim_interface(dev, 0);
+	libusb_claim_interface(dev, 0);
 #if 0
 	/*
 	 * This makes problems under Mac OS X. And is not needed
 	 * under Windows. Hopefully this will not break a linux build
 	 */
-	usb_set_altinterface(dev, 0);
+	libusb_set_interface_alt_setting(dev, 0, 0);
 #endif
 	return result;
 }
 
 static void armjtagew_usb_close(struct armjtagew *armjtagew)
 {
-	usb_close(armjtagew->usb_handle);
+	libusb_close(armjtagew->usb_handle);
 	free(armjtagew);
 }
 
@@ -725,13 +726,13 @@ static int armjtagew_usb_message(struct armjtagew *armjtagew, int out_length, in
 	if (result == out_length) {
 		result = armjtagew_usb_read(armjtagew, in_length);
 		if (result != in_length) {
-			LOG_ERROR("usb_bulk_read failed (requested=%d, result=%d)",
+			LOG_ERROR("jtag_libusb_bulk_read failed (requested=%d, result=%d)",
 				in_length,
 				result);
 			return -1;
 		}
 	} else {
-		LOG_ERROR("usb_bulk_write failed (requested=%d, result=%d)", out_length, result);
+		LOG_ERROR("jtag_libusb_bulk_write failed (requested=%d, result=%d)", out_length, result);
 		return -1;
 	}
 	return 0;
@@ -741,6 +742,7 @@ static int armjtagew_usb_message(struct armjtagew *armjtagew, int out_length, in
 static int armjtagew_usb_write(struct armjtagew *armjtagew, int out_length)
 {
 	int result;
+	int transferred;
 
 	if (out_length > ARMJTAGEW_OUT_BUFFER_SIZE) {
 		LOG_ERROR("armjtagew_write illegal out_length=%d (max=%d)",
@@ -749,29 +751,34 @@ static int armjtagew_usb_write(struct armjtagew *armjtagew, int out_length)
 		return -1;
 	}
 
-	result = usb_bulk_write(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_OUT,
-			(char *)usb_out_buffer, out_length, ARMJTAGEW_USB_TIMEOUT);
+	result = jtag_libusb_bulk_write(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_OUT,
+			(char *)usb_out_buffer, out_length, ARMJTAGEW_USB_TIMEOUT, &transferred);
 
 	LOG_DEBUG_IO("armjtagew_usb_write, out_length = %d, result = %d", out_length, result);
 
 #ifdef _DEBUG_USB_COMMS_
 	armjtagew_debug_buffer(usb_out_buffer, out_length);
 #endif
-	return result;
+	if (result != ERROR_OK)
+		return -1;
+	return transferred;
 }
 
 /* Read data from USB into in_buffer. */
 static int armjtagew_usb_read(struct armjtagew *armjtagew, int exp_in_length)
 {
-	int result = usb_bulk_read(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_IN,
-			(char *)usb_in_buffer, exp_in_length, ARMJTAGEW_USB_TIMEOUT);
+	int transferred;
+	int result = jtag_libusb_bulk_read(armjtagew->usb_handle, ARMJTAGEW_EPT_BULK_IN,
+			(char *)usb_in_buffer, exp_in_length, ARMJTAGEW_USB_TIMEOUT, &transferred);
 
 	LOG_DEBUG_IO("armjtagew_usb_read, result = %d", result);
 
 #ifdef _DEBUG_USB_COMMS_
 	armjtagew_debug_buffer(usb_in_buffer, result);
 #endif
-	return result;
+	if (result != ERROR_OK)
+		return -1;
+	return transferred;
 }
 
 #ifdef _DEBUG_USB_COMMS_

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

Summary of changes:
 README                         |  3 +--
 README.Windows                 |  4 ---
 README.macOS                   |  4 +--
 configure.ac                   | 11 ++------
 src/jtag/aice/Makefile.am      |  2 +-
 src/jtag/drivers/Makefile.am   |  7 ------
 src/jtag/drivers/arm-jtag-ew.c | 47 +++++++++++++++++++---------------
 src/jtag/drivers/usb_common.c  | 57 ------------------------------------------
 src/jtag/drivers/usb_common.h  | 26 -------------------
 9 files changed, 33 insertions(+), 128 deletions(-)
 delete mode 100644 src/jtag/drivers/usb_common.c
 delete mode 100644 src/jtag/drivers/usb_common.h


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-67-g5c53e2cd4

[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  5c53e2cd41ac9d35ba7a92a4b7b46e2e7c359f47 (commit)
       via  bc7d36d886ab547a344866bdd13ffd60d460752c (commit)
       via  5df84889021a6972a1678896ccf085219ffd908a (commit)
       via  36ae487ed04b0e072ff68c70a6775ec6aa6c1725 (commit)
      from  a5b5907506b3ce782662dc413b1e20ae0d43e346 (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 5c53e2cd41ac9d35ba7a92a4b7b46e2e7c359f47
Author: Antonio Borneo <bor...@gm...>
Date:   Tue Dec 29 21:52:56 2020 +0100

    drivers/usbprog: switch to libusb1
    
    Convert the driver from libusb0 to libusb1.
    
    Change-Id: I3f334f2d02515d612097955e714910a587169990
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/5992
    Tested-by: jenkins

diff --git a/configure.ac b/configure.ac
index 269452bb6..800ced5e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -123,11 +123,11 @@ m4_define([USB1_ADAPTERS],
 	[[osbdm], [OSBDM (JTAG only) Programmer], [OSBDM]],
 	[[opendous], [eStick/opendous JTAG Programmer], [OPENDOUS]],
 	[[rlink], [Raisonance RLink JTAG Programmer], [RLINK]],
+	[[usbprog], [USBProg JTAG Programmer], [USBPROG]],
 	[[aice], [Andes JTAG Programmer], [AICE]]])
 
 m4_define([USB0_ADAPTERS],
-	[[[usbprog], [USBProg JTAG Programmer], [USBPROG]],
-	[[armjtagew], [Olimex ARM-JTAG-EW Programmer], [ARMJTAGEW]]])
+	[[[armjtagew], [Olimex ARM-JTAG-EW Programmer], [ARMJTAGEW]]])
 
 m4_define([HIDAPI_ADAPTERS],
 	[[[cmsis_dap], [CMSIS-DAP Compliant Debugger], [CMSIS_DAP_HID]],
diff --git a/src/jtag/drivers/usbprog.c b/src/jtag/drivers/usbprog.c
index 627e4653d..44db61ec0 100644
--- a/src/jtag/drivers/usbprog.c
+++ b/src/jtag/drivers/usbprog.c
@@ -34,7 +34,7 @@
 
 #include <jtag/interface.h>
 #include <jtag/commands.h>
-#include "usb_common.h"
+#include "libusb_helper.h"
 
 #define VID 0x1781
 #define PID 0x0c63
@@ -64,7 +64,7 @@ static void usbprog_scan(bool ir_scan, enum scan_type type, uint8_t *buffer, int
 #define WRITE_TMS_CHAIN 0x0A
 
 struct usbprog_jtag {
-	struct usb_dev_handle *usb_handle;
+	struct libusb_device_handle *usb_handle;
 };
 
 static struct usbprog_jtag *usbprog_jtag_handle;
@@ -350,21 +350,19 @@ struct usb_bus *busses;
 
 struct usbprog_jtag *usbprog_jtag_open(void)
 {
-	usb_set_debug(10);
-	usb_init();
-
 	const uint16_t vids[] = { VID, 0 };
 	const uint16_t pids[] = { PID, 0 };
-	struct usb_dev_handle *dev;
-	if (jtag_usb_open(vids, pids, &dev) != ERROR_OK)
+	struct libusb_device_handle *dev;
+
+	if (jtag_libusb_open(vids, pids, NULL, &dev, NULL) != ERROR_OK)
 		return NULL;
 
 	struct usbprog_jtag *tmp = malloc(sizeof(struct usbprog_jtag));
 	tmp->usb_handle = dev;
 
-	usb_set_configuration(dev, 1);
-	usb_claim_interface(dev, 0);
-	usb_set_altinterface(dev, 0);
+	libusb_set_configuration(dev, 1);
+	libusb_claim_interface(dev, 0);
+	libusb_set_interface_alt_setting(dev, 0, 0);
 
 	return tmp;
 }
@@ -372,21 +370,23 @@ struct usbprog_jtag *usbprog_jtag_open(void)
 #if 0
 static void usbprog_jtag_close(struct usbprog_jtag *usbprog_jtag)
 {
-	usb_close(usbprog_jtag->usb_handle);
+	libusb_close(usbprog_jtag->usb_handle);
 	free(usbprog_jtag);
 }
 #endif
 
 static unsigned char usbprog_jtag_message(struct usbprog_jtag *usbprog_jtag, char *msg, int msglen)
 {
-	int res = usb_bulk_write(usbprog_jtag->usb_handle, 3, msg, msglen, 100);
+	int transferred;
+
+	int res = jtag_libusb_bulk_write(usbprog_jtag->usb_handle, 3, msg, msglen, 100, &transferred);
 	if ((msg[0] == 2) || (msg[0] == 1) || (msg[0] == 4) || (msg[0] == 0) ||
 	    (msg[0] == 6) || (msg[0] == 0x0A) || (msg[0] == 9))
 		return 1;
-	if (res == msglen) {
+	if (res == ERROR_OK && transferred == msglen) {
 		/* LOG_INFO("HALLLLOOO %i",(int)msg[0]); */
-		res = usb_bulk_read(usbprog_jtag->usb_handle, 0x82, msg, 2, 100);
-		if (res > 0)
+		res = jtag_libusb_bulk_read(usbprog_jtag->usb_handle, 0x82, msg, 2, 100, &transferred);
+		if (res == ERROR_OK && transferred > 0)
 			return (unsigned char)msg[1];
 		else
 			return -1;
@@ -428,11 +428,13 @@ static void usbprog_jtag_write_and_read(struct usbprog_jtag *usbprog_jtag, char
 			bufindex++;
 		}
 
-		if (usb_bulk_write(usbprog_jtag->usb_handle, 3, tmp, 64, 1000) == 64) {
+		int transferred;
+		int res = jtag_libusb_bulk_write(usbprog_jtag->usb_handle, 3, tmp, 64, 1000, &transferred);
+		if (res == ERROR_OK && transferred == 64) {
 			/* LOG_INFO("HALLLLOOO2 %i",(int)tmp[0]); */
 			usleep(1);
 			int timeout = 0;
-			while (usb_bulk_read(usbprog_jtag->usb_handle, 0x82, tmp, 64, 1000) < 1) {
+			while (jtag_libusb_bulk_read(usbprog_jtag->usb_handle, 0x82, tmp, 64, 1000, &transferred) != ERROR_OK) {
 				timeout++;
 				if (timeout > 10)
 					break;
@@ -469,12 +471,13 @@ static void usbprog_jtag_read_tdo(struct usbprog_jtag *usbprog_jtag, char *buffe
 		tmp[1] = (char)(send_bits >> 8);	/* high */
 		tmp[2] = (char)(send_bits);			/* low */
 
-		usb_bulk_write(usbprog_jtag->usb_handle, 3, tmp, 3, 1000);
+		int transferred;
+		jtag_libusb_bulk_write(usbprog_jtag->usb_handle, 3, tmp, 3, 1000, &transferred);
 
 		/* LOG_INFO("HALLLLOOO3 %i",(int)tmp[0]); */
 		int timeout = 0;
 		usleep(1);
-		while (usb_bulk_read(usbprog_jtag->usb_handle, 0x82, tmp, 64, 10) < 1) {
+		while (jtag_libusb_bulk_read(usbprog_jtag->usb_handle, 0x82, tmp, 64, 10, &transferred) != ERROR_OK) {
 			timeout++;
 			if (timeout > 10)
 				break;
@@ -513,7 +516,8 @@ static void usbprog_jtag_write_tdi(struct usbprog_jtag *usbprog_jtag, char *buff
 			tmp[3 + i] = buffer[bufindex];
 			bufindex++;
 		}
-		usb_bulk_write(usbprog_jtag->usb_handle, 3, tmp, 64, 1000);
+		int transferred;
+		jtag_libusb_bulk_write(usbprog_jtag->usb_handle, 3, tmp, 64, 1000, &transferred);
 	}
 }
 
@@ -582,15 +586,15 @@ static void usbprog_jtag_tms_collect(char tms_scan)
 
 static void usbprog_jtag_tms_send(struct usbprog_jtag *usbprog_jtag)
 {
-	int i;
 	/* LOG_INFO("TMS SEND"); */
 	if (tms_chain_index > 0) {
 		char tmp[tms_chain_index + 2];
 		tmp[0] = WRITE_TMS_CHAIN;
 		tmp[1] = (char)(tms_chain_index);
-		for (i = 0; i < tms_chain_index + 1; i++)
+		for (int i = 0; i < tms_chain_index + 1; i++)
 			tmp[2 + i] = tms_chain[i];
-		usb_bulk_write(usbprog_jtag->usb_handle, 3, tmp, tms_chain_index + 2, 1000);
+		int transferred;
+		jtag_libusb_bulk_write(usbprog_jtag->usb_handle, 3, tmp, tms_chain_index + 2, 1000, &transferred);
 		tms_chain_index = 0;
 	}
 }

commit bc7d36d886ab547a344866bdd13ffd60d460752c
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Mar 7 23:49:30 2021 +0100

    udev rules: add missing Altera USB Blaster devices
    
    All Altera USB Blaster devices require a dedicated line in the
    udev rules, but some USB VID/PID present in interface and board
    config file is missing in udev rules.
    
    Add the missing Altera USB Blaster devices in udev rules.
    While there, fix an incorrect pair VID/PID that are reported
    swapped inside a comment.
    
    Change-Id: I2d67e90b10db99ef2638405585859c1393456f65
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6102
    Tested-by: jenkins

diff --git a/contrib/60-openocd.rules b/contrib/60-openocd.rules
index 73a81803e..a3046be8f 100644
--- a/contrib/60-openocd.rules
+++ b/contrib/60-openocd.rules
@@ -121,6 +121,9 @@ ATTRS{idVendor}=="0640", ATTRS{idProduct}=="0032", MODE="660", GROUP="plugdev",
 
 # Altera USB Blaster
 ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6001", MODE="660", GROUP="plugdev", TAG+="uaccess"
+# Altera USB Blaster2
+ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6010", MODE="660", GROUP="plugdev", TAG+="uaccess"
+ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6810", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
 # Amontec JTAGkey-HiSpeed
 ATTRS{idVendor}=="0fbb", ATTRS{idProduct}=="1000", MODE="660", GROUP="plugdev", TAG+="uaccess"
@@ -166,6 +169,9 @@ ATTRS{idVendor}=="15ba", ATTRS{idProduct}=="002a", MODE="660", GROUP="plugdev",
 # Olimex ARM-USB-OCD-H
 ATTRS{idVendor}=="15ba", ATTRS{idProduct}=="002b", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
+# ixo-usb-jtag - Emulation of a Altera Bus Blaster I on a Cypress FX2 IC
+ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="06ad", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
 # USBprog with OpenOCD firmware
 ATTRS{idVendor}=="1781", ATTRS{idProduct}=="0c63", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
diff --git a/tcl/board/altera_sockit.cfg b/tcl/board/altera_sockit.cfg
index eb4c863fa..b7c7993fe 100644
--- a/tcl/board/altera_sockit.cfg
+++ b/tcl/board/altera_sockit.cfg
@@ -12,7 +12,7 @@ adapter driver usb_blaster
 source [find target/altera_fpgasoc.cfg]
 
 # If the USB Blaster II were supported, these settings would be needed
-#usb_blaster_vid_pid 0x6810 0x09fb
+#usb_blaster_vid_pid 0x09fb 0x6810
 #usb_blaster_device_desc "USB-Blaster II"
 
 adapter speed 100

commit 5df84889021a6972a1678896ccf085219ffd908a
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Mar 7 23:19:07 2021 +0100

    udev rules: add missing ftdi USB VID/PID
    
    All ftdi devices require a dedicated line in the udev rules, but
    some USB VID/PID present in interface and board config file is
    missing in udev rules.
    
    Add the missing ftdi devices in udev rules.
    
    Change-Id: I850a4a95a2d4bb63b3fd09be803be8c23c4d6b49
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6101
    Tested-by: jenkins

diff --git a/contrib/60-openocd.rules b/contrib/60-openocd.rules
index 0358b6010..73a81803e 100644
--- a/contrib/60-openocd.rules
+++ b/contrib/60-openocd.rules
@@ -32,8 +32,19 @@ ATTRS{idVendor}=="0403", ATTRS{idProduct}=="8220", MODE="660", GROUP="plugdev",
 ATTRS{idVendor}=="0403", ATTRS{idProduct}=="8a98", MODE="660", GROUP="plugdev", TAG+="uaccess"
 ATTRS{idVendor}=="0403", ATTRS{idProduct}=="8a99", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
+# Marvell OpenRD JTAGKey FT2232D B
+ATTRS{idVendor}=="0403", ATTRS{idProduct}=="9e90", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
 # XDS100v2
 ATTRS{idVendor}=="0403", ATTRS{idProduct}=="a6d0", MODE="660", GROUP="plugdev", TAG+="uaccess"
+# XDS100v3
+ATTRS{idVendor}=="0403", ATTRS{idProduct}=="a6d1", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
+# OOCDLink
+ATTRS{idVendor}=="0403", ATTRS{idProduct}=="baf8", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
+# Kristech KT-Link
+ATTRS{idVendor}=="0403", ATTRS{idProduct}=="bbe2", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
 # Xverve Signalyzer Tool (DT-USB-ST), Signalyzer LITE (DT-USB-SLITE)
 ATTRS{idVendor}=="0403", ATTRS{idProduct}=="bca0", MODE="660", GROUP="plugdev", TAG+="uaccess"
@@ -93,6 +104,9 @@ ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="f138", MODE="660", GROUP="plugdev",
 # Infineon DAP miniWiggler v3
 ATTRS{idVendor}=="058b", ATTRS{idProduct}=="0043", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
+# Hitex LPC1768-Stick
+ATTRS{idVendor}=="0640", ATTRS{idProduct}=="0026", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
 # Hilscher NXHX Boards
 ATTRS{idVendor}=="0640", ATTRS{idProduct}=="0028", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
@@ -102,6 +116,9 @@ ATTRS{idVendor}=="0640", ATTRS{idProduct}=="002c", MODE="660", GROUP="plugdev",
 # Hitex STM32-PerformanceStick
 ATTRS{idVendor}=="0640", ATTRS{idProduct}=="002d", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
+# Hitex Cortino
+ATTRS{idVendor}=="0640", ATTRS{idProduct}=="0032", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
 # Altera USB Blaster
 ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6001", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
@@ -163,9 +180,15 @@ ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="02a5", MODE="660", GROUP="plugdev",
 # TI Tiva-based ICDI and XDS110 probes in DFU mode
 ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="00ff", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
+# isodebug v1
+ATTRS{idVendor}=="22b7", ATTRS{idProduct}=="150d", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
 # PLS USB/JTAG Adapter for SPC5xxx
 ATTRS{idVendor}=="263d", ATTRS{idProduct}=="4001", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
+# Numato Mimas A7 - Artix 7 FPGA Board
+ATTRS{idVendor}=="2a19", ATTRS{idProduct}=="1009", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
 # Ambiq Micro EVK and Debug boards.
 ATTRS{idVendor}=="2aec", ATTRS{idProduct}=="6010", MODE="660", GROUP="plugdev", TAG+="uaccess"
 ATTRS{idVendor}=="2aec", ATTRS{idProduct}=="6011", MODE="660", GROUP="plugdev", TAG+="uaccess"

commit 36ae487ed04b0e072ff68c70a6775ec6aa6c1725
Author: Antonio Borneo <bor...@gm...>
Date:   Fri Mar 26 13:10:07 2021 +0100

    jimtcl: add temporary workaround for memory leak in jimtcl 0.80
    
    The API Jim_CreateCommand() in latest version of jimtcl leaks the
    memory allocated internally by jimtcl when it converts the string
    command-name to a Jim_Obj.
    The fix is already merged upstream and would be available in next
    jimtcl 0.81, expected in ~6 months, hopefully before the next tag
    for OpenOCD v0.12.0.
    OpenOCD v0.11.0 is distributed with jimtcl 0.79.
    Debian distributes jimtcl as a separate library package and today
    it's still on 0.79.
    
    It make sense to keep using jimtcl 0.80 in current development
    cycle to test it further. But having this background memory leak
    noise hides the eventual new memory leaks that could come from the
    development activity.
    
    This patch uses the internal jimtcl API Jim_CreateCommandObj() and
    correctly free the internal object, avoiding the memory leak.
    Being an internal API, it is not accessible if OpenOCD is linked
    with an external jimtcl library. Nevertheless, building jimtcl as
    a submodule of OpenOCD makes the trick effective.
    
    The scope of this patch is thus limited at developers that build
    OpenOCD with jimtcl submodule and need to control and debug memory
    leaks.
    This patch is supposed to be removed as soon as jimtcl 0.81 gets
    available.
    
    The added code is located, on purpose, in an area of the file that
    hopefully will not conflict other patches pending in gerrit.
    
    Change-Id: I4d300ad21bdb6c616c3f0f14b429b4fdf360900d
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reported-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/6130
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Oleksij Rempel <li...@re...>
    Reviewed-by: Jonathan McDowell <noo...@ea...>

diff --git a/src/helper/command.c b/src/helper/command.c
index 0a711e514..e2726f258 100644
--- a/src/helper/command.c
+++ b/src/helper/command.c
@@ -117,6 +117,40 @@ static void command_log_capture_finish(struct log_capture_state *state)
 	free(state);
 }
 
+/*
+ * FIXME: workaround for memory leak in jimtcl 0.80
+ * Jim API Jim_CreateCommand() converts the command name in a Jim object and
+ * does not free the object. Fixed for jimtcl 0.81 by e4416cf86f0b
+ * Use the internal jimtcl API Jim_CreateCommandObj, not exported by jim.h,
+ * and override the bugged API through preprocessor's macro.
+ * This workaround works only when jimtcl is compiled as OpenOCD submodule.
+ * If jimtcl is linked-in from a precompiled library, either static or dynamic,
+ * the symbol Jim_CreateCommandObj is not exported and the build will use the
+ * bugged API.
+ * To be removed when OpenOCD will switch to jimtcl 0.81
+ */
+#if JIM_VERSION == 80
+static int workaround_createcommand(Jim_Interp *interp, const char *cmdName,
+	Jim_CmdProc *cmdProc, void *privData, Jim_DelCmdProc *delProc);
+int Jim_CreateCommandObj(Jim_Interp *interp, Jim_Obj *cmdNameObj,
+	Jim_CmdProc *cmdProc, void *privData, Jim_DelCmdProc *delProc)
+__attribute__((weak, alias("workaround_createcommand")));
+static int workaround_createcommand(Jim_Interp *interp, const char *cmdName,
+	Jim_CmdProc *cmdProc, void *privData, Jim_DelCmdProc *delProc)
+{
+	if ((void *)Jim_CreateCommandObj == (void *)workaround_createcommand)
+		return Jim_CreateCommand(interp, cmdName, cmdProc, privData, delProc);
+
+	Jim_Obj *cmd_name = Jim_NewStringObj(interp, cmdName, -1);
+	Jim_IncrRefCount(cmd_name);
+	int retval = Jim_CreateCommandObj(interp, cmd_name, cmdProc, privData, delProc);
+	Jim_DecrRefCount(interp, cmd_name);
+	return retval;
+}
+#define Jim_CreateCommand workaround_createcommand
+#endif /* JIM_VERSION == 80 */
+/* FIXME: end of workaround for memory leak in jimtcl 0.80 */
+
 static int command_retval_set(Jim_Interp *interp, int retval)
 {
 	int *return_retval = Jim_GetAssocData(interp, "retval");

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

Summary of changes:
 configure.ac                |  4 ++--
 contrib/60-openocd.rules    | 29 ++++++++++++++++++++++++++
 src/helper/command.c        | 34 ++++++++++++++++++++++++++++++
 src/jtag/drivers/usbprog.c  | 50 ++++++++++++++++++++++++---------------------
 tcl/board/altera_sockit.cfg |  2 +-
 5 files changed, 93 insertions(+), 26 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-63-ga5b590750

[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  a5b5907506b3ce782662dc413b1e20ae0d43e346 (commit)
      from  6405d35f324f767c2ab88da12a600cb8e6c25f0e (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 a5b5907506b3ce782662dc413b1e20ae0d43e346
Author: Raúl Sánchez Siles <ras...@gm...>
Date:   Mon Mar 15 13:53:17 2021 +0100

    build: Fix out-of-tree with --disable-dependency-tracking configure flag
    
    After bootstrapping build, if we want to do an out-of-tree build (ie: in the
    OOT-build dir) we have a build failure because build system relies on
    the OOT-build/src directory exists
    
    ```sh
    ./bootstrap
    mkdir OOT-build
    cd OOT-build
    ../configure --disable-dependency-tracking --<flag1> --<flag2> ...
    make
    $ LANG=C make
    cat ../src/helper/startup.tcl ../src/jtag/startup.tcl ../src/target/startup.tcl ../src/server/startup.tcl ../src/flash/startup.tcl | ../src/helper/bin2char.sh > src/startup_tcl.inc || { rm -f src/startup_tcl.inc; false; }
    /bin/bash: line 1: src/startup_tcl.inc: No such file or directory
    make: *** [Makefile:6603: src/startup_tcl.inc] Error 1
    ```
    
    These kind of errors are fixed indicating relevant directory creation in
    Makefile.am before actually relying on it.
    
    Change-Id: I8185fd41ef942184597dc4c0092796034572cbe1
    Signed-off-by: Raúl Sánchez Siles <ras...@gm...>
    Reviewed-on: http://openocd.zylin.com/6106
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/Makefile.am b/src/Makefile.am
index 781c1e74f..432c31e14 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -65,6 +65,7 @@ BUILT_SOURCES += %D%/startup_tcl.inc
 
 # Convert .tcl to c-array
 %D%/startup_tcl.inc: $(STARTUP_TCL_SRCS)
+	mkdir -p %D%
 	cat $^ | $(BIN2C) > $@ || { rm -f $@; false; }
 
 # add generated files to make clean list

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

Summary of changes:
 src/Makefile.am | 1 +
 1 file changed, 1 insertion(+)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-62-g6405d35f3

[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  6405d35f324f767c2ab88da12a600cb8e6c25f0e (commit)
      from  88fa831839cf7e45f66064c9c74cfcf59b8d8c7e (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 6405d35f324f767c2ab88da12a600cb8e6c25f0e
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Tue Nov 3 01:22:53 2020 +0100

    flash/stm32l4x: probe tzen and rdp values
    
    introduction of 'enum stm32l4_rdp' enumerating possible RDP levels for
    devices with and without TrustZone.
    
    also in 'stm32l4_flash_bank' structure we added and rdp and tzen members
    to store read values by the helper 'stm32l4_sync_rdp_tzen'
    
    these new members are used to display security and protection status
    while probing the flash.
    
    Change-Id: Icf883189715278a3323fe210d295047678b16592
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/5541
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index bfedc8d66..594bce039 100644
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -143,6 +143,13 @@ enum stm32l4_flash_reg_index {
 	STM32_FLASH_REG_INDEX_NUM,
 };
 
+enum stm32l4_rdp {
+	RDP_LEVEL_0   = 0xAA,
+	RDP_LEVEL_0_5 = 0x55, /* for devices with TrustZone enabled */
+	RDP_LEVEL_1   = 0x00,
+	RDP_LEVEL_2   = 0xCC
+};
+
 static const uint32_t stm32l4_flash_regs[STM32_FLASH_REG_INDEX_NUM] = {
 	[STM32_FLASH_ACR_INDEX]      = 0x000,
 	[STM32_FLASH_KEYR_INDEX]     = 0x008,
@@ -199,6 +206,8 @@ struct stm32l4_flash_bank {
 	const struct stm32l4_part_info *part_info;
 	const uint32_t *flash_regs;
 	bool otp_enabled;
+	enum stm32l4_rdp rdp;
+	bool tzen;
 };
 
 enum stm32_bank_id {
@@ -610,6 +619,35 @@ static inline bool stm32l4_otp_is_enabled(struct flash_bank *bank)
 	return stm32l4_info->otp_enabled;
 }
 
+static void stm32l4_sync_rdp_tzen(struct flash_bank *bank, uint32_t optr_value)
+{
+	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
+
+	bool tzen = false;
+
+	if (stm32l4_info->part_info->flags & F_HAS_TZ)
+		tzen = (optr_value & FLASH_TZEN) != 0;
+
+	uint32_t rdp = optr_value & FLASH_RDP_MASK;
+
+	/* for devices without TrustZone:
+	 *   RDP level 0 and 2 values are to 0xAA and 0xCC
+	 *   Any other value corresponds to RDP level 1
+	 * for devices with TrusZone:
+	 *   RDP level 0 and 2 values are 0xAA and 0xCC
+	 *   RDP level 0.5 value is 0x55 only if TZEN = 1
+	 *   Any other value corresponds to RDP level 1, including 0x55 if TZEN = 0
+	 */
+
+	if (rdp != RDP_LEVEL_0 && rdp != RDP_LEVEL_2) {
+		if (!tzen || (tzen && rdp != RDP_LEVEL_0_5))
+			rdp = RDP_LEVEL_1;
+	}
+
+	stm32l4_info->tzen = tzen;
+	stm32l4_info->rdp = rdp;
+}
+
 static inline uint32_t stm32l4_get_flash_reg(struct flash_bank *bank, uint32_t reg_offset)
 {
 	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
@@ -1332,6 +1370,22 @@ static int stm32l4_probe(struct flash_bank *bank)
 
 	LOG_INFO("device idcode = 0x%08" PRIx32 " (%s)", stm32l4_info->idcode, device_info);
 
+	/* read flash option register */
+	retval = stm32l4_read_flash_reg_by_index(bank, STM32_FLASH_OPTR_INDEX, &options);
+	if (retval != ERROR_OK)
+		return retval;
+
+	stm32l4_sync_rdp_tzen(bank, options);
+
+	if (part_info->flags & F_HAS_TZ)
+		LOG_INFO("TZEN = %d : TrustZone %s by option bytes",
+				stm32l4_info->tzen,
+				stm32l4_info->tzen ? "enabled" : "disabled");
+
+	LOG_INFO("RDP level %s (0x%02X)",
+			stm32l4_info->rdp == RDP_LEVEL_0 ? "0" : stm32l4_info->rdp == RDP_LEVEL_0_5 ? "0.5" : "1",
+			stm32l4_info->rdp);
+
 	if (stm32l4_is_otp(bank)) {
 		bank->size = part_info->otp_size;
 
@@ -1347,7 +1401,6 @@ static int stm32l4_probe(struct flash_bank *bank)
 			return ERROR_FAIL;
 		}
 
-
 		stm32l4_info->probed = true;
 		return ERROR_OK;
 	} else if (bank->base != STM32_FLASH_BANK_BASE) {
@@ -1379,11 +1432,6 @@ static int stm32l4_probe(struct flash_bank *bank)
 	/* did we assign a flash size? */
 	assert((flash_size_kb != 0xffff) && flash_size_kb);
 
-	/* read flash option register */
-	retval = stm32l4_read_flash_reg_by_index(bank, STM32_FLASH_OPTR_INDEX, &options);
-	if (retval != ERROR_OK)
-		return retval;
-
 	stm32l4_info->bank1_sectors = 0;
 	stm32l4_info->hole_sectors = 0;
 
@@ -1783,7 +1831,8 @@ COMMAND_HANDLER(stm32l4_handle_lock_command)
 
 	/* set readout protection level 1 by erasing the RDP option byte */
 	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
-	if (stm32l4_write_option(bank, stm32l4_info->flash_regs[STM32_FLASH_OPTR_INDEX], 0, 0x000000FF) != ERROR_OK) {
+	if (stm32l4_write_option(bank, stm32l4_info->flash_regs[STM32_FLASH_OPTR_INDEX],
+			RDP_LEVEL_1, FLASH_RDP_MASK) != ERROR_OK) {
 		command_print(CMD, "%s failed to lock device", bank->driver->name);
 		return ERROR_OK;
 	}
@@ -1817,7 +1866,7 @@ COMMAND_HANDLER(stm32l4_handle_unlock_command)
 
 	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
 	if (stm32l4_write_option(bank, stm32l4_info->flash_regs[STM32_FLASH_OPTR_INDEX],
-			RDP_LEVEL_0, 0x000000FF) != ERROR_OK) {
+			RDP_LEVEL_0, FLASH_RDP_MASK) != ERROR_OK) {
 		command_print(CMD, "%s failed to unlock device", bank->driver->name);
 		return ERROR_OK;
 	}
diff --git a/src/flash/nor/stm32l4x.h b/src/flash/nor/stm32l4x.h
index 3e810a03c..41b5ff82d 100644
--- a/src/flash/nor/stm32l4x.h
+++ b/src/flash/nor/stm32l4x.h
@@ -56,9 +56,9 @@
 #define OPTKEY1					0x08192A3B
 #define OPTKEY2					0x4C5D6E7F
 
-#define RDP_LEVEL_0				0xAA
-#define RDP_LEVEL_1				0xBB
-#define RDP_LEVEL_2				0xCC
+/* FLASH_OPTR register bits */
+#define FLASH_RDP_MASK			0xFF
+#define FLASH_TZEN				(1 << 31)
 
 /* other registers */
 #define DBGMCU_IDCODE_G0		0x40015800

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

Summary of changes:
 src/flash/nor/stm32l4x.c | 65 ++++++++++++++++++++++++++++++++++++++++++------
 src/flash/nor/stm32l4x.h |  6 ++---
 2 files changed, 60 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-61-g88fa83183

[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  88fa831839cf7e45f66064c9c74cfcf59b8d8c7e (commit)
       via  03e2bc0f3b12c45f9b537bece1fef0520c2298bd (commit)
      from  b8fd9aecb12a5d930cf3e3e09cede4cd6787e847 (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 88fa831839cf7e45f66064c9c74cfcf59b8d8c7e
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Tue Nov 3 01:07:00 2020 +0100

    flash/stm32l4x: introduce stm32l4_part_info.flags for devices features
    
    instead of adding a new member into stm32l4_part_info for every relevant
    feature, .flags serves as container for the devices' features.
    
    identified features: F_HAS_DUAL_BANK, F_USE_ALL_WRPXX, F_HAS_TZ
    
    Change-Id: I3093e54c6509dec33043ebe6f87675198bf1967a
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/5540
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index 681638161..bfedc8d66 100644
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -116,6 +116,19 @@
 
 #define FLASH_ERASE_TIMEOUT 250
 
+
+/* relevant STM32L4 flags ****************************************************/
+#define F_NONE              0
+/* this flag indicates if the device flash is with dual bank architecture */
+#define F_HAS_DUAL_BANK     BIT(0)
+/* this flags is used for dual bank devices only, it indicates if the
+ * 4 WRPxx are usable if the device is configured in single-bank mode */
+#define F_USE_ALL_WRPXX     BIT(1)
+/* this flag indicates if the device embeds a TrustZone security feature */
+#define F_HAS_TZ            BIT(2)
+/* end of STM32L4 flags ******************************************************/
+
+
 enum stm32l4_flash_reg_index {
 	STM32_FLASH_ACR_INDEX,
 	STM32_FLASH_KEYR_INDEX,
@@ -167,10 +180,7 @@ struct stm32l4_part_info {
 	const struct stm32l4_rev *revs;
 	const size_t num_revs;
 	const uint16_t max_flash_size_kb;
-	const bool has_dual_bank;
-	/* this field is used for dual bank devices only, it indicates if the
-	 * 4 WRPxx are usable if the device is configured in single-bank mode */
-	const bool use_all_wrpxx;
+	const uint32_t flags; /* one bit per feature, see STM32L4 flags: macros F_XXX */
 	const uint32_t flash_regs_base;
 	const uint32_t *default_flash_regs;
 	const uint32_t fsize_addr;
@@ -280,8 +290,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_415_revs),
 	  .device_str            = "STM32L47/L48xx",
 	  .max_flash_size_kb     = 1024,
-	  .has_dual_bank         = true,
-	  .use_all_wrpxx         = false,
+	  .flags                 = F_HAS_DUAL_BANK,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -294,8 +303,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_435_revs),
 	  .device_str            = "STM32L43/L44xx",
 	  .max_flash_size_kb     = 256,
-	  .has_dual_bank         = false,
-	  .use_all_wrpxx         = false,
+	  .flags                 = F_NONE,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -308,8 +316,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_460_revs),
 	  .device_str            = "STM32G07/G08xx",
 	  .max_flash_size_kb     = 128,
-	  .has_dual_bank         = false,
-	  .use_all_wrpxx         = false,
+	  .flags                 = F_NONE,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -322,8 +329,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_461_revs),
 	  .device_str            = "STM32L49/L4Axx",
 	  .max_flash_size_kb     = 1024,
-	  .has_dual_bank         = true,
-	  .use_all_wrpxx         = false,
+	  .flags                 = F_HAS_DUAL_BANK,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -336,8 +342,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_462_revs),
 	  .device_str            = "STM32L45/L46xx",
 	  .max_flash_size_kb     = 512,
-	  .has_dual_bank         = false,
-	  .use_all_wrpxx         = false,
+	  .flags                 = F_NONE,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -350,8 +355,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_464_revs),
 	  .device_str            = "STM32L41/L42xx",
 	  .max_flash_size_kb     = 128,
-	  .has_dual_bank         = false,
-	  .use_all_wrpxx         = false,
+	  .flags                 = F_NONE,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -364,8 +368,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_466_revs),
 	  .device_str            = "STM32G03/G04xx",
 	  .max_flash_size_kb     = 64,
-	  .has_dual_bank         = false,
-	  .use_all_wrpxx         = false,
+	  .flags                 = F_NONE,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -378,8 +381,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_468_revs),
 	  .device_str            = "STM32G43/G44xx",
 	  .max_flash_size_kb     = 128,
-	  .has_dual_bank         = false,
-	  .use_all_wrpxx         = false,
+	  .flags                 = F_NONE,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -392,8 +394,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_469_revs),
 	  .device_str            = "STM32G47/G48xx",
 	  .max_flash_size_kb     = 512,
-	  .has_dual_bank         = true,
-	  .use_all_wrpxx         = true,
+	  .flags                 = F_HAS_DUAL_BANK | F_USE_ALL_WRPXX,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -406,8 +407,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_470_revs),
 	  .device_str            = "STM32L4R/L4Sxx",
 	  .max_flash_size_kb     = 2048,
-	  .has_dual_bank         = true,
-	  .use_all_wrpxx         = true,
+	  .flags                 = F_HAS_DUAL_BANK | F_USE_ALL_WRPXX,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -420,8 +420,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_471_revs),
 	  .device_str            = "STM32L4P5/L4Q5x",
 	  .max_flash_size_kb     = 1024,
-	  .has_dual_bank         = true,
-	  .use_all_wrpxx         = true,
+	  .flags                 = F_HAS_DUAL_BANK | F_USE_ALL_WRPXX,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -434,8 +433,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_472_revs),
 	  .device_str            = "STM32L55/L56xx",
 	  .max_flash_size_kb     = 512,
-	  .has_dual_bank         = true,
-	  .use_all_wrpxx         = true,
+	  .flags                 = F_HAS_DUAL_BANK | F_USE_ALL_WRPXX | F_HAS_TZ,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l5_ns_flash_regs,
 	  .fsize_addr            = 0x0BFA05E0,
@@ -448,8 +446,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_479_revs),
 	  .device_str            = "STM32G49/G4Axx",
 	  .max_flash_size_kb     = 512,
-	  .has_dual_bank         = false,
-	  .use_all_wrpxx         = false,
+	  .flags                 = F_NONE,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -462,8 +459,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_495_revs),
 	  .device_str            = "STM32WB5x",
 	  .max_flash_size_kb     = 1024,
-	  .has_dual_bank         = false,
-	  .use_all_wrpxx         = false,
+	  .flags                 = F_NONE,
 	  .flash_regs_base       = 0x58004000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -476,8 +472,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_496_revs),
 	  .device_str            = "STM32WB3x",
 	  .max_flash_size_kb     = 512,
-	  .has_dual_bank         = false,
-	  .use_all_wrpxx         = false,
+	  .flags                 = F_NONE,
 	  .flash_regs_base       = 0x58004000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -490,8 +485,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .num_revs              = ARRAY_SIZE(stm32_497_revs),
 	  .device_str            = "STM32WLEx",
 	  .max_flash_size_kb     = 256,
-	  .has_dual_bank         = false,
-	  .use_all_wrpxx         = false,
+	  .flags                 = F_NONE,
 	  .flash_regs_base       = 0x58004000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -847,7 +841,7 @@ static int stm32l4_get_all_wrpxy(struct flash_bank *bank, enum stm32_bank_id dev
 			return ret;
 
 		/* for some devices (like STM32L4R/S) in single-bank mode, the 4 WRPxx are usable */
-		if (stm32l4_info->part_info->use_all_wrpxx && !stm32l4_info->dual_bank_mode)
+		if ((stm32l4_info->part_info->flags & F_USE_ALL_WRPXX) && !stm32l4_info->dual_bank_mode)
 			wrp2y_sectors_offset = 0;
 	}
 
@@ -1611,7 +1605,7 @@ static int stm32l4_mass_erase(struct flash_bank *bank)
 
 	uint32_t action = FLASH_MER1;
 
-	if (stm32l4_info->part_info->has_dual_bank)
+	if (stm32l4_info->part_info->flags & F_HAS_DUAL_BANK)
 		action |= FLASH_MER2;
 
 	if (target->state != TARGET_HALTED) {
@@ -1858,7 +1852,7 @@ COMMAND_HANDLER(stm32l4_handle_wrp_info_command)
 	}
 
 	if (dev_bank_id == STM32_BANK2) {
-		if (!stm32l4_info->part_info->has_dual_bank) {
+		if (!(stm32l4_info->part_info->flags & F_HAS_DUAL_BANK)) {
 			LOG_ERROR("this device has no second bank");
 			return ERROR_FAIL;
 		} else if (!stm32l4_info->dual_bank_mode) {

commit 03e2bc0f3b12c45f9b537bece1fef0520c2298bd
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Tue Nov 3 00:50:24 2020 +0100

    flash/stm32l4x: enhance protect handler to use efficiently all WRP areas
    
    stm32l4_protect: was using one WRP area per bank, without checking
    if it is already protecting some sectors.
    protection algo is more complicated than that, before using a WRP area
    we should check if it is already used, then either reuse it for extension
    (or reduction) or use a free area.
    
    introduce a new command: stm32l4x wrp_info bank_num ['bank1'|'bank2']
    this command lists the protected areas using WRP.
    
    Note: for some devices like STM32L4R/S in single bank mode, all 4 WRP areas
    are usable for that bank, to manage this case an attribute 'use_all_wrpxx'
    was introduced into stm32l4_part_info and used later in protection handlers
    
    example usage:
            $ telnet localhost 4444
            > flash probe 0
              device idcode = 0x10036470 (STM32L4R/L4Sxx - Rev: Y)
              flash size = 2048kbytes
              flash mode : dual-bank
              flash 'stm32l4x' found at 0x08000000
            > stm32l4x wrp_info 0
              no protected areas
            > flash protect 0 0 4 on
              set protection for sectors 0 through 4 on flash bank 0
            > flash protect 0 8 9 on
              set protection for sectors 8 through 9 on flash bank 0
            > stm32l4x wrp_info 0
              protected areas: [0,4][8,9]
            > flash protect 0 6 6 on
              the device WRPxy are not enough to set the requested protection
              failed setting protection for blocks 6 to 6
            > flash protect 0 3 5 on
              set protection for sectors 3 through 5 on flash bank 0
            > stm32l4x wrp_info 0
              protected areas: [0,5][8,9]
            > flash protect 0 6 7 on
              set protection for sectors 6 through 7 on flash bank 0
            > stm32l4x wrp_info 0
              protected areas: [0,9]
            > flash protect 0 5 6 off
              cleared protection for sectors 5 through 6 on flash bank 0
            > stm32l4x wrp_info 0
              protected areas: [0,4][7,9]
    
    Change-Id: I42bd84fa66edd93406e18c6d89310faa5267ffa7
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/6107
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 6cce952d4..45c9ffae8 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -7249,6 +7249,20 @@ Area A for bank 1. The above example set WRP1AR_END=255, WRP1AR_START=0.
 This will effectively write protect all sectors in flash bank 1.
 @end deffn
 
+@deffn Command {stm32l4x wrp_info} num [device_bank]
+List the protected areas using WRP.
+The @var{num} parameter is a value shown by @command{flash banks}.
+@var{device_bank} parameter is optional, possible values 'bank1' or 'bank2',
+if not specified, the command will display the whole flash protected areas.
+
+@b{Note:} @var{device_bank} is different from banks created using @code{flash bank}.
+Devices supported in this flash driver, can have main flash memory organized
+in single or dual-banks mode.
+Thus the usage of @var{device_bank} is meaningful only in dual-bank mode, to get
+write protected areas in a specific @var{device_bank}
+
+@end deffn
+
 @deffn Command {stm32l4x option_load} num
 Forces a re-load of the option byte registers. Will cause a system reset of the device.
 The @var{num} parameter is a value shown by @command{flash banks}.
diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index 492d0dde1..681638161 100644
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -168,6 +168,9 @@ struct stm32l4_part_info {
 	const size_t num_revs;
 	const uint16_t max_flash_size_kb;
 	const bool has_dual_bank;
+	/* this field is used for dual bank devices only, it indicates if the
+	 * 4 WRPxx are usable if the device is configured in single-bank mode */
+	const bool use_all_wrpxx;
 	const uint32_t flash_regs_base;
 	const uint32_t *default_flash_regs;
 	const uint32_t fsize_addr;
@@ -188,6 +191,21 @@ struct stm32l4_flash_bank {
 	bool otp_enabled;
 };
 
+enum stm32_bank_id {
+	STM32_BANK1,
+	STM32_BANK2,
+	STM32_ALL_BANKS
+};
+
+struct stm32l4_wrp {
+	enum stm32l4_flash_reg_index reg_idx;
+	uint32_t value;
+	bool used;
+	int first;
+	int last;
+	int offset;
+};
+
 /* human readable list of families this drivers supports (sorted alphabetically) */
 static const char *device_families = "STM32G0/G4/L4/L4+/L5/WB/WL";
 
@@ -263,6 +281,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32L47/L48xx",
 	  .max_flash_size_kb     = 1024,
 	  .has_dual_bank         = true,
+	  .use_all_wrpxx         = false,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -276,6 +295,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32L43/L44xx",
 	  .max_flash_size_kb     = 256,
 	  .has_dual_bank         = false,
+	  .use_all_wrpxx         = false,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -289,6 +309,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32G07/G08xx",
 	  .max_flash_size_kb     = 128,
 	  .has_dual_bank         = false,
+	  .use_all_wrpxx         = false,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -302,6 +323,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32L49/L4Axx",
 	  .max_flash_size_kb     = 1024,
 	  .has_dual_bank         = true,
+	  .use_all_wrpxx         = false,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -315,6 +337,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32L45/L46xx",
 	  .max_flash_size_kb     = 512,
 	  .has_dual_bank         = false,
+	  .use_all_wrpxx         = false,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -328,6 +351,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32L41/L42xx",
 	  .max_flash_size_kb     = 128,
 	  .has_dual_bank         = false,
+	  .use_all_wrpxx         = false,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -341,6 +365,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32G03/G04xx",
 	  .max_flash_size_kb     = 64,
 	  .has_dual_bank         = false,
+	  .use_all_wrpxx         = false,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -354,6 +379,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32G43/G44xx",
 	  .max_flash_size_kb     = 128,
 	  .has_dual_bank         = false,
+	  .use_all_wrpxx         = false,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -367,6 +393,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32G47/G48xx",
 	  .max_flash_size_kb     = 512,
 	  .has_dual_bank         = true,
+	  .use_all_wrpxx         = true,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -380,6 +407,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32L4R/L4Sxx",
 	  .max_flash_size_kb     = 2048,
 	  .has_dual_bank         = true,
+	  .use_all_wrpxx         = true,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -393,6 +421,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32L4P5/L4Q5x",
 	  .max_flash_size_kb     = 1024,
 	  .has_dual_bank         = true,
+	  .use_all_wrpxx         = true,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -406,6 +435,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32L55/L56xx",
 	  .max_flash_size_kb     = 512,
 	  .has_dual_bank         = true,
+	  .use_all_wrpxx         = true,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l5_ns_flash_regs,
 	  .fsize_addr            = 0x0BFA05E0,
@@ -419,6 +449,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32G49/G4Axx",
 	  .max_flash_size_kb     = 512,
 	  .has_dual_bank         = false,
+	  .use_all_wrpxx         = false,
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -432,6 +463,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32WB5x",
 	  .max_flash_size_kb     = 1024,
 	  .has_dual_bank         = false,
+	  .use_all_wrpxx         = false,
 	  .flash_regs_base       = 0x58004000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -445,6 +477,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32WB3x",
 	  .max_flash_size_kb     = 512,
 	  .has_dual_bank         = false,
+	  .use_all_wrpxx         = false,
 	  .flash_regs_base       = 0x58004000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -458,6 +491,7 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .device_str            = "STM32WLEx",
 	  .max_flash_size_kb     = 256,
 	  .has_dual_bank         = false,
+	  .use_all_wrpxx         = false,
 	  .flash_regs_base       = 0x58004000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
@@ -494,6 +528,63 @@ FLASH_BANK_COMMAND_HANDLER(stm32l4_flash_bank_command)
 	return ERROR_OK;
 }
 
+/* bitmap helper extension */
+struct range {
+	unsigned int start;
+	unsigned int end;
+};
+
+static void bitmap_to_ranges(unsigned long *bitmap, unsigned int nbits,
+		struct range *ranges, unsigned int *ranges_count) {
+	*ranges_count = 0;
+	bool last_bit = 0, cur_bit;
+	for (unsigned int i = 0; i < nbits; i++) {
+		cur_bit = test_bit(i, bitmap);
+
+		if (cur_bit && !last_bit) {
+			(*ranges_count)++;
+			ranges[*ranges_count - 1].start = i;
+			ranges[*ranges_count - 1].end = i;
+		} else if (cur_bit && last_bit) {
+			/* update (increment) the end this range */
+			ranges[*ranges_count - 1].end = i;
+		}
+
+		last_bit = cur_bit;
+	}
+}
+
+static inline int range_print_one(struct range *range, char *str)
+{
+	if (range->start == range->end)
+		return sprintf(str, "[%d]", range->start);
+
+	return sprintf(str, "[%d,%d]", range->start, range->end);
+}
+
+static char *range_print_alloc(struct range *ranges, unsigned int ranges_count)
+{
+	/* each range will be printed like the following: [start,end]
+	 * start and end, both are unsigned int, an unsigned int takes 10 characters max
+	 * plus 3 characters for '[', ',' and ']'
+	 * thus means each range can take maximum 23 character
+	 * after each range we add a ' ' as separator and finally we need the '\0'
+	 * if the ranges_count is zero we reserve one char for '\0' to return an empty string */
+	char *str = calloc(1, ranges_count * (24 * sizeof(char)) + 1);
+	char *ptr = str;
+
+	for (unsigned int i = 0; i < ranges_count; i++) {
+		ptr += range_print_one(&(ranges[i]), ptr);
+
+		if (i < ranges_count - 1)
+			*(ptr++) = ' ';
+	}
+
+	return str;
+}
+
+/* end of bitmap helper extension */
+
 static inline bool stm32l4_is_otp(struct flash_bank *bank)
 {
 	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
@@ -706,53 +797,125 @@ err_lock:
 	return retval2;
 }
 
-static int stm32l4_protect_check(struct flash_bank *bank)
+static int stm32l4_get_one_wrpxy(struct flash_bank *bank, struct stm32l4_wrp *wrpxy,
+		enum stm32l4_flash_reg_index reg_idx, int offset)
 {
 	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
+	int ret;
 
-	uint32_t wrp1ar, wrp1br, wrp2ar, wrp2br;
-	stm32l4_read_flash_reg_by_index(bank, STM32_FLASH_WRP1AR_INDEX, &wrp1ar);
-	stm32l4_read_flash_reg_by_index(bank, STM32_FLASH_WRP1BR_INDEX, &wrp1br);
-	if (stm32l4_info->part_info->has_dual_bank) {
-		stm32l4_read_flash_reg_by_index(bank, STM32_FLASH_WRP2AR_INDEX, &wrp2ar);
-		stm32l4_read_flash_reg_by_index(bank, STM32_FLASH_WRP2BR_INDEX, &wrp2br);
-	} else {
-		/* prevent uninitialized errors */
-		wrp2ar = 0;
-		wrp2br = 0;
+	wrpxy->reg_idx = reg_idx;
+	wrpxy->offset = offset;
+
+	ret = stm32l4_read_flash_reg_by_index(bank, wrpxy->reg_idx , &wrpxy->value);
+	if (ret != ERROR_OK)
+		return ret;
+
+	wrpxy->first = (wrpxy->value & stm32l4_info->wrpxxr_mask) + wrpxy->offset;
+	wrpxy->last = ((wrpxy->value >> 16) & stm32l4_info->wrpxxr_mask) + wrpxy->offset;
+	wrpxy->used = wrpxy->first <= wrpxy->last;
+
+	return ERROR_OK;
+}
+
+static int stm32l4_get_all_wrpxy(struct flash_bank *bank, enum stm32_bank_id dev_bank_id,
+		struct stm32l4_wrp *wrpxy, unsigned int *n_wrp)
+{
+	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
+	int ret;
+
+	*n_wrp = 0;
+
+	/* for single bank devices there is 2 WRP regions.
+	 * for dual bank devices there is 2 WRP regions per bank,
+	 *   if configured as single bank only 2 WRP are usable
+	 *   except for STM32L4R/S/P/Q, G4 cat3, L5 ... all 4 WRP are usable
+	 * note: this should be revised, if a device will have the SWAP banks option
+	 */
+
+	int wrp2y_sectors_offset = -1; /* -1 : unused */
+
+	/* if bank_id is BANK1 or ALL_BANKS */
+	if (dev_bank_id != STM32_BANK2) {
+		/* get FLASH_WRP1AR */
+		ret = stm32l4_get_one_wrpxy(bank, &wrpxy[(*n_wrp)++], STM32_FLASH_WRP1AR_INDEX, 0);
+		if (ret != ERROR_OK)
+			return ret;
+
+		/* get WRP1BR */
+		ret = stm32l4_get_one_wrpxy(bank, &wrpxy[(*n_wrp)++], STM32_FLASH_WRP1BR_INDEX, 0);
+		if (ret != ERROR_OK)
+			return ret;
+
+		/* for some devices (like STM32L4R/S) in single-bank mode, the 4 WRPxx are usable */
+		if (stm32l4_info->part_info->use_all_wrpxx && !stm32l4_info->dual_bank_mode)
+			wrp2y_sectors_offset = 0;
 	}
 
-	const uint8_t wrp1a_start = wrp1ar & stm32l4_info->wrpxxr_mask;
-	const uint8_t wrp1a_end = (wrp1ar >> 16) & stm32l4_info->wrpxxr_mask;
-	const uint8_t wrp1b_start = wrp1br & stm32l4_info->wrpxxr_mask;
-	const uint8_t wrp1b_end = (wrp1br >> 16) & stm32l4_info->wrpxxr_mask;
-	const uint8_t wrp2a_start = wrp2ar & stm32l4_info->wrpxxr_mask;
-	const uint8_t wrp2a_end = (wrp2ar >> 16) & stm32l4_info->wrpxxr_mask;
-	const uint8_t wrp2b_start = wrp2br & stm32l4_info->wrpxxr_mask;
-	const uint8_t wrp2b_end = (wrp2br >> 16) & stm32l4_info->wrpxxr_mask;
+	/* if bank_id is BANK2 or ALL_BANKS */
+	if (dev_bank_id != STM32_BANK1 && stm32l4_info->dual_bank_mode)
+		wrp2y_sectors_offset = stm32l4_info->bank1_sectors;
 
-	for (unsigned int i = 0; i < bank->num_sectors; i++) {
-		if (i < stm32l4_info->bank1_sectors) {
-			if (((i >= wrp1a_start) &&
-				 (i <= wrp1a_end)) ||
-				((i >= wrp1b_start) &&
-				 (i <= wrp1b_end)))
-				bank->sectors[i].is_protected = 1;
-			else
-				bank->sectors[i].is_protected = 0;
-		} else {
-			assert(stm32l4_info->part_info->has_dual_bank == true);
-			uint8_t snb;
-			snb = i - stm32l4_info->bank1_sectors;
-			if (((snb >= wrp2a_start) &&
-				 (snb <= wrp2a_end)) ||
-				((snb >= wrp2b_start) &&
-				 (snb <= wrp2b_end)))
-				bank->sectors[i].is_protected = 1;
-			else
-				bank->sectors[i].is_protected = 0;
+	if (wrp2y_sectors_offset > -1) {
+		/* get WRP2AR */
+		ret = stm32l4_get_one_wrpxy(bank, &wrpxy[(*n_wrp)++], STM32_FLASH_WRP2AR_INDEX, wrp2y_sectors_offset);
+		if (ret != ERROR_OK)
+			return ret;
+
+		/* get WRP2BR */
+		ret = stm32l4_get_one_wrpxy(bank, &wrpxy[(*n_wrp)++], STM32_FLASH_WRP2BR_INDEX, wrp2y_sectors_offset);
+		if (ret != ERROR_OK)
+			return ret;
+	}
+
+	return ERROR_OK;
+}
+
+static int stm32l4_write_one_wrpxy(struct flash_bank *bank, struct stm32l4_wrp *wrpxy)
+{
+	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
+
+	int wrp_start = wrpxy->first - wrpxy->offset;
+	int wrp_end = wrpxy->last - wrpxy->offset;
+
+	uint32_t wrp_value = (wrp_start & stm32l4_info->wrpxxr_mask) | ((wrp_end & stm32l4_info->wrpxxr_mask) << 16);
+
+	return stm32l4_write_option(bank, stm32l4_info->flash_regs[wrpxy->reg_idx], wrp_value, 0xffffffff);
+}
+
+static int stm32l4_write_all_wrpxy(struct flash_bank *bank, struct stm32l4_wrp *wrpxy, unsigned int n_wrp)
+{
+	int ret;
+
+	for (unsigned int i = 0; i < n_wrp; i++) {
+		ret = stm32l4_write_one_wrpxy(bank, &wrpxy[i]);
+		if (ret != ERROR_OK)
+			return ret;
+	}
+
+	return ERROR_OK;
+}
+
+static int stm32l4_protect_check(struct flash_bank *bank)
+{
+	unsigned int n_wrp;
+	struct stm32l4_wrp wrpxy[4];
+
+	int ret = stm32l4_get_all_wrpxy(bank, STM32_ALL_BANKS, wrpxy, &n_wrp);
+	if (ret != ERROR_OK)
+		return ret;
+
+	/* initialize all sectors as unprotected */
+	for (unsigned int i = 0; i < bank->num_sectors; i++)
+		bank->sectors[i].is_protected = 0;
+
+	/* now check WRPxy and mark the protected sectors */
+	for (unsigned int i = 0; i < n_wrp; i++) {
+		if (wrpxy[i].used) {
+			for (int s = wrpxy[i].first; s <= wrpxy[i].last; s++)
+				bank->sectors[s].is_protected = 1;
 		}
 	}
+
 	return ERROR_OK;
 }
 
@@ -819,11 +982,12 @@ err_lock:
 	return retval2;
 }
 
-static int stm32l4_protect(struct flash_bank *bank, int set, unsigned int first,
-		unsigned int last)
+static int stm32l4_protect(struct flash_bank *bank, int set, unsigned int first, unsigned int last)
 {
 	struct target *target = bank->target;
 	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
+	int ret = ERROR_OK;
+	unsigned int i;
 
 	if (stm32l4_is_otp(bank)) {
 		LOG_ERROR("cannot protect/unprotect OTP memory");
@@ -835,29 +999,116 @@ static int stm32l4_protect(struct flash_bank *bank, int set, unsigned int first,
 		return ERROR_TARGET_NOT_HALTED;
 	}
 
-	int ret = ERROR_OK;
-	/* Bank 2 */
-	uint32_t reg_value = 0xFF; /* Default to bank un-protected */
+	/* the requested sectors could be located into bank1 and/or bank2 */
+	bool use_bank2 = false;
 	if (last >= stm32l4_info->bank1_sectors) {
-		if (set == 1) {
-			uint8_t begin = first > stm32l4_info->bank1_sectors ? first : 0x00;
-			reg_value = ((last & 0xFF) << 16) | begin;
+		if (first < stm32l4_info->bank1_sectors) {
+			/* the requested sectors for (un)protection are shared between
+			 * bank 1 and 2, then split the operation */
+
+			/*  1- deal with bank 1 sectors */
+			LOG_DEBUG("The requested sectors for %s are shared between bank 1 and 2",
+					set ? "protection" : "unprotection");
+			ret = stm32l4_protect(bank, set, first, stm32l4_info->bank1_sectors - 1);
+			if (ret != ERROR_OK)
+				return ret;
+
+			/*  2- then continue with bank 2 sectors */
+			first = stm32l4_info->bank1_sectors;
 		}
 
-		ret = stm32l4_write_option(bank, stm32l4_info->flash_regs[STM32_FLASH_WRP2AR_INDEX], reg_value, 0xffffffff);
+		use_bank2 = true;
 	}
-	/* Bank 1 */
-	reg_value = 0xFF; /* Default to bank un-protected */
-	if (first < stm32l4_info->bank1_sectors) {
-		if (set == 1) {
-			uint8_t end = last >= stm32l4_info->bank1_sectors ? 0xFF : last;
-			reg_value = (end << 16) | (first & 0xFF);
+
+	/* refresh the sectors' protection */
+	ret = stm32l4_protect_check(bank);
+	if (ret != ERROR_OK)
+		return ret;
+
+	/* check if the desired protection is already configured */
+	for (i = first; i <= last; i++) {
+		if (bank->sectors[i].is_protected != set)
+			break;
+		else if (i == last) {
+			LOG_INFO("The specified sectors are already %s", set ? "protected" : "unprotected");
+			return ERROR_OK;
 		}
+	}
+
+	/* all sectors from first to last (or part of them) could have different
+	 * protection other than the requested */
+	unsigned int n_wrp;
+	struct stm32l4_wrp wrpxy[4];
 
-		ret = stm32l4_write_option(bank, stm32l4_info->flash_regs[STM32_FLASH_WRP1AR_INDEX], reg_value, 0xffffffff);
+	ret = stm32l4_get_all_wrpxy(bank, use_bank2 ? STM32_BANK2 : STM32_BANK1, wrpxy, &n_wrp);
+	if (ret != ERROR_OK)
+		return ret;
+
+	/* use bitmap and range helpers to optimize the WRP usage */
+	DECLARE_BITMAP(pages, bank->num_sectors);
+	bitmap_zero(pages, bank->num_sectors);
+
+	for (i = 0; i < n_wrp; i++) {
+		if (wrpxy[i].used) {
+			for (int p = wrpxy[i].first; p <= wrpxy[i].last; p++)
+				set_bit(p, pages);
+		}
 	}
 
-	return ret;
+	/* we have at most 'n_wrp' WRP areas
+	 * add one range if the user is trying to protect a fifth range */
+	struct range ranges[n_wrp + 1];
+	unsigned int ranges_count = 0;
+
+	bitmap_to_ranges(pages, bank->num_sectors, ranges, &ranges_count);
+
+	/* pretty-print the currently protected ranges */
+	if (ranges_count > 0) {
+		char *ranges_str = range_print_alloc(ranges, ranges_count);
+		LOG_DEBUG("current protected areas: %s", ranges_str);
+		free(ranges_str);
+	} else
+		LOG_DEBUG("current protected areas: none");
+
+	if (set) { /* flash protect */
+		for (i = first; i <= last; i++)
+			set_bit(i, pages);
+	} else { /* flash unprotect */
+		for (i = first; i <= last; i++)
+			clear_bit(i, pages);
+	}
+
+	/* check the ranges_count after the user request */
+	bitmap_to_ranges(pages, bank->num_sectors, ranges, &ranges_count);
+
+	/* pretty-print the requested areas for protection */
+	if (ranges_count > 0) {
+		char *ranges_str = range_print_alloc(ranges, ranges_count);
+		LOG_DEBUG("requested areas for protection: %s", ranges_str);
+		free(ranges_str);
+	} else
+		LOG_DEBUG("requested areas for protection: none");
+
+	if (ranges_count > n_wrp) {
+		LOG_ERROR("cannot set the requested protection "
+				"(only %u write protection areas are available)" , n_wrp);
+		return ERROR_FAIL;
+	}
+
+	/* re-init all WRPxy as disabled (first > last)*/
+	for (i = 0; i < n_wrp; i++) {
+		wrpxy[i].first = wrpxy[i].offset + 1;
+		wrpxy[i].last = wrpxy[i].offset;
+	}
+
+	/* then configure WRPxy areas */
+	for (i = 0; i < ranges_count; i++) {
+		wrpxy[i].first = ranges[i].start;
+		wrpxy[i].last = ranges[i].end;
+	}
+
+	/* finally write WRPxy registers */
+	return stm32l4_write_all_wrpxy(bank, wrpxy, n_wrp);
 }
 
 /* Count is in double-words */
@@ -1580,6 +1831,78 @@ COMMAND_HANDLER(stm32l4_handle_unlock_command)
 	return ERROR_OK;
 }
 
+COMMAND_HANDLER(stm32l4_handle_wrp_info_command)
+{
+	if (CMD_ARGC < 1 || CMD_ARGC > 2)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	struct flash_bank *bank;
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
+	if (ERROR_OK != retval)
+		return retval;
+
+	if (stm32l4_is_otp(bank)) {
+		LOG_ERROR("OTP memory does not have write protection areas");
+		return ERROR_FLASH_OPER_UNSUPPORTED;
+	}
+
+	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
+	enum stm32_bank_id dev_bank_id = STM32_ALL_BANKS;
+	if (CMD_ARGC == 2) {
+		if (strcmp(CMD_ARGV[1], "bank1") == 0)
+			dev_bank_id = STM32_BANK1;
+		else if (strcmp(CMD_ARGV[1], "bank2") == 0)
+			dev_bank_id = STM32_BANK2;
+		else
+			return ERROR_COMMAND_ARGUMENT_INVALID;
+	}
+
+	if (dev_bank_id == STM32_BANK2) {
+		if (!stm32l4_info->part_info->has_dual_bank) {
+			LOG_ERROR("this device has no second bank");
+			return ERROR_FAIL;
+		} else if (!stm32l4_info->dual_bank_mode) {
+			LOG_ERROR("this device is configured in single bank mode");
+			return ERROR_FAIL;
+		}
+	}
+
+	int ret;
+	unsigned int n_wrp, i;
+	struct stm32l4_wrp wrpxy[4];
+
+	ret = stm32l4_get_all_wrpxy(bank, dev_bank_id, wrpxy, &n_wrp);
+	if (ret != ERROR_OK)
+		return ret;
+
+	/* use bitmap and range helpers to better describe protected areas */
+	DECLARE_BITMAP(pages, bank->num_sectors);
+	bitmap_zero(pages, bank->num_sectors);
+
+	for (i = 0; i < n_wrp; i++) {
+		if (wrpxy[i].used) {
+			for (int p = wrpxy[i].first; p <= wrpxy[i].last; p++)
+				set_bit(p, pages);
+		}
+	}
+
+	/* we have at most 'n_wrp' WRP areas */
+	struct range ranges[n_wrp];
+	unsigned int ranges_count = 0;
+
+	bitmap_to_ranges(pages, bank->num_sectors, ranges, &ranges_count);
+
+	if (ranges_count > 0) {
+		/* pretty-print the protected ranges */
+		char *ranges_str = range_print_alloc(ranges, ranges_count);
+		command_print(CMD, "protected areas: %s", ranges_str);
+		free(ranges_str);
+	} else
+		command_print(CMD, "no protected areas");
+
+	return ERROR_OK;
+}
+
 COMMAND_HANDLER(stm32l4_handle_otp_command)
 {
 	if (CMD_ARGC < 2)
@@ -1643,6 +1966,13 @@ static const struct command_registration stm32l4_exec_command_handlers[] = {
 		.usage = "bank_id reg_offset value mask",
 		.help = "Write device option bit fields with provided value.",
 	},
+	{
+		.name = "wrp_info",
+		.handler = stm32l4_handle_wrp_info_command,
+		.mode = COMMAND_EXEC,
+		.usage = "bank_id [bank1|bank2]",
+		.help = "list the protected areas using WRP",
+	},
 	{
 		.name = "option_load",
 		.handler = stm32l4_handle_option_load_command,

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

Summary of changes:
 doc/openocd.texi         |  14 ++
 src/flash/nor/stm32l4x.c | 472 +++++++++++++++++++++++++++++++++++++++--------
 2 files changed, 412 insertions(+), 74 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-59-gb8fd9aecb

[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  b8fd9aecb12a5d930cf3e3e09cede4cd6787e847 (commit)
      from  f13bb10e267f9d474901a0f7b4fbb2975920668c (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 b8fd9aecb12a5d930cf3e3e09cede4cd6787e847
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Sun Mar 22 20:39:44 2020 +0100

    stm32l4x: add OTP support for STM32 G0/G4/L4/L4+/L5/WB/WL devices
    
    this is a rework of #5320 started by Andreas then abandoned.
    
    same syntax as in stm32f2x driver:
    
      enable OTP for writing
      > stm32l4x otp 1 enable
    
      write to OTP
      > flash write_bank 1 foo.bin 0
      > flash filld 0x1FFF7000 0xDeadBeafBaadF00d 1
    
      read OTP
      > mdw 0x1FFF7000 4
    
      disable OTP
      > stm32l4x otp 1 disable
    
    Change-Id: Id7d7c163b35d7a3f406dc200d7e2fc293b0675c2
    Signed-off-by: Andreas Bolsch <hyp...@gm...>
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/5537
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index b3fe85404..6cce952d4 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -7179,6 +7179,17 @@ the chip identification register, and autoconfigures itself.
 flash bank $_FLASHNAME stm32l4x 0 0 0 0 $_TARGETNAME
 @end example
 
+If you use OTP (One-Time Programmable) memory define it as a second bank
+as per the following example.
+@example
+flash bank $_FLASHNAME stm32l4x 0x1FFF7000 0 0 0 $_TARGETNAME
+@end example
+
+@deffn Command {stm32l4x otp} num (@option{enable}|@option{disable}|@option{show})
+Enables or disables OTP write commands for bank @var{num}.
+The @var{num} parameter is a value shown by @command{flash banks}.
+@end deffn
+
 Note that some devices have been found that have a flash size register that contains
 an invalid value, to workaround this issue you can override the probed value used by
 the flash driver. However, specifying a wrong value might lead to a completely
diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index 89c5ac3fe..492d0dde1 100644
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -171,6 +171,8 @@ struct stm32l4_part_info {
 	const uint32_t flash_regs_base;
 	const uint32_t *default_flash_regs;
 	const uint32_t fsize_addr;
+	const uint32_t otp_base;
+	const uint32_t otp_size;
 };
 
 struct stm32l4_flash_bank {
@@ -183,6 +185,7 @@ struct stm32l4_flash_bank {
 	uint32_t wrpxxr_mask;
 	const struct stm32l4_part_info *part_info;
 	const uint32_t *flash_regs;
+	bool otp_enabled;
 };
 
 /* human readable list of families this drivers supports (sorted alphabetically) */
@@ -263,6 +266,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 	{
 	  .id                    = 0x435,
@@ -274,6 +279,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 	{
 	  .id                    = 0x460,
@@ -285,6 +292,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 	{
 	  .id                    = 0x461,
@@ -296,6 +305,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 	{
 	  .id                    = 0x462,
@@ -307,6 +318,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 	{
 	  .id                    = 0x464,
@@ -318,6 +331,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 	{
 	  .id                    = 0x466,
@@ -329,6 +344,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 	{
 	  .id                    = 0x468,
@@ -340,6 +357,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 	{
 	  .id                    = 0x469,
@@ -351,6 +370,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 	{
 	  .id                    = 0x470,
@@ -362,6 +383,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 	{
 	  .id                    = 0x471,
@@ -373,6 +396,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 	{
 	  .id                    = 0x472,
@@ -384,6 +409,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l5_ns_flash_regs,
 	  .fsize_addr            = 0x0BFA05E0,
+	  .otp_base              = 0x0BFA0000,
+	  .otp_size              = 512,
 	},
 	{
 	  .id                    = 0x479,
@@ -395,6 +422,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x40022000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 	{
 	  .id                    = 0x495,
@@ -406,6 +435,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x58004000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 	{
 	  .id                    = 0x496,
@@ -417,6 +448,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x58004000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 	{
 	  .id                    = 0x497,
@@ -428,6 +461,8 @@ static const struct stm32l4_part_info stm32l4_parts[] = {
 	  .flash_regs_base       = 0x58004000,
 	  .default_flash_regs    = stm32l4_flash_regs,
 	  .fsize_addr            = 0x1FFF75E0,
+	  .otp_base              = 0x1FFF7000,
+	  .otp_size              = 1024,
 	},
 };
 
@@ -439,6 +474,10 @@ FLASH_BANK_COMMAND_HANDLER(stm32l4_flash_bank_command)
 	if (CMD_ARGC < 6)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
+	/* fix-up bank base address: 0 is used for normal flash memory */
+	if (bank->base == 0)
+		bank->base = STM32_FLASH_BANK_BASE;
+
 	stm32l4_info = calloc(1, sizeof(struct stm32l4_flash_bank));
 	if (!stm32l4_info)
 		return ERROR_FAIL; /* Checkme: What better error to use?*/
@@ -449,11 +488,43 @@ FLASH_BANK_COMMAND_HANDLER(stm32l4_flash_bank_command)
 	bank->write_start_alignment = bank->write_end_alignment = 8;
 
 	stm32l4_info->probed = false;
+	stm32l4_info->otp_enabled = false;
 	stm32l4_info->user_bank_size = bank->size;
 
 	return ERROR_OK;
 }
 
+static inline bool stm32l4_is_otp(struct flash_bank *bank)
+{
+	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
+	return bank->base == stm32l4_info->part_info->otp_base;
+}
+
+static int stm32l4_otp_enable(struct flash_bank *bank, bool enable)
+{
+	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
+
+	if (!stm32l4_is_otp(bank))
+		return ERROR_FAIL;
+
+	char *op_str = enable ? "enabled" : "disabled";
+
+	LOG_INFO("OTP memory (bank #%d) is %s%s for write commands",
+			bank->bank_number,
+			stm32l4_info->otp_enabled == enable ? "already " : "",
+			op_str);
+
+	stm32l4_info->otp_enabled = enable;
+
+	return ERROR_OK;
+}
+
+static inline bool stm32l4_otp_is_enabled(struct flash_bank *bank)
+{
+	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
+	return stm32l4_info->otp_enabled;
+}
+
 static inline uint32_t stm32l4_get_flash_reg(struct flash_bank *bank, uint32_t reg_offset)
 {
 	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
@@ -693,6 +764,11 @@ static int stm32l4_erase(struct flash_bank *bank, unsigned int first,
 
 	assert((first <= last) && (last < bank->num_sectors));
 
+	if (stm32l4_is_otp(bank)) {
+		LOG_ERROR("cannot erase OTP memory");
+		return ERROR_FLASH_OPER_UNSUPPORTED;
+	}
+
 	if (bank->target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
@@ -749,6 +825,11 @@ static int stm32l4_protect(struct flash_bank *bank, int set, unsigned int first,
 	struct target *target = bank->target;
 	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
 
+	if (stm32l4_is_otp(bank)) {
+		LOG_ERROR("cannot protect/unprotect OTP memory");
+		return ERROR_FLASH_OPER_UNSUPPORTED;
+	}
+
 	if (target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
@@ -883,6 +964,11 @@ static int stm32l4_write(struct flash_bank *bank, const uint8_t *buffer,
 {
 	int retval = ERROR_OK, retval2;
 
+	if (stm32l4_is_otp(bank) && !stm32l4_otp_is_enabled(bank)) {
+		LOG_ERROR("OTP memory is disabled for write commands");
+		return ERROR_FAIL;
+	}
+
 	if (bank->target->state != TARGET_HALTED) {
 		LOG_ERROR("Target not halted");
 		return ERROR_TARGET_NOT_HALTED;
@@ -1001,6 +1087,29 @@ static int stm32l4_probe(struct flash_bank *bank)
 
 	LOG_INFO("device idcode = 0x%08" PRIx32 " (%s)", stm32l4_info->idcode, device_info);
 
+	if (stm32l4_is_otp(bank)) {
+		bank->size = part_info->otp_size;
+
+		LOG_INFO("OTP size is %d bytes, base address is " TARGET_ADDR_FMT, bank->size, bank->base);
+
+		/* OTP memory is considered as one sector */
+		free(bank->sectors);
+		bank->num_sectors = 1;
+		bank->sectors = alloc_block_array(0, part_info->otp_size, 1);
+
+		if (!bank->sectors) {
+			LOG_ERROR("failed to allocate bank sectors");
+			return ERROR_FAIL;
+		}
+
+
+		stm32l4_info->probed = true;
+		return ERROR_OK;
+	} else if (bank->base != STM32_FLASH_BANK_BASE) {
+		LOG_ERROR("invalid bank base address");
+		return ERROR_FAIL;
+	}
+
 	/* get flash size from target. */
 	retval = target_read_u16(target, part_info->fsize_addr, &flash_size_kb);
 
@@ -1175,7 +1284,6 @@ static int stm32l4_probe(struct flash_bank *bank)
 	free(bank->sectors);
 
 	bank->size = (flash_size_kb + gap_size_kb) * 1024;
-	bank->base = STM32_FLASH_BANK_BASE;
 	bank->num_sectors = num_pages;
 	bank->sectors = malloc(sizeof(struct flash_sector) * bank->num_sectors);
 	if (bank->sectors == NULL) {
@@ -1227,6 +1335,7 @@ static int get_stm32l4_info(struct flash_bank *bank, char *buf, int buf_size)
 
 		if (stm32l4_info->probed)
 			snprintf(buf + buf_len, buf_size - buf_len, " - %s-bank",
+					stm32l4_is_otp(bank) ? "OTP" :
 					stm32l4_info->dual_bank_mode ? "Flash dual" : "Flash single");
 
 		return ERROR_OK;
@@ -1244,6 +1353,11 @@ static int stm32l4_mass_erase(struct flash_bank *bank)
 	struct target *target = bank->target;
 	struct stm32l4_flash_bank *stm32l4_info = bank->driver_priv;
 
+	if (stm32l4_is_otp(bank)) {
+		LOG_ERROR("cannot erase OTP memory");
+		return ERROR_FLASH_OPER_UNSUPPORTED;
+	}
+
 	uint32_t action = FLASH_MER1;
 
 	if (stm32l4_info->part_info->has_dual_bank)
@@ -1410,6 +1524,11 @@ COMMAND_HANDLER(stm32l4_handle_lock_command)
 	if (ERROR_OK != retval)
 		return retval;
 
+	if (stm32l4_is_otp(bank)) {
+		LOG_ERROR("cannot lock/unlock OTP memory");
+		return ERROR_FLASH_OPER_UNSUPPORTED;
+	}
+
 	target = bank->target;
 
 	if (target->state != TARGET_HALTED) {
@@ -1439,6 +1558,11 @@ COMMAND_HANDLER(stm32l4_handle_unlock_command)
 	if (ERROR_OK != retval)
 		return retval;
 
+	if (stm32l4_is_otp(bank)) {
+		LOG_ERROR("cannot lock/unlock OTP memory");
+		return ERROR_FLASH_OPER_UNSUPPORTED;
+	}
+
 	target = bank->target;
 
 	if (target->state != TARGET_HALTED) {
@@ -1456,6 +1580,33 @@ COMMAND_HANDLER(stm32l4_handle_unlock_command)
 	return ERROR_OK;
 }
 
+COMMAND_HANDLER(stm32l4_handle_otp_command)
+{
+	if (CMD_ARGC < 2)
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	struct flash_bank *bank;
+	int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank);
+	if (ERROR_OK != retval)
+		return retval;
+
+	if (!stm32l4_is_otp(bank)) {
+		command_print(CMD, "the specified bank is not an OTP memory");
+		return ERROR_FAIL;
+	}
+	if (strcmp(CMD_ARGV[1], "enable") == 0)
+		stm32l4_otp_enable(bank, true);
+	else if (strcmp(CMD_ARGV[1], "disable") == 0)
+		stm32l4_otp_enable(bank, false);
+	else if (strcmp(CMD_ARGV[1], "show") == 0)
+		command_print(CMD, "OTP memory bank #%d is %s for write commands.",
+				bank->bank_number, stm32l4_otp_is_enabled(bank) ? "enabled" : "disabled");
+	else
+		return ERROR_COMMAND_SYNTAX_ERROR;
+
+	return ERROR_OK;
+}
+
 static const struct command_registration stm32l4_exec_command_handlers[] = {
 	{
 		.name = "lock",
@@ -1499,6 +1650,13 @@ static const struct command_registration stm32l4_exec_command_handlers[] = {
 		.usage = "bank_id",
 		.help = "Force re-load of device options (will cause device reset).",
 	},
+	{
+		.name = "otp",
+		.handler = stm32l4_handle_otp_command,
+		.mode = COMMAND_EXEC,
+		.usage = "<bank_id> <enable|disable|show>",
+		.help = "OTP (One Time Programmable) memory write enable/disable",
+	},
 	COMMAND_REGISTRATION_DONE
 };
 
diff --git a/tcl/target/stm32g0x.cfg b/tcl/target/stm32g0x.cfg
index 50836ea82..7df530655 100644
--- a/tcl/target/stm32g0x.cfg
+++ b/tcl/target/stm32g0x.cfg
@@ -38,8 +38,8 @@ target create $_TARGETNAME cortex_m -endian $_ENDIAN -dap $_CHIPNAME.dap
 
 $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
 
-set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME stm32l4x 0 0 0 0 $_TARGETNAME
+flash bank $_CHIPNAME.flash stm32l4x 0x08000000 0 0 0 $_TARGETNAME
+flash bank $_CHIPNAME.otp   stm32l4x 0x1fff7000 0 0 0 $_TARGETNAME
 
 # reasonable default
 adapter speed 2000
diff --git a/tcl/target/stm32g4x.cfg b/tcl/target/stm32g4x.cfg
index 9f144a07e..360447bd5 100644
--- a/tcl/target/stm32g4x.cfg
+++ b/tcl/target/stm32g4x.cfg
@@ -47,8 +47,8 @@ target create $_TARGETNAME cortex_m -endian $_ENDIAN -dap $_CHIPNAME.dap
 
 $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
 
-set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME stm32l4x 0 0 0 0 $_TARGETNAME
+flash bank $_CHIPNAME.flash stm32l4x 0x08000000 0 0 0 $_TARGETNAME
+flash bank $_CHIPNAME.otp   stm32l4x 0x1fff7000 0 0 0 $_TARGETNAME
 
 if { [info exists QUADSPI] && $QUADSPI } {
 	set a [llength [flash list]]
diff --git a/tcl/target/stm32l4x.cfg b/tcl/target/stm32l4x.cfg
index 7f08f3c4b..589979193 100644
--- a/tcl/target/stm32l4x.cfg
+++ b/tcl/target/stm32l4x.cfg
@@ -47,8 +47,8 @@ target create $_TARGETNAME cortex_m -endian $_ENDIAN -dap $_CHIPNAME.dap
 
 $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
 
-set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME stm32l4x 0 0 0 0 $_TARGETNAME
+flash bank $_CHIPNAME.flash stm32l4x 0x08000000 0 0 0 $_TARGETNAME
+flash bank $_CHIPNAME.otp   stm32l4x 0x1fff7000 0 0 0 $_TARGETNAME
 
 if { [info exists QUADSPI] && $QUADSPI } {
    set a [llength [flash list]]
diff --git a/tcl/target/stm32l5x.cfg b/tcl/target/stm32l5x.cfg
index bf5636094..92083b9e0 100644
--- a/tcl/target/stm32l5x.cfg
+++ b/tcl/target/stm32l5x.cfg
@@ -53,7 +53,8 @@ target create $_TARGETNAME cortex_m -endian $_ENDIAN -dap $_CHIPNAME.dap
 $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
 
 # declare non-secure flash
-flash bank $_CHIPNAME.flash_ns stm32l4x 0 0 0 0 $_TARGETNAME
+flash bank $_CHIPNAME.flash_ns stm32l4x 0x08000000 0 0 0 $_TARGETNAME
+flash bank $_CHIPNAME.otp      stm32l4x 0x0BFA0000 0 0 0 $_TARGETNAME
 
 # Common knowledges tells JTAG speed should be <= F_CPU/6.
 # F_CPU after reset is MSI 4MHz, so use F_JTAG = 500 kHz to stay on
diff --git a/tcl/target/stm32wbx.cfg b/tcl/target/stm32wbx.cfg
index 90f53bb96..6467667de 100644
--- a/tcl/target/stm32wbx.cfg
+++ b/tcl/target/stm32wbx.cfg
@@ -46,8 +46,8 @@ target create $_TARGETNAME cortex_m -endian $_ENDIAN -dap $_CHIPNAME.dap
 
 $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
 
-set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME stm32l4x 0 0 0 0 $_TARGETNAME
+flash bank $_CHIPNAME.flash stm32l4x 0x08000000 0 0 0 $_TARGETNAME
+flash bank $_CHIPNAME.otp   stm32l4x 0x1fff7000 0 0 0 $_TARGETNAME
 
 # Common knowledges tells JTAG speed should be <= F_CPU/6.
 # F_CPU after reset is MSI 4MHz, so use F_JTAG = 500 kHz to stay on
diff --git a/tcl/target/stm32wlx.cfg b/tcl/target/stm32wlx.cfg
index ba16fab6b..961850ad1 100644
--- a/tcl/target/stm32wlx.cfg
+++ b/tcl/target/stm32wlx.cfg
@@ -46,8 +46,8 @@ target create $_TARGETNAME cortex_m -endian $_ENDIAN -dap $_CHIPNAME.dap
 
 $_TARGETNAME configure -work-area-phys 0x20000000 -work-area-size $_WORKAREASIZE -work-area-backup 0
 
-set _FLASHNAME $_CHIPNAME.flash
-flash bank $_FLASHNAME stm32l4x 0 0 0 0 $_TARGETNAME
+flash bank $_CHIPNAME.flash stm32l4x 0x08000000 0 0 0 $_TARGETNAME
+flash bank $_CHIPNAME.otp   stm32l4x 0x1fff7000 0 0 0 $_TARGETNAME
 
 # Common knowledges tells JTAG speed should be <= F_CPU/6.
 # F_CPU after reset is MSI 4MHz, so use F_JTAG = 500 kHz to stay on

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

Summary of changes:
 doc/openocd.texi         |  11 ++++
 src/flash/nor/stm32l4x.c | 160 ++++++++++++++++++++++++++++++++++++++++++++++-
 tcl/target/stm32g0x.cfg  |   4 +-
 tcl/target/stm32g4x.cfg  |   4 +-
 tcl/target/stm32l4x.cfg  |   4 +-
 tcl/target/stm32l5x.cfg  |   3 +-
 tcl/target/stm32wbx.cfg  |   4 +-
 tcl/target/stm32wlx.cfg  |   4 +-
 8 files changed, 182 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-58-gf13bb10e2

[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  f13bb10e267f9d474901a0f7b4fbb2975920668c (commit)
      from  b5889776339eb1a3106cc4639b43d9c58b573ec6 (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 f13bb10e267f9d474901a0f7b4fbb2975920668c
Author: Tomas Vanek <va...@fb...>
Date:   Tue Dec 22 09:24:59 2020 +0100

    flash/nor/atsame5: add SAME51G18A and SAME51G19A devices
    
    Change-Id: Icbb49c76594152e9c5da1c7465675de26c86540e
    Signed-off-by: Tomas Vanek <va...@fb...>
    Reported-by: mik...@us...
    Fixes: https://sourceforge.net/p/openocd/tickets/288/
    Reviewed-on: http://openocd.zylin.com/5984
    Tested-by: jenkins

diff --git a/src/flash/nor/atsame5.c b/src/flash/nor/atsame5.c
index ed0bef463..50e56a72a 100644
--- a/src/flash/nor/atsame5.c
+++ b/src/flash/nor/atsame5.c
@@ -113,7 +113,7 @@ struct samd_part {
 };
 
 /* See SAM D5x/E5x Family Silicon Errata and Data Sheet Clarification
- * DS80000748B */
+ * DS80000748K */
 /* Known SAMD51 parts. */
 static const struct samd_part samd51_parts[] = {
 	{ 0x00, "SAMD51P20A", 1024, 256 },
@@ -134,6 +134,8 @@ static const struct samd_part same51_parts[] = {
 	{ 0x02, "SAME51J19A", 512, 192 },
 	{ 0x03, "SAME51J18A", 256, 128 },
 	{ 0x04, "SAME51J20A", 1024, 256 },
+	{ 0x05, "SAME51G19A", 512, 192 },	/* New in rev D */
+	{ 0x06, "SAME51G18A", 256, 128 },	/* New in rev D */
 };
 
 /* Known SAME53 parts. */

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

Summary of changes:
 src/flash/nor/atsame5.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-57-gb58897763

[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  b5889776339eb1a3106cc4639b43d9c58b573ec6 (commit)
      from  6448f70e0940d051eb4847231480e4805e99966a (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 b5889776339eb1a3106cc4639b43d9c58b573ec6
Author: Mischa Studer <mis...@cs...>
Date:   Wed Feb 24 13:24:51 2021 +0100

    flash/nor/cfi: fix uninitialized write-mem pointer
    
    In flash/nor/cfi.c:835 struct cfi_info is allocated by malloc(). As
    write-mem was uninitialized the pointer pointed to an out of range
    address, which led to a segmentation fault and crashed openocd.
    This happened during flash-command of an external flash-bank, using
    cfi.
    Use calloc() instead.
    While on it check for NULL return and remove unnecessary initialzation.
    
    Change-Id: I0e2ffb90559afe7f090837023428dcc06b2e29f6
    Signed-off-by: Mischa Studer <mis...@cs...>
    Reviewed-on: http://openocd.zylin.com/6070
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/flash/nor/cfi.c b/src/flash/nor/cfi.c
index 5f5071e69..c9eb38b9b 100644
--- a/src/flash/nor/cfi.c
+++ b/src/flash/nor/cfi.c
@@ -832,17 +832,13 @@ int cfi_flash_bank_cmd(struct flash_bank *bank, unsigned int argc, const char **
 		return ERROR_FLASH_BANK_INVALID;
 	}
 
-	cfi_info = malloc(sizeof(struct cfi_flash_bank));
-	cfi_info->probed = false;
-	cfi_info->erase_region_info = NULL;
-	cfi_info->pri_ext = NULL;
+	cfi_info = calloc(1, sizeof(struct cfi_flash_bank));
+	if (cfi_info == NULL) {
+		LOG_ERROR("No memory for flash bank info");
+		return ERROR_FAIL;
+	}
 	bank->driver_priv = cfi_info;
 
-	cfi_info->x16_as_x8 = false;
-	cfi_info->jedec_probe = false;
-	cfi_info->not_cfi = false;
-	cfi_info->data_swap = false;
-
 	for (unsigned i = 6; i < argc; i++) {
 		if (strcmp(argv[i], "x16_as_x8") == 0)
 			cfi_info->x16_as_x8 = true;

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

Summary of changes:
 src/flash/nor/cfi.c | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-56-g6448f70e0

[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  6448f70e0940d051eb4847231480e4805e99966a (commit)
      from  e15c2e8a8c6369052ec8898f40ec4a82b5495493 (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 6448f70e0940d051eb4847231480e4805e99966a
Author: Andrew Wesie <aw...@gm...>
Date:   Sun Mar 7 17:48:27 2021 +0900

    tcl/interface/ftdi: Add PLS SPC5 debugger config
    
    Change-Id: I694201db0811beebc94e87822c87fbfc6aecc4c4
    Signed-off-by: Andrew Wesie <aw...@gm...>
    Reviewed-on: http://openocd.zylin.com/6081
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/contrib/60-openocd.rules b/contrib/60-openocd.rules
index 36bdb5318..0358b6010 100644
--- a/contrib/60-openocd.rules
+++ b/contrib/60-openocd.rules
@@ -163,6 +163,9 @@ ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="02a5", MODE="660", GROUP="plugdev",
 # TI Tiva-based ICDI and XDS110 probes in DFU mode
 ATTRS{idVendor}=="1cbe", ATTRS{idProduct}=="00ff", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
+# PLS USB/JTAG Adapter for SPC5xxx
+ATTRS{idVendor}=="263d", ATTRS{idProduct}=="4001", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
 # Ambiq Micro EVK and Debug boards.
 ATTRS{idVendor}=="2aec", ATTRS{idProduct}=="6010", MODE="660", GROUP="plugdev", TAG+="uaccess"
 ATTRS{idVendor}=="2aec", ATTRS{idProduct}=="6011", MODE="660", GROUP="plugdev", TAG+="uaccess"
diff --git a/tcl/interface/ftdi/pls_spc5.cfg b/tcl/interface/ftdi/pls_spc5.cfg
new file mode 100644
index 000000000..806f920fe
--- /dev/null
+++ b/tcl/interface/ftdi/pls_spc5.cfg
@@ -0,0 +1,36 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# PLS SPC5-UDESTK
+#
+# https://www.st.com/en/development-tools/spc5-udestk.html
+#
+# Reference the SPC56D Discovery schematics.
+#
+# Layout:  FTDI FT2232
+#   ADBUS0 TCK
+#   ADBUS1 TDI
+#   ADBUS2 TDO
+#   ADBUS3 TMS
+#   ADBUS4 TMS
+#   ADBUS5 RTCK
+#   ADBUS6
+#   ADBUS7 LED1
+#
+#   ACBUS0 nTRST
+#   ACBUS1 nSRST (external pull-down)
+#   ACUBS2
+#   ACBUS3
+#   ACBUS4
+#   ACBUS5 nSRST direction (input=L, output=H, external pull-down)
+#   ACBUS6 TMS direction (input=L, output=H, external pull-up)
+#   ACBUS7 LED2
+#
+
+adapter driver ftdi
+ftdi_device_desc "PLS USB/JTAG Adapter for SPC5xxx"
+ftdi_vid_pid 0x263d 0x4001
+
+ftdi_channel 0
+ftdi_layout_init 0x0008 0x000b
+ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100
+ftdi_layout_signal nSRST -ndata 0x2000 -oe 0x2000

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

Summary of changes:
 contrib/60-openocd.rules        |  3 +++
 tcl/interface/ftdi/pls_spc5.cfg | 36 ++++++++++++++++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 tcl/interface/ftdi/pls_spc5.cfg


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-55-ge15c2e8a8

[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  e15c2e8a8c6369052ec8898f40ec4a82b5495493 (commit)
      from  f09aa77c0ca6f9f926be8a4508e9de58284052f6 (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 e15c2e8a8c6369052ec8898f40ec4a82b5495493
Author: Antonio Borneo <bor...@gm...>
Date:   Thu Mar 18 16:14:04 2021 +0100

    README: update requested autoconf version 2.69
    
    Commit 4c00f96fc2e3 ("configure.ac: switch to autoconf 2.69")
    changes the required minor version of autoconf.
    
    Update the README file accordingly.
    
    Change-Id: I98b32b888ff531300f03c4ef9ebcbf8110509e52
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6114
    Tested-by: jenkins
    Reviewed-by: Marc Schink <de...@za...>

diff --git a/README b/README
index fb3051f21..1c5f19277 100644
--- a/README
+++ b/README
@@ -220,7 +220,7 @@ You'll also need:
 
 Additionally, for building from git:
 
-- autoconf >= 2.64
+- autoconf >= 2.69
 - automake >= 1.14
 - texinfo >= 5.0
 

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

Summary of changes:
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-54-gf09aa77c0

[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  f09aa77c0ca6f9f926be8a4508e9de58284052f6 (commit)
      from  08c7b904c38b97f9de72a19196b295652f051268 (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 f09aa77c0ca6f9f926be8a4508e9de58284052f6
Author: Oleksij Rempel <o.r...@pe...>
Date:   Thu Mar 18 18:47:35 2021 +0100

    drivers: USB Blaster II: close file and release USB device if firmware handling failed
    
    In case of some error, the USB device and firmware file are still
    claimed. Make sure refcounting is properly accounted for both cases.
    
    Change-Id: I933114f68e59280e58372c0941a0062fe96ab340
    Signed-off-by: Oleksij Rempel <o.r...@pe...>
    Reviewed-on: http://openocd.zylin.com/6115
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
index 82dc95071..4dec89b11 100644
--- a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
+++ b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
@@ -144,7 +144,7 @@ static int load_usb_blaster_firmware(struct libusb_device_handle *libusb_dev,
 	int ret = image_open(&ublast2_firmware_image, low->firmware_path, "ihex");
 	if (ret != ERROR_OK) {
 		LOG_ERROR("Could not load firmware image");
-		return ret;
+		goto error_release_usb;
 	}
 
 	/** A host loader program must write 0x01 to the CPUCS register
@@ -172,7 +172,7 @@ static int load_usb_blaster_firmware(struct libusb_device_handle *libusb_dev,
 						     &ublast2_firmware_image, i);
 		if (ret != ERROR_OK) {
 			LOG_ERROR("Error while downloading the firmware");
-			return ret;
+			goto error_close_firmware;
 		}
 	}
 
@@ -187,8 +187,10 @@ static int load_usb_blaster_firmware(struct libusb_device_handle *libusb_dev,
 				     1,
 				     100);
 
+error_close_firmware:
 	image_close(&ublast2_firmware_image);
 
+error_release_usb:
 	/*
 	 * Release claimed interface. Most probably it is already disconnected
 	 * and re-enumerated as new devices after firmware upload, so we do
@@ -196,7 +198,7 @@ static int load_usb_blaster_firmware(struct libusb_device_handle *libusb_dev,
 	 */
 	libusb_release_interface(libusb_dev, 0);
 
-	return ERROR_OK;
+	return ret;
 }
 
 static int ublast2_libusb_init(struct ublast_lowlevel *low)

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

Summary of changes:
 src/jtag/drivers/usb_blaster/ublast2_access_libusb.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-53-g08c7b904c

[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  08c7b904c38b97f9de72a19196b295652f051268 (commit)
       via  eca4f964b47d317a0eb4b148f11588cec0e3bf60 (commit)
      from  6db49eb8858023654084088c73d968e190aec491 (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 08c7b904c38b97f9de72a19196b295652f051268
Author: Oleksij Rempel <o.r...@pe...>
Date:   Tue Feb 12 13:51:54 2019 +0100

    drivers: USB Blaster II: claim interface before using it
    
    If not, multiple instances of OOCD can concurrently use it.
    
    Change-Id: I48cc9d90521d1dcc7720c6e8bec74f45972d16f7
    Signed-off-by: Oleksij Rempel <o.r...@pe...>
    Reviewed-on: http://openocd.zylin.com/4589
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
index 6f15fa70a..82dc95071 100644
--- a/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
+++ b/src/jtag/drivers/usb_blaster/ublast2_access_libusb.c
@@ -133,6 +133,11 @@ static int load_usb_blaster_firmware(struct libusb_device_handle *libusb_dev,
 		return ERROR_FAIL;
 	}
 
+	if (libusb_claim_interface(libusb_dev, 0)) {
+		LOG_ERROR("unable to claim interface");
+		return ERROR_JTAG_INIT_FAILED;
+	}
+
 	ublast2_firmware_image.base_address = 0;
 	ublast2_firmware_image.base_address_set = false;
 
@@ -184,6 +189,13 @@ static int load_usb_blaster_firmware(struct libusb_device_handle *libusb_dev,
 
 	image_close(&ublast2_firmware_image);
 
+	/*
+	 * Release claimed interface. Most probably it is already disconnected
+	 * and re-enumerated as new devices after firmware upload, so we do
+	 * not need to care about errors.
+	 */
+	libusb_release_interface(libusb_dev, 0);
+
 	return ERROR_OK;
 }
 
@@ -228,6 +240,12 @@ static int ublast2_libusb_init(struct ublast_lowlevel *low)
 		}
 	}
 
+	if (libusb_claim_interface(low->libusb_dev, 0)) {
+		LOG_ERROR("unable to claim interface");
+		jtag_libusb_close(low->libusb_dev);
+		return ERROR_JTAG_INIT_FAILED;
+	}
+
 	char buffer[5];
 	jtag_libusb_control_transfer(low->libusb_dev,
 				     LIBUSB_REQUEST_TYPE_VENDOR |
@@ -246,6 +264,9 @@ static int ublast2_libusb_init(struct ublast_lowlevel *low)
 
 static int ublast2_libusb_quit(struct ublast_lowlevel *low)
 {
+	if (libusb_release_interface(low->libusb_dev, 0))
+		LOG_ERROR("usb release interface failed");
+
 	jtag_libusb_close(low->libusb_dev);
 	return ERROR_OK;
 };

commit eca4f964b47d317a0eb4b148f11588cec0e3bf60
Author: Evgeniy Didin <di...@sy...>
Date:   Mon Mar 15 16:30:13 2021 +0300

    target/arc: refactor ARC register numbers defines
    
    For Zephyr rtos support it is necessary to define general register
    numbers for architecture. There were some already in arc.h file.
    Let's define ARC registers numbers as a set instead of separate defines.
    
    Change-Id: I63742b8608f9556c2ec9bd2661a0fd9cf88e9b74
    Signed-off-by: Evgeniy Didin <di...@sy...>
    Reviewed-on: http://openocd.zylin.com/6105
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/arc.c b/src/target/arc.c
index 8e568455e..694ac6f85 100644
--- a/src/target/arc.c
+++ b/src/target/arc.c
@@ -227,7 +227,7 @@ static int arc_get_register(struct reg *reg)
 
 	if (desc->is_core) {
 		/* Accessing to R61/R62 registers causes Jtag hang */
-		if (desc->arch_num == CORE_R61_NUM || desc->arch_num == CORE_R62_NUM) {
+		if (desc->arch_num == ARC_R61 || desc->arch_num == ARC_R62) {
 			LOG_ERROR("It is forbidden to read core registers 61 and 62.");
 			return ERROR_FAIL;
 		}
@@ -267,8 +267,8 @@ static int arc_set_register(struct reg *reg, uint8_t *buf)
 		return ERROR_TARGET_NOT_HALTED;
 
 	/* Accessing to R61/R62 registers causes Jtag hang */
-	if (desc->is_core && (desc->arch_num == CORE_R61_NUM ||
-			desc->arch_num == CORE_R62_NUM)) {
+	if (desc->is_core && (desc->arch_num == ARC_R61 ||
+			desc->arch_num == ARC_R62)) {
 		LOG_ERROR("It is forbidden to write core registers 61 and 62.");
 		return ERROR_FAIL;
 	}
diff --git a/src/target/arc.h b/src/target/arc.h
index aeb326cb5..8d44bfa41 100644
--- a/src/target/arc.h
+++ b/src/target/arc.h
@@ -45,9 +45,52 @@
 #define AUX_STATUS32_REG_HALT_BIT       BIT(0)
 #define AUX_STATUS32_REG_IE_BIT         BIT(31)    /* STATUS32[31] = IE field */
 
-/* Reserved core registers */
-#define CORE_R61_NUM			(61)
-#define CORE_R62_NUM			(62)
+/* ARC register numbers */
+enum {
+	ARC_R0,
+	ARC_R1,
+	ARC_R2,
+	ARC_R3,
+	ARC_R4,
+	ARC_R5,
+	ARC_R6,
+	ARC_R7,
+	ARC_R8,
+	ARC_R9,
+	ARC_R10,
+	ARC_R11,
+	ARC_R12,
+	ARC_R13,
+	ARC_R14,
+	ARC_R15,
+	ARC_R16,
+	ARC_R17,
+	ARC_R18,
+	ARC_R19,
+	ARC_R20,
+	ARC_R21,
+	ARC_R22,
+	ARC_R23,
+	ARC_R24,
+	ARC_R25,
+	ARC_GP		= 26,
+	ARC_FP		= 27,
+	ARC_SP		= 28,
+	ARC_ILINK	= 29,
+	ARC_R30,
+	ARC_BLINK	= 31,
+	ARC_LP_COUNT	= 60,
+
+	/* Reserved registers */
+	ARC_R61		= 61,
+	ARC_R62		= 62,
+
+	ARC_PCL		= 63,
+	ARC_PC		= 64,
+	ARC_LP_START	= 65,
+	ARC_LP_END	= 66,
+	ARC_STATUS32	= 67,
+};
 
 #define CORE_REG_MAX_NUMBER		(63)
 
diff --git a/src/target/arc_cmd.c b/src/target/arc_cmd.c
index 18f5cb8f4..5c5247b88 100644
--- a/src/target/arc_cmd.c
+++ b/src/target/arc_cmd.c
@@ -382,7 +382,7 @@ static int jim_arc_get_core_reg(Jim_Interp *interp, int argc, Jim_Obj * const *a
 
 	/* Register number */
 	JIM_CHECK_RETVAL(arc_cmd_jim_get_uint32(&goi, &regnum));
-	if (regnum > CORE_REG_MAX_NUMBER || regnum == CORE_R61_NUM || regnum == CORE_R62_NUM) {
+	if (regnum > CORE_REG_MAX_NUMBER || regnum == ARC_R61 || regnum == ARC_R62) {
 		Jim_SetResultFormatted(goi.interp, "Core register number %i "
 			"is invalid. Must less then 64 and not 61 and 62.", regnum);
 		return JIM_ERR;
@@ -425,7 +425,7 @@ static int jim_arc_set_core_reg(Jim_Interp *interp, int argc, Jim_Obj * const *a
 
 	/* Register number */
 	JIM_CHECK_RETVAL(arc_cmd_jim_get_uint32(&goi, &regnum));
-	if (regnum > CORE_REG_MAX_NUMBER || regnum == CORE_R61_NUM || regnum == CORE_R62_NUM) {
+	if (regnum > CORE_REG_MAX_NUMBER || regnum == ARC_R61 || regnum == ARC_R62) {
 		Jim_SetResultFormatted(goi.interp, "Core register number %i "
 			"is invalid. Must less then 64 and not 61 and 62.", regnum);
 		return JIM_ERR;

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

Summary of changes:
 .../drivers/usb_blaster/ublast2_access_libusb.c    | 21 ++++++++++
 src/target/arc.c                                   |  6 +--
 src/target/arc.h                                   | 49 ++++++++++++++++++++--
 src/target/arc_cmd.c                               |  4 +-
 4 files changed, 72 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-51-g6db49eb88

[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  6db49eb8858023654084088c73d968e190aec491 (commit)
      from  84af95bb54926f9cec10673362457aa99415c0cd (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 6db49eb8858023654084088c73d968e190aec491
Author: Rene Kita <gi...@rk...>
Date:   Fri Mar 12 18:38:02 2021 +0100

    build: remove warnings with gcc 11
    
    This removes some warnings which prevent a successful build with -Werror
    which is enabled by default. I'm using gcc 11, so maybe others are not
    getting this warnings yet.
    
    In src/flash/nor/numicro.c the debug messages were misleadingly indented.
    In src/target/arm920t.c the array size where smaller than expected from
    the receiving function.
    
    Change-Id: I66f5c6a63beb9f9416e73b726299297476c884d8
    Signed-off-by: Rene Kita <gi...@rk...>
    Reviewed-on: http://openocd.zylin.com/6104
    Reviewed-by: Jonathan McDowell <noo...@ea...>
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/flash/nor/numicro.c b/src/flash/nor/numicro.c
index 7609fa81c..1971daa24 100644
--- a/src/flash/nor/numicro.c
+++ b/src/flash/nor/numicro.c
@@ -1243,7 +1243,7 @@ static uint32_t numicro_fmc_cmd(struct target *target, uint32_t cmd, uint32_t ad
 		retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG, &status);
 		if (retval != ERROR_OK)
 			return retval;
-			LOG_DEBUG("status: 0x%" PRIx32 "", status);
+		LOG_DEBUG("status: 0x%" PRIx32 "", status);
 		if ((status & (ISPTRG_ISPGO)) == 0)
 			break;
 		if (timeout-- <= 0) {
@@ -1512,7 +1512,7 @@ static int numicro_erase(struct flash_bank *bank, unsigned int first,
 			retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG, &status);
 			if (retval != ERROR_OK)
 				return retval;
-				LOG_DEBUG("status: 0x%" PRIx32 "", status);
+			LOG_DEBUG("status: 0x%" PRIx32 "", status);
 			if (status == 0)
 				break;
 			if (timeout-- <= 0) {
@@ -1601,7 +1601,7 @@ static int numicro_write(struct flash_bank *bank, const uint8_t *buffer,
 				retval = target_read_u32(target, NUMICRO_FLASH_ISPTRG, &status);
 				if (retval != ERROR_OK)
 					return retval;
-					LOG_DEBUG("status: 0x%" PRIx32 "", status);
+				LOG_DEBUG("status: 0x%" PRIx32 "", status);
 				if (status == 0)
 					break;
 				if (timeout-- <= 0) {
diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index 80f6d7045..a45dc6420 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -245,8 +245,8 @@ static int arm920t_read_cp15_interpreted(struct target *target,
 	uint32_t cp15_opcode, uint32_t address, uint32_t *value)
 {
 	struct arm *arm = target_to_arm(target);
-	uint32_t *regs_p[1];
-	uint32_t regs[2];
+	uint32_t *regs_p[16];
+	uint32_t regs[16];
 	uint32_t cp15c15 = 0x0;
 	struct reg *r = arm->core_cache->reg_list;
 
@@ -295,7 +295,7 @@ int arm920t_write_cp15_interpreted(struct target *target,
 {
 	uint32_t cp15c15 = 0x0;
 	struct arm *arm = target_to_arm(target);
-	uint32_t regs[2];
+	uint32_t regs[16];
 	struct reg *r = arm->core_cache->reg_list;
 
 	/* load value, address into R0, R1 */

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

Summary of changes:
 src/flash/nor/numicro.c | 6 +++---
 src/target/arm920t.c    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-50-g84af95bb5

[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  84af95bb54926f9cec10673362457aa99415c0cd (commit)
       via  7bc687ade5b338bc182c4e69f35e05a2db00ca9f (commit)
      from  78462af05feec1627474d26a2c91fcdada5b180e (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 84af95bb54926f9cec10673362457aa99415c0cd
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Wed Oct 14 18:07:14 2020 +0100

    aarch64: handle semihosting in aarch32 state
    
    Change-Id: I0e868d617db126a2b258e27b11979b75b5bb72f5
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/5860
    Tested-by: jenkins
    Reviewed-by: Matthias Welwarsky <mat...@we...>
    Reviewed-by: Antonio Borneo <bor...@gm...>

diff --git a/src/target/arm_semihosting.c b/src/target/arm_semihosting.c
index 723be577e..9de7048f4 100644
--- a/src/target/arm_semihosting.c
+++ b/src/target/arm_semihosting.c
@@ -123,6 +123,22 @@ static int post_result(struct target *target)
 			uint64_t pc = buf_get_u64(arm->core_cache->reg_list[32].value, 0, 64);
 			buf_set_u64(arm->pc->value, 0, 64, pc + 4);
 			arm->pc->dirty = true;
+		}  else if (arm->core_state == ARM_STATE_ARM) {
+			/* return value in R0 */
+			buf_set_u32(arm->core_cache->reg_list[0].value, 0, 32, target->semihosting->result);
+			arm->core_cache->reg_list[0].dirty = true;
+
+			uint32_t pc = buf_get_u32(arm->core_cache->reg_list[32].value, 0, 32);
+			buf_set_u32(arm->pc->value, 0, 32, pc + 4);
+			arm->pc->dirty = true;
+		} else if (arm->core_state == ARM_STATE_THUMB) {
+			/* return value in R0 */
+			buf_set_u32(arm->core_cache->reg_list[0].value, 0, 32, target->semihosting->result);
+			arm->core_cache->reg_list[0].dirty = true;
+
+			uint32_t pc = buf_get_u32(arm->core_cache->reg_list[32].value, 0, 32);
+			buf_set_u32(arm->pc->value, 0, 32, pc + 2);
+			arm->pc->dirty = true;
 		}
 	} else {
 		/* resume execution, this will be pc+2 to skip over the
@@ -275,6 +291,16 @@ int arm_semihosting(struct target *target, int *retval)
 		if (target->debug_reason != DBG_REASON_BREAKPOINT)
 			return 0;
 
+		/* According to ARM Semihosting for AArch32 and AArch64:
+		 * The HLT encodings are new in version 2.0 of the semihosting specification.
+		 * Where possible, have semihosting callers continue to use the previously
+		 * existing trap instructions to ensure compatibility with legacy semihosting
+		 * implementations.
+		 * These trap instructions are HLT for A64, SVC on A+R profile A32 or T32,
+		 * and BKPT on M profile.
+		 * However, it is necessary to change from SVC to HLT instructions to support
+		 * AArch32 semihosting properly in a mixed AArch32/AArch64 system. */
+
 		if (arm->core_state == ARM_STATE_AARCH64) {
 			uint32_t insn = 0;
 			r = arm->pc;
@@ -284,9 +310,38 @@ int arm_semihosting(struct target *target, int *retval)
 			if (*retval != ERROR_OK)
 				return 1;
 
-			/* bkpt 0xAB */
+			/* HLT 0xF000 */
 			if (insn != 0xD45E0000)
 				return 0;
+		} else if (arm->core_state == ARM_STATE_ARM) {
+			r = arm->pc;
+			pc = buf_get_u32(arm->pc->value, 0, 32);
+
+			/* A32 instruction => check for HLT 0xF000 (0xE10F0070) */
+			uint32_t insn = 0;
+
+			*retval = target_read_u32(target, pc, &insn);
+
+			if (*retval != ERROR_OK)
+				return 1;
+
+			/* HLT 0xF000*/
+			if (insn != 0xE10F0070)
+				return 0;
+		} else if (arm->core_state == ARM_STATE_THUMB) {
+			r = arm->pc;
+			pc = buf_get_u32(arm->pc->value, 0, 32);
+
+			/* T32 instruction => check for HLT 0x3C (0xBABC) */
+			uint16_t insn = 0;
+			*retval = target_read_u16(target, pc, &insn);
+
+			if (*retval != ERROR_OK)
+				return 1;
+
+			/* HLT 0x3C*/
+			if (insn != 0xBABC)
+				return 0;
 		} else
 			return 1;
 	} else {
diff --git a/src/target/armv8.c b/src/target/armv8.c
index 95efdc90b..6bf3b110d 100644
--- a/src/target/armv8.c
+++ b/src/target/armv8.c
@@ -1098,13 +1098,6 @@ int armv8_handle_cache_info_command(struct command_invocation *cmd,
 
 static int armv8_setup_semihosting(struct target *target, int enable)
 {
-	struct arm *arm = target_to_arm(target);
-
-	if (arm->core_state != ARM_STATE_AARCH64) {
-		LOG_ERROR("semihosting only supported in AArch64 state\n");
-		return ERROR_FAIL;
-	}
-
 	return ERROR_OK;
 }
 

commit 7bc687ade5b338bc182c4e69f35e05a2db00ca9f
Author: Andrew Wesie <aw...@gm...>
Date:   Wed Mar 17 10:23:16 2021 -0500

    tcl/interface/ftdi: Add miniWiggler debugger config
    
    Change-Id: I91f73a377cd9525008d09fda7a7c58d498014b74
    Signed-off-by: Andrew Wesie <aw...@gm...>
    Reviewed-on: http://openocd.zylin.com/6111
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Tested-by: jenkins

diff --git a/contrib/60-openocd.rules b/contrib/60-openocd.rules
index e0864b827..36bdb5318 100644
--- a/contrib/60-openocd.rules
+++ b/contrib/60-openocd.rules
@@ -90,6 +90,9 @@ ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="f139", MODE="660", GROUP="plugdev",
 # Cypress KitProg in CMSIS-DAP mode
 ATTRS{idVendor}=="04b4", ATTRS{idProduct}=="f138", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
+# Infineon DAP miniWiggler v3
+ATTRS{idVendor}=="058b", ATTRS{idProduct}=="0043", MODE="660", GROUP="plugdev", TAG+="uaccess"
+
 # Hilscher NXHX Boards
 ATTRS{idVendor}=="0640", ATTRS{idProduct}=="0028", MODE="660", GROUP="plugdev", TAG+="uaccess"
 
diff --git a/tcl/interface/ftdi/miniwiggler.cfg b/tcl/interface/ftdi/miniwiggler.cfg
new file mode 100644
index 000000000..6e53daede
--- /dev/null
+++ b/tcl/interface/ftdi/miniwiggler.cfg
@@ -0,0 +1,34 @@
+# SPDX-License-Identifier: GPL-2.0-or-later
+#
+# Infineon DAP miniWiggler V3
+#
+# https://www.infineon.com/cms/en/product/evaluation-boards/kit_miniwiggler_3_usb/
+#
+# Layout:  FTDI FT2232
+#   ADBUS0 TCK
+#   ADBUS1 TDI
+#   ADBUS2 TDO
+#   ADBUS3 TMS
+#   ADBUS4 nOE (output enable)
+#   ADBUS5
+#   ADBUS6
+#   ADBUS7 Blue LED
+#
+#   ACBUS0 nTRST
+#   ACBUS1 nSRST
+#   ACUBS2
+#   ACBUS3
+#   ACBUS4
+#   ACBUS5
+#   ACBUS6
+#   ACBUS7
+#
+
+adapter driver ftdi
+ftdi_device_desc "DAS JDS miniWiggler V3.1"
+ftdi_vid_pid 0x058b 0x0043
+
+ftdi_channel 0
+ftdi_layout_init 0x0008 0x001b
+ftdi_layout_signal nTRST -data 0x0100 -oe 0x0100
+ftdi_layout_signal nSRST -data 0x0200 -oe 0x0200

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

Summary of changes:
 contrib/60-openocd.rules           |  3 ++
 src/target/arm_semihosting.c       | 57 +++++++++++++++++++++++++++++++++++++-
 src/target/armv8.c                 |  7 -----
 tcl/interface/ftdi/miniwiggler.cfg | 34 +++++++++++++++++++++++
 4 files changed, 93 insertions(+), 8 deletions(-)
 create mode 100644 tcl/interface/ftdi/miniwiggler.cfg


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-48-g78462af05

[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  78462af05feec1627474d26a2c91fcdada5b180e (commit)
      from  41147e6fcde9bbbc485e35f6a9270907b2e38513 (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 78462af05feec1627474d26a2c91fcdada5b180e
Author: Tarek BOCHKATI <tar...@gm...>
Date:   Thu Mar 11 00:36:17 2021 +0100

    telnet: support end and home keys
    
    this will help navigate to the line start and end easily
    
    Change-Id: I3f42eb5267df64c59a85ece67de5fce39a8843ec
    Signed-off-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-on: http://openocd.zylin.com/6094
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Tested-by: jenkins

diff --git a/src/server/telnet_server.c b/src/server/telnet_server.c
index 407ab68ae..e9de4f033 100644
--- a/src/server/telnet_server.c
+++ b/src/server/telnet_server.c
@@ -596,6 +596,12 @@ static int telnet_input(struct connection *connection)
 						telnet_history_up(connection);
 					} else if (*buf_p == 'B') {	/* cursor down */
 						telnet_history_down(connection);
+					} else if (*buf_p == 'F') { /* end key */
+						telnet_move_cursor(connection, t_con->line_size);
+						t_con->state = TELNET_STATE_DATA;
+					} else if (*buf_p == 'H') { /* home key */
+						telnet_move_cursor(connection, 0);
+						t_con->state = TELNET_STATE_DATA;
 					} else if (*buf_p == '3')
 						t_con->last_escape = *buf_p;
 					else

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

Summary of changes:
 src/server/telnet_server.c | 6 ++++++
 1 file changed, 6 insertions(+)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-47-g41147e6fc

[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  41147e6fcde9bbbc485e35f6a9270907b2e38513 (commit)
      from  6c0151623cb09da6a80655cedf568db927ae2d93 (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 41147e6fcde9bbbc485e35f6a9270907b2e38513
Author: Tim Newsome <ti...@si...>
Date:   Wed Mar 3 12:41:03 2021 -0800

    Implement CRC32 algorithm for RISC-V.
    
    Signed-off-by: Tim Newsome <ti...@si...>
    Change-Id: Id437f78e74e3d837ff203f84c4eeb996bfad9a01
    Reviewed-on: http://openocd.zylin.com/6076
    Reviewed-by: Jan Matyas <ma...@co...>
    Reviewed-by: Marc Schink <de...@za...>
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Tested-by: jenkins

diff --git a/contrib/loaders/checksum/Makefile b/contrib/loaders/checksum/Makefile
index b9f59b8d8..623e42576 100644
--- a/contrib/loaders/checksum/Makefile
+++ b/contrib/loaders/checksum/Makefile
@@ -6,25 +6,41 @@ ARM_OBJCOPY ?= $(ARM_CROSS_COMPILE)objcopy
 
 ARM_AFLAGS = -EL
 
+RISCV_CROSS_COMPILE ?= riscv64-unknown-elf-
+RISCV_CC      ?= $(RISCV_CROSS_COMPILE)gcc
+RISCV_OBJCOPY ?= $(RISCV_CROSS_COMPILE)objcopy
+RISCV32_CFLAGS = -march=rv32e -mabi=ilp32e -nostdlib -nostartfiles -Os -fPIC
+RISCV64_CFLAGS = -march=rv64i -mabi=lp64 -nostdlib -nostartfiles -Os -fPIC
+
+all:	arm riscv
+
 arm: armv4_5_crc.inc armv7m_crc.inc
 
+riscv:	riscv32_crc.inc riscv64_crc.inc
+
 armv4_5_%.elf: armv4_5_%.s
 	$(ARM_AS) $(ARM_AFLAGS) $< -o $@
 
 armv4_5_%.bin: armv4_5_%.elf
 	$(ARM_OBJCOPY) -Obinary $< $@
 
-armv4_5_%.inc: armv4_5_%.bin
-	$(BIN2C) < $< > $@
-
 armv7m_%.elf: armv7m_%.s
 	$(ARM_AS) $(ARM_AFLAGS) $< -o $@
 
 armv7m_%.bin: armv7m_%.elf
 	$(ARM_OBJCOPY) -Obinary $< $@
 
-armv7m_%.inc: armv7m_%.bin
+%.inc: %.bin
 	$(BIN2C) < $< > $@
 
+riscv32_%.elf:	riscv_%.c
+	$(RISCV_CC) $(RISCV32_CFLAGS) $< -o $@
+
+riscv64_%.elf:	riscv_%.c
+	$(RISCV_CC) $(RISCV64_CFLAGS) $< -o $@
+
+riscv%.bin:	riscv%.elf
+	$(RISCV_OBJCOPY) -Obinary $< $@
+
 clean:
 	-rm -f *.elf *.bin *.inc
diff --git a/contrib/loaders/checksum/riscv32_crc.inc b/contrib/loaders/checksum/riscv32_crc.inc
new file mode 100644
index 000000000..d6566d2c2
--- /dev/null
+++ b/contrib/loaders/checksum/riscv32_crc.inc
@@ -0,0 +1,70 @@
+/* Autogenerated with ../../../src/helper/bin2char.sh */
+0xb3,0x05,0xb5,0x00,0x93,0x07,0xf0,0xff,0x17,0x07,0x00,0x00,0x13,0x07,0x47,0x04,
+0x63,0x1a,0xb5,0x00,0x13,0x85,0x07,0x00,0x73,0x00,0x10,0x00,0x13,0x85,0x07,0x00,
+0x67,0x80,0x00,0x00,0x03,0x46,0x05,0x00,0x93,0x96,0x87,0x00,0x93,0xd7,0x87,0x01,
+0xb3,0xc7,0xc7,0x00,0x93,0x97,0x27,0x00,0xb3,0x07,0xf7,0x00,0x83,0xa7,0x07,0x00,
+0x13,0x05,0x15,0x00,0xb3,0xc7,0xf6,0x00,0x6f,0xf0,0x9f,0xfc,0x00,0x00,0x00,0x00,
+0xb7,0x1d,0xc1,0x04,0x6e,0x3b,0x82,0x09,0xd9,0x26,0x43,0x0d,0xdc,0x76,0x04,0x13,
+0x6b,0x6b,0xc5,0x17,0xb2,0x4d,0x86,0x1a,0x05,0x50,0x47,0x1e,0xb8,0xed,0x08,0x26,
+0x0f,0xf0,0xc9,0x22,0xd6,0xd6,0x8a,0x2f,0x61,0xcb,0x4b,0x2b,0x64,0x9b,0x0c,0x35,
+0xd3,0x86,0xcd,0x31,0x0a,0xa0,0x8e,0x3c,0xbd,0xbd,0x4f,0x38,0x70,0xdb,0x11,0x4c,
+0xc7,0xc6,0xd0,0x48,0x1e,0xe0,0x93,0x45,0xa9,0xfd,0x52,0x41,0xac,0xad,0x15,0x5f,
+0x1b,0xb0,0xd4,0x5b,0xc2,0x96,0x97,0x56,0x75,0x8b,0x56,0x52,0xc8,0x36,0x19,0x6a,
+0x7f,0x2b,0xd8,0x6e,0xa6,0x0d,0x9b,0x63,0x11,0x10,0x5a,0x67,0x14,0x40,0x1d,0x79,
+0xa3,0x5d,0xdc,0x7d,0x7a,0x7b,0x9f,0x70,0xcd,0x66,0x5e,0x74,0xe0,0xb6,0x23,0x98,
+0x57,0xab,0xe2,0x9c,0x8e,0x8d,0xa1,0x91,0x39,0x90,0x60,0x95,0x3c,0xc0,0x27,0x8b,
+0x8b,0xdd,0xe6,0x8f,0x52,0xfb,0xa5,0x82,0xe5,0xe6,0x64,0x86,0x58,0x5b,0x2b,0xbe,
+0xef,0x46,0xea,0xba,0x36,0x60,0xa9,0xb7,0x81,0x7d,0x68,0xb3,0x84,0x2d,0x2f,0xad,
+0x33,0x30,0xee,0xa9,0xea,0x16,0xad,0xa4,0x5d,0x0b,0x6c,0xa0,0x90,0x6d,0x32,0xd4,
+0x27,0x70,0xf3,0xd0,0xfe,0x56,0xb0,0xdd,0x49,0x4b,0x71,0xd9,0x4c,0x1b,0x36,0xc7,
+0xfb,0x06,0xf7,0xc3,0x22,0x20,0xb4,0xce,0x95,0x3d,0x75,0xca,0x28,0x80,0x3a,0xf2,
+0x9f,0x9d,0xfb,0xf6,0x46,0xbb,0xb8,0xfb,0xf1,0xa6,0x79,0xff,0xf4,0xf6,0x3e,0xe1,
+0x43,0xeb,0xff,0xe5,0x9a,0xcd,0xbc,0xe8,0x2d,0xd0,0x7d,0xec,0x77,0x70,0x86,0x34,
+0xc0,0x6d,0x47,0x30,0x19,0x4b,0x04,0x3d,0xae,0x56,0xc5,0x39,0xab,0x06,0x82,0x27,
+0x1c,0x1b,0x43,0x23,0xc5,0x3d,0x00,0x2e,0x72,0x20,0xc1,0x2a,0xcf,0x9d,0x8e,0x12,
+0x78,0x80,0x4f,0x16,0xa1,0xa6,0x0c,0x1b,0x16,0xbb,0xcd,0x1f,0x13,0xeb,0x8a,0x01,
+0xa4,0xf6,0x4b,0x05,0x7d,0xd0,0x08,0x08,0xca,0xcd,0xc9,0x0c,0x07,0xab,0x97,0x78,
+0xb0,0xb6,0x56,0x7c,0x69,0x90,0x15,0x71,0xde,0x8d,0xd4,0x75,0xdb,0xdd,0x93,0x6b,
+0x6c,0xc0,0x52,0x6f,0xb5,0xe6,0x11,0x62,0x02,0xfb,0xd0,0x66,0xbf,0x46,0x9f,0x5e,
+0x08,0x5b,0x5e,0x5a,0xd1,0x7d,0x1d,0x57,0x66,0x60,0xdc,0x53,0x63,0x30,0x9b,0x4d,
+0xd4,0x2d,0x5a,0x49,0x0d,0x0b,0x19,0x44,0xba,0x16,0xd8,0x40,0x97,0xc6,0xa5,0xac,
+0x20,0xdb,0x64,0xa8,0xf9,0xfd,0x27,0xa5,0x4e,0xe0,0xe6,0xa1,0x4b,0xb0,0xa1,0xbf,
+0xfc,0xad,0x60,0xbb,0x25,0x8b,0x23,0xb6,0x92,0x96,0xe2,0xb2,0x2f,0x2b,0xad,0x8a,
+0x98,0x36,0x6c,0x8e,0x41,0x10,0x2f,0x83,0xf6,0x0d,0xee,0x87,0xf3,0x5d,0xa9,0x99,
+0x44,0x40,0x68,0x9d,0x9d,0x66,0x2b,0x90,0x2a,0x7b,0xea,0x94,0xe7,0x1d,0xb4,0xe0,
+0x50,0x00,0x75,0xe4,0x89,0x26,0x36,0xe9,0x3e,0x3b,0xf7,0xed,0x3b,0x6b,0xb0,0xf3,
+0x8c,0x76,0x71,0xf7,0x55,0x50,0x32,0xfa,0xe2,0x4d,0xf3,0xfe,0x5f,0xf0,0xbc,0xc6,
+0xe8,0xed,0x7d,0xc2,0x31,0xcb,0x3e,0xcf,0x86,0xd6,0xff,0xcb,0x83,0x86,0xb8,0xd5,
+0x34,0x9b,0x79,0xd1,0xed,0xbd,0x3a,0xdc,0x5a,0xa0,0xfb,0xd8,0xee,0xe0,0x0c,0x69,
+0x59,0xfd,0xcd,0x6d,0x80,0xdb,0x8e,0x60,0x37,0xc6,0x4f,0x64,0x32,0x96,0x08,0x7a,
+0x85,0x8b,0xc9,0x7e,0x5c,0xad,0x8a,0x73,0xeb,0xb0,0x4b,0x77,0x56,0x0d,0x04,0x4f,
+0xe1,0x10,0xc5,0x4b,0x38,0x36,0x86,0x46,0x8f,0x2b,0x47,0x42,0x8a,0x7b,0x00,0x5c,
+0x3d,0x66,0xc1,0x58,0xe4,0x40,0x82,0x55,0x53,0x5d,0x43,0x51,0x9e,0x3b,0x1d,0x25,
+0x29,0x26,0xdc,0x21,0xf0,0x00,0x9f,0x2c,0x47,0x1d,0x5e,0x28,0x42,0x4d,0x19,0x36,
+0xf5,0x50,0xd8,0x32,0x2c,0x76,0x9b,0x3f,0x9b,0x6b,0x5a,0x3b,0x26,0xd6,0x15,0x03,
+0x91,0xcb,0xd4,0x07,0x48,0xed,0x97,0x0a,0xff,0xf0,0x56,0x0e,0xfa,0xa0,0x11,0x10,
+0x4d,0xbd,0xd0,0x14,0x94,0x9b,0x93,0x19,0x23,0x86,0x52,0x1d,0x0e,0x56,0x2f,0xf1,
+0xb9,0x4b,0xee,0xf5,0x60,0x6d,0xad,0xf8,0xd7,0x70,0x6c,0xfc,0xd2,0x20,0x2b,0xe2,
+0x65,0x3d,0xea,0xe6,0xbc,0x1b,0xa9,0xeb,0x0b,0x06,0x68,0xef,0xb6,0xbb,0x27,0xd7,
+0x01,0xa6,0xe6,0xd3,0xd8,0x80,0xa5,0xde,0x6f,0x9d,0x64,0xda,0x6a,0xcd,0x23,0xc4,
+0xdd,0xd0,0xe2,0xc0,0x04,0xf6,0xa1,0xcd,0xb3,0xeb,0x60,0xc9,0x7e,0x8d,0x3e,0xbd,
+0xc9,0x90,0xff,0xb9,0x10,0xb6,0xbc,0xb4,0xa7,0xab,0x7d,0xb0,0xa2,0xfb,0x3a,0xae,
+0x15,0xe6,0xfb,0xaa,0xcc,0xc0,0xb8,0xa7,0x7b,0xdd,0x79,0xa3,0xc6,0x60,0x36,0x9b,
+0x71,0x7d,0xf7,0x9f,0xa8,0x5b,0xb4,0x92,0x1f,0x46,0x75,0x96,0x1a,0x16,0x32,0x88,
+0xad,0x0b,0xf3,0x8c,0x74,0x2d,0xb0,0x81,0xc3,0x30,0x71,0x85,0x99,0x90,0x8a,0x5d,
+0x2e,0x8d,0x4b,0x59,0xf7,0xab,0x08,0x54,0x40,0xb6,0xc9,0x50,0x45,0xe6,0x8e,0x4e,
+0xf2,0xfb,0x4f,0x4a,0x2b,0xdd,0x0c,0x47,0x9c,0xc0,0xcd,0x43,0x21,0x7d,0x82,0x7b,
+0x96,0x60,0x43,0x7f,0x4f,0x46,0x00,0x72,0xf8,0x5b,0xc1,0x76,0xfd,0x0b,0x86,0x68,
+0x4a,0x16,0x47,0x6c,0x93,0x30,0x04,0x61,0x24,0x2d,0xc5,0x65,0xe9,0x4b,0x9b,0x11,
+0x5e,0x56,0x5a,0x15,0x87,0x70,0x19,0x18,0x30,0x6d,0xd8,0x1c,0x35,0x3d,0x9f,0x02,
+0x82,0x20,0x5e,0x06,0x5b,0x06,0x1d,0x0b,0xec,0x1b,0xdc,0x0f,0x51,0xa6,0x93,0x37,
+0xe6,0xbb,0x52,0x33,0x3f,0x9d,0x11,0x3e,0x88,0x80,0xd0,0x3a,0x8d,0xd0,0x97,0x24,
+0x3a,0xcd,0x56,0x20,0xe3,0xeb,0x15,0x2d,0x54,0xf6,0xd4,0x29,0x79,0x26,0xa9,0xc5,
+0xce,0x3b,0x68,0xc1,0x17,0x1d,0x2b,0xcc,0xa0,0x00,0xea,0xc8,0xa5,0x50,0xad,0xd6,
+0x12,0x4d,0x6c,0xd2,0xcb,0x6b,0x2f,0xdf,0x7c,0x76,0xee,0xdb,0xc1,0xcb,0xa1,0xe3,
+0x76,0xd6,0x60,0xe7,0xaf,0xf0,0x23,0xea,0x18,0xed,0xe2,0xee,0x1d,0xbd,0xa5,0xf0,
+0xaa,0xa0,0x64,0xf4,0x73,0x86,0x27,0xf9,0xc4,0x9b,0xe6,0xfd,0x09,0xfd,0xb8,0x89,
+0xbe,0xe0,0x79,0x8d,0x67,0xc6,0x3a,0x80,0xd0,0xdb,0xfb,0x84,0xd5,0x8b,0xbc,0x9a,
+0x62,0x96,0x7d,0x9e,0xbb,0xb0,0x3e,0x93,0x0c,0xad,0xff,0x97,0xb1,0x10,0xb0,0xaf,
+0x06,0x0d,0x71,0xab,0xdf,0x2b,0x32,0xa6,0x68,0x36,0xf3,0xa2,0x6d,0x66,0xb4,0xbc,
+0xda,0x7b,0x75,0xb8,0x03,0x5d,0x36,0xb5,0xb4,0x40,0xf7,0xb1,
diff --git a/contrib/loaders/checksum/riscv64_crc.inc b/contrib/loaders/checksum/riscv64_crc.inc
new file mode 100644
index 000000000..e131d7764
--- /dev/null
+++ b/contrib/loaders/checksum/riscv64_crc.inc
@@ -0,0 +1,71 @@
+/* Autogenerated with ../../../src/helper/bin2char.sh */
+0x93,0x07,0xf0,0xff,0x93,0x06,0xf0,0xff,0x17,0x06,0x00,0x00,0x13,0x06,0x06,0x05,
+0x9b,0x85,0xf5,0xff,0x63,0x9a,0xd5,0x00,0x13,0x85,0x07,0x00,0x73,0x00,0x10,0x00,
+0x13,0x85,0x07,0x00,0x67,0x80,0x00,0x00,0x83,0x48,0x05,0x00,0x1b,0xd7,0x87,0x01,
+0x1b,0x98,0x87,0x00,0x33,0x47,0x17,0x01,0x13,0x17,0x27,0x00,0x33,0x07,0xe6,0x00,
+0x83,0x27,0x07,0x00,0x13,0x05,0x15,0x00,0xb3,0xc7,0x07,0x01,0x9b,0x87,0x07,0x00,
+0x6f,0xf0,0x1f,0xfc,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xb7,0x1d,0xc1,0x04,
+0x6e,0x3b,0x82,0x09,0xd9,0x26,0x43,0x0d,0xdc,0x76,0x04,0x13,0x6b,0x6b,0xc5,0x17,
+0xb2,0x4d,0x86,0x1a,0x05,0x50,0x47,0x1e,0xb8,0xed,0x08,0x26,0x0f,0xf0,0xc9,0x22,
+0xd6,0xd6,0x8a,0x2f,0x61,0xcb,0x4b,0x2b,0x64,0x9b,0x0c,0x35,0xd3,0x86,0xcd,0x31,
+0x0a,0xa0,0x8e,0x3c,0xbd,0xbd,0x4f,0x38,0x70,0xdb,0x11,0x4c,0xc7,0xc6,0xd0,0x48,
+0x1e,0xe0,0x93,0x45,0xa9,0xfd,0x52,0x41,0xac,0xad,0x15,0x5f,0x1b,0xb0,0xd4,0x5b,
+0xc2,0x96,0x97,0x56,0x75,0x8b,0x56,0x52,0xc8,0x36,0x19,0x6a,0x7f,0x2b,0xd8,0x6e,
+0xa6,0x0d,0x9b,0x63,0x11,0x10,0x5a,0x67,0x14,0x40,0x1d,0x79,0xa3,0x5d,0xdc,0x7d,
+0x7a,0x7b,0x9f,0x70,0xcd,0x66,0x5e,0x74,0xe0,0xb6,0x23,0x98,0x57,0xab,0xe2,0x9c,
+0x8e,0x8d,0xa1,0x91,0x39,0x90,0x60,0x95,0x3c,0xc0,0x27,0x8b,0x8b,0xdd,0xe6,0x8f,
+0x52,0xfb,0xa5,0x82,0xe5,0xe6,0x64,0x86,0x58,0x5b,0x2b,0xbe,0xef,0x46,0xea,0xba,
+0x36,0x60,0xa9,0xb7,0x81,0x7d,0x68,0xb3,0x84,0x2d,0x2f,0xad,0x33,0x30,0xee,0xa9,
+0xea,0x16,0xad,0xa4,0x5d,0x0b,0x6c,0xa0,0x90,0x6d,0x32,0xd4,0x27,0x70,0xf3,0xd0,
+0xfe,0x56,0xb0,0xdd,0x49,0x4b,0x71,0xd9,0x4c,0x1b,0x36,0xc7,0xfb,0x06,0xf7,0xc3,
+0x22,0x20,0xb4,0xce,0x95,0x3d,0x75,0xca,0x28,0x80,0x3a,0xf2,0x9f,0x9d,0xfb,0xf6,
+0x46,0xbb,0xb8,0xfb,0xf1,0xa6,0x79,0xff,0xf4,0xf6,0x3e,0xe1,0x43,0xeb,0xff,0xe5,
+0x9a,0xcd,0xbc,0xe8,0x2d,0xd0,0x7d,0xec,0x77,0x70,0x86,0x34,0xc0,0x6d,0x47,0x30,
+0x19,0x4b,0x04,0x3d,0xae,0x56,0xc5,0x39,0xab,0x06,0x82,0x27,0x1c,0x1b,0x43,0x23,
+0xc5,0x3d,0x00,0x2e,0x72,0x20,0xc1,0x2a,0xcf,0x9d,0x8e,0x12,0x78,0x80,0x4f,0x16,
+0xa1,0xa6,0x0c,0x1b,0x16,0xbb,0xcd,0x1f,0x13,0xeb,0x8a,0x01,0xa4,0xf6,0x4b,0x05,
+0x7d,0xd0,0x08,0x08,0xca,0xcd,0xc9,0x0c,0x07,0xab,0x97,0x78,0xb0,0xb6,0x56,0x7c,
+0x69,0x90,0x15,0x71,0xde,0x8d,0xd4,0x75,0xdb,0xdd,0x93,0x6b,0x6c,0xc0,0x52,0x6f,
+0xb5,0xe6,0x11,0x62,0x02,0xfb,0xd0,0x66,0xbf,0x46,0x9f,0x5e,0x08,0x5b,0x5e,0x5a,
+0xd1,0x7d,0x1d,0x57,0x66,0x60,0xdc,0x53,0x63,0x30,0x9b,0x4d,0xd4,0x2d,0x5a,0x49,
+0x0d,0x0b,0x19,0x44,0xba,0x16,0xd8,0x40,0x97,0xc6,0xa5,0xac,0x20,0xdb,0x64,0xa8,
+0xf9,0xfd,0x27,0xa5,0x4e,0xe0,0xe6,0xa1,0x4b,0xb0,0xa1,0xbf,0xfc,0xad,0x60,0xbb,
+0x25,0x8b,0x23,0xb6,0x92,0x96,0xe2,0xb2,0x2f,0x2b,0xad,0x8a,0x98,0x36,0x6c,0x8e,
+0x41,0x10,0x2f,0x83,0xf6,0x0d,0xee,0x87,0xf3,0x5d,0xa9,0x99,0x44,0x40,0x68,0x9d,
+0x9d,0x66,0x2b,0x90,0x2a,0x7b,0xea,0x94,0xe7,0x1d,0xb4,0xe0,0x50,0x00,0x75,0xe4,
+0x89,0x26,0x36,0xe9,0x3e,0x3b,0xf7,0xed,0x3b,0x6b,0xb0,0xf3,0x8c,0x76,0x71,0xf7,
+0x55,0x50,0x32,0xfa,0xe2,0x4d,0xf3,0xfe,0x5f,0xf0,0xbc,0xc6,0xe8,0xed,0x7d,0xc2,
+0x31,0xcb,0x3e,0xcf,0x86,0xd6,0xff,0xcb,0x83,0x86,0xb8,0xd5,0x34,0x9b,0x79,0xd1,
+0xed,0xbd,0x3a,0xdc,0x5a,0xa0,0xfb,0xd8,0xee,0xe0,0x0c,0x69,0x59,0xfd,0xcd,0x6d,
+0x80,0xdb,0x8e,0x60,0x37,0xc6,0x4f,0x64,0x32,0x96,0x08,0x7a,0x85,0x8b,0xc9,0x7e,
+0x5c,0xad,0x8a,0x73,0xeb,0xb0,0x4b,0x77,0x56,0x0d,0x04,0x4f,0xe1,0x10,0xc5,0x4b,
+0x38,0x36,0x86,0x46,0x8f,0x2b,0x47,0x42,0x8a,0x7b,0x00,0x5c,0x3d,0x66,0xc1,0x58,
+0xe4,0x40,0x82,0x55,0x53,0x5d,0x43,0x51,0x9e,0x3b,0x1d,0x25,0x29,0x26,0xdc,0x21,
+0xf0,0x00,0x9f,0x2c,0x47,0x1d,0x5e,0x28,0x42,0x4d,0x19,0x36,0xf5,0x50,0xd8,0x32,
+0x2c,0x76,0x9b,0x3f,0x9b,0x6b,0x5a,0x3b,0x26,0xd6,0x15,0x03,0x91,0xcb,0xd4,0x07,
+0x48,0xed,0x97,0x0a,0xff,0xf0,0x56,0x0e,0xfa,0xa0,0x11,0x10,0x4d,0xbd,0xd0,0x14,
+0x94,0x9b,0x93,0x19,0x23,0x86,0x52,0x1d,0x0e,0x56,0x2f,0xf1,0xb9,0x4b,0xee,0xf5,
+0x60,0x6d,0xad,0xf8,0xd7,0x70,0x6c,0xfc,0xd2,0x20,0x2b,0xe2,0x65,0x3d,0xea,0xe6,
+0xbc,0x1b,0xa9,0xeb,0x0b,0x06,0x68,0xef,0xb6,0xbb,0x27,0xd7,0x01,0xa6,0xe6,0xd3,
+0xd8,0x80,0xa5,0xde,0x6f,0x9d,0x64,0xda,0x6a,0xcd,0x23,0xc4,0xdd,0xd0,0xe2,0xc0,
+0x04,0xf6,0xa1,0xcd,0xb3,0xeb,0x60,0xc9,0x7e,0x8d,0x3e,0xbd,0xc9,0x90,0xff,0xb9,
+0x10,0xb6,0xbc,0xb4,0xa7,0xab,0x7d,0xb0,0xa2,0xfb,0x3a,0xae,0x15,0xe6,0xfb,0xaa,
+0xcc,0xc0,0xb8,0xa7,0x7b,0xdd,0x79,0xa3,0xc6,0x60,0x36,0x9b,0x71,0x7d,0xf7,0x9f,
+0xa8,0x5b,0xb4,0x92,0x1f,0x46,0x75,0x96,0x1a,0x16,0x32,0x88,0xad,0x0b,0xf3,0x8c,
+0x74,0x2d,0xb0,0x81,0xc3,0x30,0x71,0x85,0x99,0x90,0x8a,0x5d,0x2e,0x8d,0x4b,0x59,
+0xf7,0xab,0x08,0x54,0x40,0xb6,0xc9,0x50,0x45,0xe6,0x8e,0x4e,0xf2,0xfb,0x4f,0x4a,
+0x2b,0xdd,0x0c,0x47,0x9c,0xc0,0xcd,0x43,0x21,0x7d,0x82,0x7b,0x96,0x60,0x43,0x7f,
+0x4f,0x46,0x00,0x72,0xf8,0x5b,0xc1,0x76,0xfd,0x0b,0x86,0x68,0x4a,0x16,0x47,0x6c,
+0x93,0x30,0x04,0x61,0x24,0x2d,0xc5,0x65,0xe9,0x4b,0x9b,0x11,0x5e,0x56,0x5a,0x15,
+0x87,0x70,0x19,0x18,0x30,0x6d,0xd8,0x1c,0x35,0x3d,0x9f,0x02,0x82,0x20,0x5e,0x06,
+0x5b,0x06,0x1d,0x0b,0xec,0x1b,0xdc,0x0f,0x51,0xa6,0x93,0x37,0xe6,0xbb,0x52,0x33,
+0x3f,0x9d,0x11,0x3e,0x88,0x80,0xd0,0x3a,0x8d,0xd0,0x97,0x24,0x3a,0xcd,0x56,0x20,
+0xe3,0xeb,0x15,0x2d,0x54,0xf6,0xd4,0x29,0x79,0x26,0xa9,0xc5,0xce,0x3b,0x68,0xc1,
+0x17,0x1d,0x2b,0xcc,0xa0,0x00,0xea,0xc8,0xa5,0x50,0xad,0xd6,0x12,0x4d,0x6c,0xd2,
+0xcb,0x6b,0x2f,0xdf,0x7c,0x76,0xee,0xdb,0xc1,0xcb,0xa1,0xe3,0x76,0xd6,0x60,0xe7,
+0xaf,0xf0,0x23,0xea,0x18,0xed,0xe2,0xee,0x1d,0xbd,0xa5,0xf0,0xaa,0xa0,0x64,0xf4,
+0x73,0x86,0x27,0xf9,0xc4,0x9b,0xe6,0xfd,0x09,0xfd,0xb8,0x89,0xbe,0xe0,0x79,0x8d,
+0x67,0xc6,0x3a,0x80,0xd0,0xdb,0xfb,0x84,0xd5,0x8b,0xbc,0x9a,0x62,0x96,0x7d,0x9e,
+0xbb,0xb0,0x3e,0x93,0x0c,0xad,0xff,0x97,0xb1,0x10,0xb0,0xaf,0x06,0x0d,0x71,0xab,
+0xdf,0x2b,0x32,0xa6,0x68,0x36,0xf3,0xa2,0x6d,0x66,0xb4,0xbc,0xda,0x7b,0x75,0xb8,
+0x03,0x5d,0x36,0xb5,0xb4,0x40,0xf7,0xb1,
diff --git a/contrib/loaders/checksum/riscv_crc.c b/contrib/loaders/checksum/riscv_crc.c
new file mode 100644
index 000000000..e437b6616
--- /dev/null
+++ b/contrib/loaders/checksum/riscv_crc.c
@@ -0,0 +1,140 @@
+/*
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ * Copyright (C) 2009-2021 Free Software Foundation, Inc.
+ */
+
+/* Copied from https://github.com/gcc-mirror/gcc/blob/master/libiberty/crc32.c
+ * and then tweaked a little. */
+
+/* This table was generated by the following program.
+   #include <stdio.h>
+   int
+   main ()
+   {
+     unsigned int i, j;
+     unsigned int c;
+     int table[256];
+     for (i = 0; i < 256; i++)
+       {
+	 for (c = i << 24, j = 8; j > 0; --j)
+	   c = c & 0x80000000 ? (c << 1) ^ 0x04c11db7 : (c << 1);
+	 table[i] = c;
+       }
+     printf ("static const unsigned int crc32_table[] =\n{\n");
+     for (i = 0; i < 256; i += 4)
+       {
+	 printf ("  0x%08x, 0x%08x, 0x%08x, 0x%08x",
+		 table[i + 0], table[i + 1], table[i + 2], table[i + 3]);
+	 if (i + 4 < 256)
+	   putchar (',');
+	 putchar ('\n');
+       }
+     printf ("};\n");
+     return 0;
+   }
+   For more information on CRC, see, e.g.,
+   http://www.ross.net/crc/download/crc_v3.txt.  */
+
+static const unsigned int crc32_table[] = {
+	0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9,
+	0x130476dc, 0x17c56b6b, 0x1a864db2, 0x1e475005,
+	0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61,
+	0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd,
+	0x4c11db70, 0x48d0c6c7, 0x4593e01e, 0x4152fda9,
+	0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75,
+	0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011,
+	0x791d4014, 0x7ddc5da3, 0x709f7b7a, 0x745e66cd,
+	0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039,
+	0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5,
+	0xbe2b5b58, 0xbaea46ef, 0xb7a96036, 0xb3687d81,
+	0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d,
+	0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49,
+	0xc7361b4c, 0xc3f706fb, 0xceb42022, 0xca753d95,
+	0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1,
+	0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d,
+	0x34867077, 0x30476dc0, 0x3d044b19, 0x39c556ae,
+	0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072,
+	0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16,
+	0x018aeb13, 0x054bf6a4, 0x0808d07d, 0x0cc9cdca,
+	0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde,
+	0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02,
+	0x5e9f46bf, 0x5a5e5b08, 0x571d7dd1, 0x53dc6066,
+	0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba,
+	0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e,
+	0xbfa1b04b, 0xbb60adfc, 0xb6238b25, 0xb2e29692,
+	0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6,
+	0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a,
+	0xe0b41de7, 0xe4750050, 0xe9362689, 0xedf73b3e,
+	0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2,
+	0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686,
+	0xd5b88683, 0xd1799b34, 0xdc3abded, 0xd8fba05a,
+	0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637,
+	0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb,
+	0x4f040d56, 0x4bc510e1, 0x46863638, 0x42472b8f,
+	0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53,
+	0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47,
+	0x36194d42, 0x32d850f5, 0x3f9b762c, 0x3b5a6b9b,
+	0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff,
+	0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623,
+	0xf12f560e, 0xf5ee4bb9, 0xf8ad6d60, 0xfc6c70d7,
+	0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b,
+	0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f,
+	0xc423cd6a, 0xc0e2d0dd, 0xcda1f604, 0xc960ebb3,
+	0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7,
+	0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b,
+	0x9b3660c6, 0x9ff77d71, 0x92b45ba8, 0x9675461f,
+	0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3,
+	0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640,
+	0x4e8ee645, 0x4a4ffbf2, 0x470cdd2b, 0x43cdc09c,
+	0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8,
+	0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24,
+	0x119b4be9, 0x155a565e, 0x18197087, 0x1cd86d30,
+	0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec,
+	0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088,
+	0x2497d08d, 0x2056cd3a, 0x2d15ebe3, 0x29d4f654,
+	0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0,
+	0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c,
+	0xe3a1cbc1, 0xe760d676, 0xea23f0af, 0xeee2ed18,
+	0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4,
+	0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0,
+	0x9abc8bd5, 0x9e7d9662, 0x933eb0bb, 0x97ffad0c,
+	0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668,
+	0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4
+};
+
+/*
+@deftypefn Extension {unsigned int} crc32 (const unsigned char *@var{buf}, @
+  int @var{len}, unsigned int @var{init})
+Compute the 32-bit CRC of @var{buf} which has length @var{len}.  The
+starting value is 0xffffffff.
+This is used by the @command{gdb} remote protocol for the @samp{qCRC}
+command.
+This CRC can be specified as:
+  Width  : 32
+  Poly   : 0x04c11db7
+  Init   : 0xffffffff
+  RefIn  : false
+  RefOut : false
+  XorOut : 0
+This differs from the "standard" CRC-32 algorithm in that the values
+are not reflected, and there is no final XOR value.  These differences
+make it easy to compose the values of multiple blocks.
+@end deftypefn
+*/
+
+#include <stdint.h>
+
+unsigned int
+xcrc32(const unsigned char *buf, int len)
+{
+	uint32_t crc = 0xffffffff;
+	while (len--) {
+		crc = (crc << 8) ^ crc32_table[((crc >> 24) ^ *buf) & 255];
+		buf++;
+	}
+	asm("mv a0, %0;"
+			"ebreak;"
+			:
+			: "r"(crc));
+	return crc;
+}
diff --git a/src/target/image.c b/src/target/image.c
index 20c6d77b2..e63cd0f9c 100644
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -1052,7 +1052,7 @@ int image_calculate_checksum(const uint8_t *buffer, uint32_t nbytes, uint32_t *c
 		keep_alive();
 	}
 
-	LOG_DEBUG("Calculating checksum done");
+	LOG_DEBUG("Calculating checksum done; checksum=0x%" PRIx32, crc);
 
 	*checksum = crc;
 	return ERROR_OK;
diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c
index c26e6358f..c883b4203 100644
--- a/src/target/riscv/riscv.c
+++ b/src/target/riscv/riscv.c
@@ -1853,7 +1853,86 @@ static int riscv_checksum_memory(struct target *target,
 		target_addr_t address, uint32_t count,
 		uint32_t *checksum)
 {
-	return ERROR_FAIL;
+	struct working_area *crc_algorithm;
+	struct reg_param reg_params[2];
+	int retval;
+
+	LOG_DEBUG("address=0x%" TARGET_PRIxADDR "; count=0x%" PRIx32, address, count);
+
+	static const uint8_t riscv32_crc_code[] = {
+#include "../../contrib/loaders/checksum/riscv32_crc.inc"
+	};
+	static const uint8_t riscv64_crc_code[] = {
+#include "../../contrib/loaders/checksum/riscv64_crc.inc"
+	};
+
+	static const uint8_t *crc_code;
+
+	unsigned xlen = riscv_xlen(target);
+	unsigned crc_code_size;
+	if (xlen == 32) {
+		crc_code = riscv32_crc_code;
+		crc_code_size = sizeof(riscv32_crc_code);
+	} else {
+		crc_code = riscv64_crc_code;
+		crc_code_size = sizeof(riscv64_crc_code);
+	}
+
+	if (count < crc_code_size * 4) {
+		/* Don't use the algorithm for relatively small buffers. It's faster
+		 * just to read the memory.  target_checksum_memory() will take care of
+		 * that if we fail. */
+		return ERROR_FAIL;
+	}
+
+	retval = target_alloc_working_area(target, crc_code_size, &crc_algorithm);
+	if (retval != ERROR_OK)
+		return retval;
+
+	if (crc_algorithm->address + crc_algorithm->size > address &&
+			crc_algorithm->address < address + count) {
+		/* Region to checksum overlaps with the work area we've been assigned.
+		 * Bail. (Would be better to manually checksum what we read there, and
+		 * use the algorithm for the rest.) */
+		target_free_working_area(target, crc_algorithm);
+		return ERROR_FAIL;
+	}
+
+	retval = target_write_buffer(target, crc_algorithm->address, crc_code_size,
+			crc_code);
+	if (retval != ERROR_OK) {
+		LOG_ERROR("Failed to write code to " TARGET_ADDR_FMT ": %d",
+				crc_algorithm->address, retval);
+		target_free_working_area(target, crc_algorithm);
+		return retval;
+	}
+
+	init_reg_param(&reg_params[0], "a0", xlen, PARAM_IN_OUT);
+	init_reg_param(&reg_params[1], "a1", xlen, PARAM_OUT);
+	buf_set_u64(reg_params[0].value, 0, xlen, address);
+	buf_set_u64(reg_params[1].value, 0, xlen, count);
+
+	/* 20 second timeout/megabyte */
+	int timeout = 20000 * (1 + (count / (1024 * 1024)));
+
+	retval = target_run_algorithm(target, 0, NULL, 2, reg_params,
+			crc_algorithm->address,
+			0,	/* Leave exit point unspecified because we don't know. */
+			timeout, NULL);
+
+	if (retval == ERROR_OK)
+		*checksum = buf_get_u32(reg_params[0].value, 0, 32);
+	else
+		LOG_ERROR("error executing RISC-V CRC algorithm");
+
+	destroy_reg_param(&reg_params[0]);
+	destroy_reg_param(&reg_params[1]);
+
+	target_free_working_area(target, crc_algorithm);
+
+	LOG_DEBUG("checksum=0x%" PRIx32 ", result=%d", *checksum, retval);
+
+	return retval;
 }
 
 /*** OpenOCD Helper Functions ***/

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

Summary of changes:
 contrib/loaders/checksum/Makefile        |  24 +++++-
 contrib/loaders/checksum/riscv32_crc.inc |  70 ++++++++++++++++
 contrib/loaders/checksum/riscv64_crc.inc |  71 ++++++++++++++++
 contrib/loaders/checksum/riscv_crc.c     | 140 +++++++++++++++++++++++++++++++
 src/target/image.c                       |   2 +-
 src/target/riscv/riscv.c                 |  81 +++++++++++++++++-
 6 files changed, 382 insertions(+), 6 deletions(-)
 create mode 100644 contrib/loaders/checksum/riscv32_crc.inc
 create mode 100644 contrib/loaders/checksum/riscv64_crc.inc
 create mode 100644 contrib/loaders/checksum/riscv_crc.c


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-46-g6c0151623

[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  6c0151623cb09da6a80655cedf568db927ae2d93 (commit)
      from  25218e8935037367e419219f8c855d92a3163023 (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 6c0151623cb09da6a80655cedf568db927ae2d93
Author: Christian Hoff <chr...@ad...>
Date:   Mon Nov 23 14:34:56 2020 +0100

    aarch64: add support for "reset halt"
    
    Support halting the CPU directly after a reset. If halt is
    requested, the CPU stops directly at the reset vector, before
    any code is executed.
    
    This functionality was implemented using the Reset Catch
    debug event.
    
    Change-Id: If90d54c088442340376f0b588ba10267ea8e7327
    Signed-off-by: Christian Hoff <chr...@ad...>
    Reviewed-on: http://openocd.zylin.com/5947
    Tested-by: jenkins
    Reviewed-by: Antonio Borneo <bor...@gm...>
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>

diff --git a/src/target/aarch64.c b/src/target/aarch64.c
index d111a0568..e45803040 100644
--- a/src/target/aarch64.c
+++ b/src/target/aarch64.c
@@ -1677,22 +1677,102 @@ static int aarch64_remove_breakpoint(struct target *target, struct breakpoint *b
  * Cortex-A8 Reset functions
  */
 
+static int aarch64_enable_reset_catch(struct target *target, bool enable)
+{
+	struct armv8_common *armv8 = target_to_armv8(target);
+	uint32_t edecr;
+	int retval;
+
+	retval = mem_ap_read_atomic_u32(armv8->debug_ap,
+			armv8->debug_base + CPUV8_DBG_EDECR, &edecr);
+	LOG_DEBUG("EDECR = 0x%08" PRIx32 ", enable=%d", edecr, enable);
+	if (retval != ERROR_OK)
+		return retval;
+
+	if (enable)
+		edecr |= ECR_RCE;
+	else
+		edecr &= ~ECR_RCE;
+
+	return mem_ap_write_atomic_u32(armv8->debug_ap,
+			armv8->debug_base + CPUV8_DBG_EDECR, edecr);
+}
+
+static int aarch64_clear_reset_catch(struct target *target)
+{
+	struct armv8_common *armv8 = target_to_armv8(target);
+	uint32_t edesr;
+	int retval;
+	bool was_triggered;
+
+	/* check if Reset Catch debug event triggered as expected */
+	retval = mem_ap_read_atomic_u32(armv8->debug_ap,
+		armv8->debug_base + CPUV8_DBG_EDESR, &edesr);
+	if (retval != ERROR_OK)
+		return retval;
+
+	was_triggered = !!(edesr & ESR_RC);
+	LOG_DEBUG("Reset Catch debug event %s",
+			was_triggered ? "triggered" : "NOT triggered!");
+
+	if (was_triggered) {
+		/* clear pending Reset Catch debug event */
+		edesr &= ~ESR_RC;
+		retval = mem_ap_write_atomic_u32(armv8->debug_ap,
+			armv8->debug_base + CPUV8_DBG_EDESR, edesr);
+		if (retval != ERROR_OK)
+			return retval;
+	}
+
+	return ERROR_OK;
+}
+
 static int aarch64_assert_reset(struct target *target)
 {
 	struct armv8_common *armv8 = target_to_armv8(target);
+	enum reset_types reset_config = jtag_get_reset_config();
+	int retval;
 
 	LOG_DEBUG(" ");
 
-	/* FIXME when halt is requested, make it work somehow... */
-
 	/* Issue some kind of warm reset. */
 	if (target_has_event_action(target, TARGET_EVENT_RESET_ASSERT))
 		target_handle_event(target, TARGET_EVENT_RESET_ASSERT);
-	else if (jtag_get_reset_config() & RESET_HAS_SRST) {
+	else if (reset_config & RESET_HAS_SRST) {
+		bool srst_asserted = false;
+
+		if (target->reset_halt) {
+			if (target_was_examined(target)) {
+
+				if (reset_config & RESET_SRST_NO_GATING) {
+					/*
+					 * SRST needs to be asserted *before* Reset Catch
+					 * debug event can be set up.
+					 */
+					adapter_assert_reset();
+					srst_asserted = true;
+
+					/* make sure to clear all sticky errors */
+					mem_ap_write_atomic_u32(armv8->debug_ap,
+							armv8->debug_base + CPUV8_DBG_DRCR, DRCR_CSE);
+				}
+
+				/* set up Reset Catch debug event to halt the CPU after reset */
+				retval = aarch64_enable_reset_catch(target, true);
+				if (retval != ERROR_OK)
+					LOG_WARNING("%s: Error enabling Reset Catch debug event; the CPU will not halt immediately after reset!",
+							target_name(target));
+			} else {
+				LOG_WARNING("%s: Target not examined, will not halt immediately after reset!",
+						target_name(target));
+			}
+		}
+
 		/* REVISIT handle "pulls" cases, if there's
 		 * hardware that needs them to work.
 		 */
-		adapter_assert_reset();
+		if (!srst_asserted)
+			adapter_assert_reset();
 	} else {
 		LOG_ERROR("%s: how to reset?", target_name(target));
 		return ERROR_FAIL;
@@ -1721,23 +1801,37 @@ static int aarch64_deassert_reset(struct target *target)
 	if (!target_was_examined(target))
 		return ERROR_OK;
 
-	retval = aarch64_poll(target);
+	retval = aarch64_init_debug_access(target);
 	if (retval != ERROR_OK)
 		return retval;
 
-	retval = aarch64_init_debug_access(target);
+	retval = aarch64_poll(target);
 	if (retval != ERROR_OK)
 		return retval;
 
 	if (target->reset_halt) {
+		/* clear pending Reset Catch debug event */
+		retval = aarch64_clear_reset_catch(target);
+		if (retval != ERROR_OK)
+			LOG_WARNING("%s: Clearing Reset Catch debug event failed",
+					target_name(target));
+
+		/* disable Reset Catch debug event */
+		retval = aarch64_enable_reset_catch(target, false);
+		if (retval != ERROR_OK)
+			LOG_WARNING("%s: Disabling Reset Catch debug event failed",
+					target_name(target));
+
 		if (target->state != TARGET_HALTED) {
 			LOG_WARNING("%s: ran after reset and before halt ...",
 				target_name(target));
 			retval = target_halt(target);
+			if (retval != ERROR_OK)
+				return retval;
 		}
 	}
 
-	return retval;
+	return ERROR_OK;
 }
 
 static int aarch64_write_cpu_memory_slow(struct target *target,
diff --git a/src/target/armv8_dpm.h b/src/target/armv8_dpm.h
index ee6f699de..a6cade345 100644
--- a/src/target/armv8_dpm.h
+++ b/src/target/armv8_dpm.h
@@ -16,6 +16,7 @@
 #define OPENOCD_TARGET_ARMV8_DPM_H
 
 #include "arm_dpm.h"
+#include "helper/bits.h"
 
 /* forward-declare struct armv8_common */
 struct armv8_common;
@@ -96,6 +97,12 @@ void armv8_dpm_report_wfar(struct arm_dpm *dpm, uint64_t wfar);
 #define DRCR_RESTART			(1 << 1)
 #define DRCR_CLEAR_EXCEPTIONS	(1 << 2)
 
+/* ECR (Execution Control Register) bits */
+#define ECR_RCE         BIT(1)
+
+/* ESR (Event Status Register) bits */
+#define ESR_RC          BIT(1)
+
 /* PRSR (processor debug status register) bits */
 #define PRSR_PU					(1 << 0)
 #define PRSR_SPD				(1 << 1)

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

Summary of changes:
 src/target/aarch64.c   | 108 +++++++++++++++++++++++++++++++++++++++++++++----
 src/target/armv8_dpm.h |   7 ++++
 2 files changed, 108 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-45-g25218e893

[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  25218e8935037367e419219f8c855d92a3163023 (commit)
       via  b0fe92dba7c01adc25e5fe3552253a4a8c69ae1a (commit)
       via  58b95eac48cf0ad3316a911ddc79ce8973b88fd1 (commit)
      from  26a57b06cf3a11a5c002f0f85a2f3f4a05f630f7 (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 25218e8935037367e419219f8c855d92a3163023
Author: Antonio Borneo <bor...@gm...>
Date:   Tue Nov 3 16:50:49 2020 +0100

    jtag: remove minidriver code and minidriver-dummy
    
    With zy1000 removed, there is no other implementation that uses
    the minidriver, apart from the test/example minidriver-dummy.
    While the idea of the minidriver is probably still valid (that is
    to intercept jtag primitives before serialization), there is no
    current use case, no guarantee it is really working, and the way
    it was implemented (by macros and #if conditionals) is really hard
    to maintain and test.
    
    Let's let it rip in git history, from where it could eventually be
    taken back in a more modern implementation.
    The entry points of minidriver API are still in the code with the
    original names.
    
    Change-Id: I882e32cb26cf5842f9cba14e3badaf8948e3760d
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6091
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/configure.ac b/configure.ac
index 71cfe21d6..269452bb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -351,10 +351,6 @@ AS_CASE([$host_os],
     ])
 ])
 
-AC_ARG_ENABLE([minidriver_dummy],
-  AS_HELP_STRING([--enable-minidriver-dummy], [Enable the dummy minidriver.]),
-  [build_minidriver_dummy=$enableval], [build_minidriver_dummy=no])
-
 AC_ARG_ENABLE([internal-jimtcl],
   AS_HELP_STRING([--disable-internal-jimtcl], [Disable building internal jimtcl]),
   [use_internal_jimtcl=$enableval], [use_internal_jimtcl=yes])
@@ -364,33 +360,10 @@ AC_ARG_ENABLE([internal-libjaylink],
   [Disable building internal libjaylink]),
   [use_internal_libjaylink=$enableval], [use_internal_libjaylink=yes])
 
-build_minidriver=no
-
 AC_ARG_ENABLE([remote-bitbang],
   AS_HELP_STRING([--enable-remote-bitbang], [Enable building support for the Remote Bitbang jtag driver]),
   [build_remote_bitbang=$enableval], [build_remote_bitbang=no])
 
-AC_MSG_CHECKING([whether to enable dummy minidriver])
-AS_IF([test "x$build_minidriver_dummy" = "xyes"], [
-  AS_IF([test "x$build_minidriver" = "xyes"], [
-    AC_MSG_ERROR([Multiple minidriver options have been enabled.])
-  ])
-  build_minidriver=yes
-  AC_DEFINE([BUILD_MINIDRIVER_DUMMY], [1], [Use the dummy minidriver.])
-  AC_DEFINE([HAVE_JTAG_MINIDRIVER_H], [1],
-      [Define to 1 if you have the <jtag_minidriver.h> header file.])
-])
-AC_MSG_RESULT([$build_minidriver_dummy])
-
-AC_MSG_CHECKING([whether standard drivers can be built])
-AS_IF([test "x$build_minidriver" = "xyes"], [
-  AC_MSG_RESULT([no])
-  AC_MSG_WARN([Using the minidriver disables all other drivers.])
-  sleep 2
-], [
-  AC_MSG_RESULT([yes])
-])
-
 AS_CASE(["${host_cpu}"],
   [i?86|x86*], [],
   [
@@ -745,9 +718,6 @@ AM_CONDITIONAL([USE_LIBJAYLINK], [test "x$use_libjaylink" = "xyes"])
 AM_CONDITIONAL([RSHIM], [test "x$build_rshim" = "xyes"])
 AM_CONDITIONAL([HAVE_CAPSTONE], [test "x$enable_capstone" != "xno"])
 
-AM_CONDITIONAL([MINIDRIVER], [test "x$build_minidriver" = "xyes"])
-AM_CONDITIONAL([MINIDRIVER_DUMMY], [test "x$build_minidriver_dummy" = "xyes"])
-
 AM_CONDITIONAL([INTERNAL_JIMTCL], [test "x$use_internal_jimtcl" = "xyes"])
 AM_CONDITIONAL([INTERNAL_LIBJAYLINK], [test "x$use_internal_libjaylink" = "xyes"])
 
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index 8bc87a484..4ed5e7aa0 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -3,29 +3,6 @@ noinst_LTLIBRARIES += %D%/libjtag.la
 JTAG_SRCS = %D%/commands.c
 %C%_libjtag_la_LIBADD =
 
-BUILT_SOURCES += %D%/minidriver_imp.h
-CLEANFILES += %D%/minidriver_imp.h
-
-if MINIDRIVER
-
-if MINIDRIVER_DUMMY
-JTAG_SRCS += %D%/minidummy/minidummy.c
-JTAG_MINIDRIVER_DIR = %D%/minidummy
-endif
-
-MINIDRIVER_IMP_DIR = %D%/minidriver
-
-%D%/jtag_minidriver.h: $(JTAG_MINIDRIVER_DIR)/jtag_minidriver.h
-	cp $< $@
-
-BUILT_SOURCES += %D%/jtag_minidriver.h
-
-CLEANFILES += %D%/jtag_minidriver.h
-
-else
-
-MINIDRIVER_IMP_DIR = %D%/drivers
-
 if HLADAPTER
 include %D%/hla/Makefile.am
 %C%_libjtag_la_LIBADD += $(top_builddir)/%D%/hla/libocdhla.la
@@ -39,13 +16,6 @@ endif
 include %D%/drivers/Makefile.am
 %C%_libjtag_la_LIBADD += $(top_builddir)/%D%/drivers/libocdjtagdrivers.la
 
-endif
-# endif // MINIDRIVER
-
-%D%/minidriver_imp.h: $(MINIDRIVER_IMP_DIR)/minidriver_imp.h
-	cp $< $@
-
-
 %C%_libjtag_la_SOURCES = \
 	%D%/adapter.c \
 	%D%/core.c \
@@ -59,8 +29,6 @@ endif
 	%D%/interfaces.h \
 	%D%/minidriver.h \
 	%D%/jtag.h \
-	%D%/minidriver/minidriver_imp.h \
-	%D%/minidummy/jtag_minidriver.h \
 	%D%/swd.h \
 	%D%/swim.h \
 	%D%/tcl.h \
diff --git a/src/jtag/adapter.c b/src/jtag/adapter.c
index af75917a3..cf579ede0 100644
--- a/src/jtag/adapter.c
+++ b/src/jtag/adapter.c
@@ -497,7 +497,6 @@ COMMAND_HANDLER(handle_adapter_reset_de_assert)
 						  (srst == VALUE_DEASSERT) ? SRST_DEASSERT : SRST_ASSERT);
 }
 
-#ifndef HAVE_JTAG_MINIDRIVER_H
 #ifdef HAVE_LIBUSB_GET_PORT_NUMBERS
 COMMAND_HANDLER(handle_usb_location_command)
 {
@@ -522,7 +521,6 @@ static const struct command_registration adapter_usb_command_handlers[] = {
 #endif /* HAVE_LIBUSB_GET_PORT_NUMBERS */
 	COMMAND_REGISTRATION_DONE
 };
-#endif /* MINIDRIVER */
 
 static const struct command_registration adapter_srst_command_handlers[] = {
 	{
@@ -588,7 +586,6 @@ static const struct command_registration adapter_command_handlers[] = {
 		.help = "Declare transports the adapter supports.",
 		.usage = "transport ... ",
 	},
-#ifndef HAVE_JTAG_MINIDRIVER_H
 	{
 		.name = "usb",
 		.mode = COMMAND_ANY,
@@ -596,7 +593,6 @@ static const struct command_registration adapter_command_handlers[] = {
 		.usage = "",
 		.chain = adapter_usb_command_handlers,
 	},
-#endif /* MINIDRIVER */
 	{
 		.name = "assert",
 		.handler = handle_adapter_reset_de_assert,
diff --git a/src/jtag/core.c b/src/jtag/core.c
index 5abf832f8..6604c5ae8 100644
--- a/src/jtag/core.c
+++ b/src/jtag/core.c
@@ -426,7 +426,6 @@ static void jtag_add_scan_check(struct jtag_tap *active, void (*jtag_add_scan)(
 
 	for (int i = 0; i < in_num_fields; i++) {
 		if ((in_fields[i].check_value != NULL) && (in_fields[i].in_value != NULL)) {
-			/* this is synchronous for a minidriver */
 			jtag_add_callback4(jtag_check_value_mask_callback,
 				(jtag_callback_data_t)in_fields[i].in_value,
 				(jtag_callback_data_t)in_fields[i].check_value,
@@ -953,12 +952,6 @@ int default_interface_jtag_execute_queue(void)
 
 	int result = jtag->jtag_ops->execute_queue();
 
-#if !HAVE_JTAG_MINIDRIVER_H
-	/* Only build this if we use a regular driver with a command queue.
-	 * Otherwise jtag_command_queue won't be found at compile/link time. Its
-	 * definition is in jtag/commands.c, which is only built/linked by
-	 * jtag/Makefile.am if MINIDRIVER_DUMMY || !MINIDRIVER, but those variables
-	 * aren't accessible here. Use HAVE_JTAG_MINIDRIVER_H */
 	struct jtag_command *cmd = jtag_command_queue;
 	while (debug_level >= LOG_LVL_DEBUG_IO && cmd) {
 		switch (cmd->type) {
@@ -1017,7 +1010,6 @@ int default_interface_jtag_execute_queue(void)
 		}
 		cmd = cmd->next;
 	}
-#endif
 
 	return result;
 }
diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index d229d8cb0..63faa9561 100644
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -42,9 +42,6 @@
  * that contain an adapter_driver structure that can added to this list.
  */
 
-#if defined(BUILD_MINIDRIVER_DUMMY)
-extern struct adapter_driver minidummy_adapter_driver;
-#else /* standard drivers */
 #if BUILD_PARPORT == 1
 extern struct adapter_driver parport_adapter_driver;
 #endif
@@ -150,19 +147,12 @@ extern struct adapter_driver stlink_dap_adapter_driver;
 #if BUILD_RSHIM == 1
 extern struct adapter_driver rshim_dap_adapter_driver;
 #endif
-#endif /* standard drivers */
 
 /**
  * The list of built-in JTAG interfaces, containing entries for those
  * drivers that were enabled by the @c configure script.
- *
- * The list should be defined to contain either one minidriver interface
- * or some number of standard driver interfaces, never both.
  */
 struct adapter_driver *adapter_drivers[] = {
-#if defined(BUILD_MINIDRIVER_DUMMY)
-		&minidummy_adapter_driver,
-#else /* standard drivers */
 #if BUILD_PARPORT == 1
 		&parport_adapter_driver,
 #endif
@@ -268,6 +258,5 @@ struct adapter_driver *adapter_drivers[] = {
 #if BUILD_RSHIM == 1
 		&rshim_dap_adapter_driver,
 #endif
-#endif /* standard drivers */
 		NULL,
 	};
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index 044d7c0c2..86091e6a7 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -624,9 +624,6 @@ bool jtag_poll_get_enabled(void);
  */
 void jtag_poll_set_enabled(bool value);
 
-
-/* The minidriver may have inline versions of some of the low
- * level APIs that are used in inner loops. */
 #include <jtag/minidriver.h>
 
 int jim_jtag_newtap(Jim_Interp *interp, int argc, Jim_Obj *const *argv);
diff --git a/src/jtag/minidriver.h b/src/jtag/minidriver.h
index ad830cc13..c6fdfafd3 100644
--- a/src/jtag/minidriver.h
+++ b/src/jtag/minidriver.h
@@ -45,7 +45,7 @@
 
 /* this header will be provided by the minidriver implementation, */
 /* and it may provide additional declarations that must be defined. */
-#include <jtag/minidriver_imp.h>
+#include <jtag/drivers/minidriver_imp.h>
 
 int interface_jtag_add_ir_scan(struct jtag_tap *active,
 		const struct scan_field *fields,
diff --git a/src/jtag/minidriver/minidriver_imp.h b/src/jtag/minidriver/minidriver_imp.h
deleted file mode 100644
index 11d0fae72..000000000
--- a/src/jtag/minidriver/minidriver_imp.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2005 by Dominic Rath <Dom...@gm...>              *
- *   Copyright (C) 2007,2008 Øyvind Harboe <oyv...@zy...>       *
- *   Copyright (C) 2009 Zachary T Welch <zw...@su...>             *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef OPENOCD_JTAG_MINIDRIVER_MINIDRIVER_IMP_H
-#define OPENOCD_JTAG_MINIDRIVER_MINIDRIVER_IMP_H
-
-#include <jtag/jtag_minidriver.h>
-
-#define jtag_add_callback(callback, in) interface_jtag_add_callback(callback, in)
-
-#define jtag_add_callback4(callback, in, data1, data2, data3) \
-	interface_jtag_add_callback4(callback, in, data1, data2, data3)
-
-#endif /* OPENOCD_JTAG_MINIDRIVER_MINIDRIVER_IMP_H */
diff --git a/src/jtag/minidummy/jtag_minidriver.h b/src/jtag/minidummy/jtag_minidriver.h
deleted file mode 100644
index 1708356a5..000000000
--- a/src/jtag/minidummy/jtag_minidriver.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2007-2008 by Øyvind Harboe                              *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#define interface_jtag_add_callback(callback, in) callback(in)
-
-#define interface_jtag_add_callback4(callback, in, data1, data2, data3) \
-	jtag_set_error(callback(in, data1, data2, data3))
diff --git a/src/jtag/minidummy/minidummy.c b/src/jtag/minidummy/minidummy.c
deleted file mode 100644
index 7ee206732..000000000
--- a/src/jtag/minidummy/minidummy.c
+++ /dev/null
@@ -1,176 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2007-2008 by Øyvind Harboe                              *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <jtag/jtag.h>
-#include <target/embeddedice.h>
-#include <jtag/minidriver.h>
-#include <jtag/interface.h>
-
-static struct jtag_interface minidummy_interface = {
-	.execute_queue = NULL,
-};
-
-struct adapter_driver minidummy_adapter_driver = {
-	.name = "minidummy",
-	.transports = jtag_only,
-	.commands = NULL,
-
-	.init = NULL,
-	.quit = NULL,
-	.speed = NULL,
-	.khz = NULL,
-	.speed_div = NULL,
-	.power_dropout = NULL,
-	.srst_asserted = NULL,
-
-	.jtag_ops = &minidummy_interface,
-};
-
-int interface_jtag_execute_queue(void)
-{
-	/* synchronously do the operation here */
-
-	return ERROR_OK;
-}
-
-int interface_jtag_add_ir_scan(struct jtag_tap *active, const struct scan_field *fields,
-		tap_state_t state)
-{
-	/* synchronously do the operation here */
-
-	return ERROR_OK;
-}
-
-int interface_jtag_add_plain_ir_scan(int num_bits, const uint8_t *out_bits,
-		uint8_t *in_bits, tap_state_t state)
-{
-	/* synchronously do the operation here */
-
-	return ERROR_OK;
-}
-
-int interface_jtag_add_dr_scan(struct jtag_tap *active, int num_fields,
-		const struct scan_field *fields, tap_state_t state)
-{
-	/* synchronously do the operation here */
-
-	return ERROR_OK;
-}
-
-int interface_jtag_add_plain_dr_scan(int num_bits, const uint8_t *out_bits,
-		uint8_t *in_bits, tap_state_t state)
-{
-	/* synchronously do the operation here */
-
-	return ERROR_OK;
-}
-
-int interface_jtag_add_tlr(void)
-{
-	/* synchronously do the operation here */
-
-	return ERROR_OK;
-}
-
-int interface_jtag_add_reset(int req_trst, int req_srst)
-{
-	/* synchronously do the operation here */
-
-	return ERROR_OK;
-}
-
-int interface_jtag_add_runtest(int num_cycles, tap_state_t state)
-{
-	/* synchronously do the operation here */
-
-	return ERROR_OK;
-}
-
-int interface_jtag_add_clocks(int num_cycles)
-{
-	/* synchronously do the operation here */
-
-	return ERROR_OK;
-}
-
-int interface_jtag_add_sleep(uint32_t us)
-{
-	jtag_sleep(us);
-	return ERROR_OK;
-}
-
-int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
-{
-	int state_count;
-	int tms = 0;
-
-	state_count = 0;
-
-	tap_state_t cur_state = cmd_queue_cur_state;
-
-	while (num_states) {
-		if (tap_state_transition(cur_state, false) == path[state_count])
-			tms = 0;
-		else if (tap_state_transition(cur_state, true) == path[state_count])
-			tms = 1;
-		else {
-			LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition",
-					tap_state_name(cur_state), tap_state_name(path[state_count]));
-			exit(-1);
-		}
-
-		/* synchronously do the operation here */
-
-		cur_state = path[state_count];
-		state_count++;
-		num_states--;
-	}
-
-
-	/* synchronously do the operation here */
-
-	return ERROR_OK;
-}
-
-int interface_add_tms_seq(unsigned num_bits, const uint8_t *seq, enum tap_state state)
-{
-	/* synchronously do the operation here */
-
-	return ERROR_OK;
-}
-
-void embeddedice_write_dcc(struct jtag_tap *tap, int reg_addr, const uint8_t *buffer,
-		int little, int count)
-{
-	int i;
-	for (i = 0; i < count; i++) {
-		embeddedice_write_reg_inner(tap, reg_addr, fast_target_buffer_get_u32(buffer, little));
-		buffer += 4;
-	}
-}
-
-int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap, uint32_t opcode,
-		uint32_t *data, size_t count)
-{
-	int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap,
-			uint32_t opcode, uint32_t *data, size_t count);
-	return arm11_run_instr_data_to_core_noack_inner_default(tap, opcode, data, count);
-}
diff --git a/src/target/arm11_dbgtap.c b/src/target/arm11_dbgtap.c
index 60be0096f..823ce5cc1 100644
--- a/src/target/arm11_dbgtap.c
+++ b/src/target/arm11_dbgtap.c
@@ -562,11 +562,7 @@ static const tap_state_t arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay[] = {
 	TAP_DRSHIFT
 };
 
-/* This inner loop can be implemented by the minidriver, oftentimes in hardware... The
- * minidriver can call the default implementation as a fallback or implement it
- * from scratch.
- */
-int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap,
+static int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap,
 	uint32_t opcode,
 	uint32_t *data,
 	size_t count)
@@ -629,21 +625,6 @@ int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap,
 	return retval;
 }
 
-int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap,
-					     uint32_t opcode,
-					     uint32_t *data,
-					     size_t count);
-
-#ifndef HAVE_JTAG_MINIDRIVER_H
-int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap,
-	uint32_t opcode,
-	uint32_t *data,
-	size_t count)
-{
-	return arm11_run_instr_data_to_core_noack_inner_default(tap, opcode, data, count);
-}
-#endif
-
 /** Execute one instruction via ITR repeatedly while
  *  passing data to the core via DTR on each execution.
  *
diff --git a/src/target/embeddedice.c b/src/target/embeddedice.c
index 7c53c45c5..a29508baf 100644
--- a/src/target/embeddedice.c
+++ b/src/target/embeddedice.c
@@ -645,7 +645,6 @@ int embeddedice_handshake(struct arm_jtag *jtag_info, int hsbit, uint32_t timeou
 	return ERROR_TARGET_TIMEOUT;
 }
 
-#ifndef HAVE_JTAG_MINIDRIVER_H
 /**
  * This is an inner loop of the open loop DCC write of data to target
  */
@@ -660,6 +659,3 @@ void embeddedice_write_dcc(struct jtag_tap *tap,
 		buffer += 4;
 	}
 }
-#else
-/* provided by minidriver */
-#endif
diff --git a/src/transport/transport.h b/src/transport/transport.h
index 6bf6aaced..e04f78063 100644
--- a/src/transport/transport.h
+++ b/src/transport/transport.h
@@ -98,7 +98,7 @@ bool transport_is_dapdirect_jtag(void);
 bool transport_is_dapdirect_swd(void);
 bool transport_is_swim(void);
 
-#if BUILD_HLADAPTER && !HAVE_JTAG_MINIDRIVER_H
+#if BUILD_HLADAPTER
 bool transport_is_hla(void);
 #else
 static inline bool transport_is_hla(void)

commit b0fe92dba7c01adc25e5fe3552253a4a8c69ae1a
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Nov 1 12:30:27 2020 +0100

    zy1000: drop the code, deprecated in v0.10.0
    
    The code for zy1000 has been marked as deprecated in release
    v0.10.0, 4 years ago.
    
    Time to drop it!
    
    Change-Id: I08fca2a2bf8f616f031e15fd37dac3197a40ba50
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6090
    Tested-by: jenkins

diff --git a/configure.ac b/configure.ac
index 215d7a7f7..71cfe21d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -283,14 +283,6 @@ AC_ARG_ENABLE([amtjtagaccel],
   AS_HELP_STRING([--enable-amtjtagaccel], [Enable building the Amontec JTAG-Accelerator driver]),
   [build_amtjtagaccel=$enableval], [build_amtjtagaccel=no])
 
-AC_ARG_ENABLE([zy1000_master],
-  AS_HELP_STRING([--enable-zy1000-master], [Use ZY1000 JTAG master registers]),
-  [build_zy1000_master=$enableval], [build_zy1000_master=no])
-
-AC_ARG_ENABLE([zy1000],
-  AS_HELP_STRING([--enable-zy1000], [Enable ZY1000 interface]),
-  [build_zy1000=$enableval], [build_zy1000=no])
-
 AS_CASE(["${host_cpu}"],
   [arm*|aarch64], [
     AC_ARG_ENABLE([bcm2835gpio],
@@ -373,16 +365,6 @@ AC_ARG_ENABLE([internal-libjaylink],
   [use_internal_libjaylink=$enableval], [use_internal_libjaylink=yes])
 
 build_minidriver=no
-AC_MSG_CHECKING([whether to enable ZY1000 minidriver])
-AS_IF([test "x$build_zy1000" = "xyes"], [
-  AS_IF([test "x$build_minidriver" = "xyes"], [
-    AC_MSG_ERROR([Multiple minidriver options have been enabled.])
-  ])
-  AC_DEFINE([HAVE_JTAG_MINIDRIVER_H], [1],
-      [Define to 1 if you have the <jtag_minidriver.h> header file.])
-  build_minidriver=yes
-])
-AC_MSG_RESULT([$build_zy1000])
 
 AC_ARG_ENABLE([remote-bitbang],
   AS_HELP_STRING([--enable-remote-bitbang], [Enable building support for the Remote Bitbang jtag driver]),
@@ -521,18 +503,6 @@ AS_IF([test "x$build_ep93xx" = "xyes"], [
   AC_DEFINE([BUILD_EP93XX], [0], [0 if you don't want ep93xx.])
 ])
 
-AS_IF([test "x$build_zy1000" = "xyes"], [
-  AC_DEFINE([BUILD_ZY1000], [1], [1 if you want ZY1000.])
-], [
-  AC_DEFINE([BUILD_ZY1000], [0], [0 if you don't want ZY1000.])
-])
-
-AS_IF([test "x$build_zy1000_master" = "xyes"], [
-  AC_DEFINE([BUILD_ZY1000_MASTER], [1], [1 if you want ZY1000 JTAG master registers.])
-], [
-  AC_DEFINE([BUILD_ZY1000_MASTER], [0], [0 if you don't want ZY1000 JTAG master registers.])
-])
-
 AS_IF([test "x$build_at91rm9200" = "xyes"], [
   build_bitbang=yes
   AC_DEFINE([BUILD_AT91RM9200], [1], [1 if you want at91rm9200.])
@@ -687,9 +657,6 @@ PKG_CHECK_MODULES([LIBJAYLINK], [libjaylink >= 0.2],
 
 m4_define([PROCESS_ADAPTERS], [
   m4_foreach([adapter], [$1], [
-	AS_IF([test "x$build_zy1000" = "xyes"], [
-		ADAPTER_VAR([adapter])=no
-	])
 	AS_IF([test $2], [
 		AS_IF([test "x$ADAPTER_VAR([adapter])" != "xno"], [
 			AC_DEFINE([BUILD_]ADAPTER_SYM([adapter]), [1], [1 if you want the ]ADAPTER_DESC([adapter]).)
@@ -751,8 +718,6 @@ AM_CONDITIONAL([PARPORT], [test "x$build_parport" = "xyes"])
 AM_CONDITIONAL([DUMMY], [test "x$build_dummy" = "xyes"])
 AM_CONDITIONAL([GIVEIO], [test "x$parport_use_giveio" = "xyes"])
 AM_CONDITIONAL([EP93XX], [test "x$build_ep93xx" = "xyes"])
-AM_CONDITIONAL([ZY1000], [test "x$build_zy1000" = "xyes"])
-AM_CONDITIONAL([ZY1000_MASTER], [test "x$build_zy1000_master" = "xyes"])
 AM_CONDITIONAL([AT91RM9200], [test "x$build_at91rm9200" = "xyes"])
 AM_CONDITIONAL([BCM2835GPIO], [test "x$build_bcm2835gpio" = "xyes"])
 AM_CONDITIONAL([IMX_GPIO], [test "x$build_imx_gpio" = "xyes"])
@@ -867,11 +832,3 @@ m4_foreach([adapter], [USB1_ADAPTERS, USB0_ADAPTERS,
 	])
 ])
 echo
-
-AS_IF([test "x$build_zy1000" = "xyes" -o "x$build_zy1000_master" = "xyes"], [
-  echo 'WARNING! Deprecated configure option (--enable-zy1000, --enable-zy1000-master)'
-  echo 'Support for the ZY1000 platform is deprecated and will be removed in the next'
-  echo 'release. If you regularly use this platform, please report to the OpenOCD'
-  echo 'Mailing List.'
-  echo
-])
diff --git a/doc/manual/jtag.txt b/doc/manual/jtag.txt
index 8f0804ce9..2653fc78f 100644
--- a/doc/manual/jtag.txt
+++ b/doc/manual/jtag.txt
@@ -36,7 +36,6 @@ asynchronous transactions.
   - declared in @c src/jtag/minidriver.h
   - used @a only by the core and minidriver implementations:
     - @c jtag_driver.c (in-tree OpenOCD drivers)
-    - @c zy1000/build/include/jtag_minidriver.h (ZY1000 minidriver)
     - future implementations (on other embedded hosts)
     - interface device drivers do @b not need this API.
 
diff --git a/doc/openocd.texi b/doc/openocd.texi
index f52cfa7d9..b3fe85404 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -298,7 +298,6 @@ The OpenOCD Bug Tracker is hosted on SourceForge:
 @cindex dongles
 @cindex FTDI
 @cindex wiggler
-@cindex zy1000
 @cindex printer port
 @cindex USB Adapter
 @cindex RTCK
@@ -307,12 +306,7 @@ Defined: @b{dongle}: A small device that plugs into a computer and serves as
 an adapter .... [snip]
 
 In the OpenOCD case, this generally refers to @b{a small adapter} that
-attaches to your computer via USB or the parallel port. One
-exception is the Ultimate Solutions ZY1000, packaged as a small box you
-attach via an ethernet cable. The ZY1000 has the advantage that it does not
-require any drivers to be installed on the developer PC. It also has
-a built in web interface. It supports RTCK/RCLK or adaptive clocking
-and has a built-in relay to power cycle targets remotely.
+attaches to your computer via USB or the parallel port.
 
 
 @section Choosing a Dongle
@@ -334,26 +328,6 @@ Ethernet port needed?
 RTCK support (also known as ``adaptive clocking'')?
 @end enumerate
 
-@section Stand-alone JTAG Probe
-
-The ZY1000 from Ultimate Solutions is technically not a dongle but a
-stand-alone JTAG probe that, unlike most dongles, doesn't require any drivers
-running on the developer's host computer.
-Once installed on a network using DHCP or a static IP assignment, users can
-access the ZY1000 probe locally or remotely from any host with access to the
-IP address assigned to the probe.
-The ZY1000 provides an intuitive web interface with direct access to the
-OpenOCD debugger.
-Users may also run a GDBSERVER directly on the ZY1000 to take full advantage
-of GCC & GDB to debug any distribution of embedded Linux or NetBSD running on
-the target.
-The ZY1000 supports RTCK & RCLK or adaptive clocking and has a built-in relay
-to power cycle the target remotely.
-
-For more information, visit:
-
-@b{ZY1000} See: @url{http://www.ultsol.com/index.php/component/content/article/8/210-zylin-zy1000-main}
-
 @section USB FT2232 Based
 
 There are many USB JTAG dongles on the market, many of them based
@@ -3222,20 +3196,6 @@ The string will be of the format "DDDD:BB:SS.F" such as "0000:65:00.1".
 @end deffn
 @end deffn
 
-@deffn {Interface Driver} {ZY1000}
-This is the Zylin ZY1000 JTAG debugger.
-@end deffn
-
-@quotation Note
-This defines some driver-specific commands,
-which are not currently documented here.
-@end quotation
-
-@deffn Command power [@option{on}|@option{off}]
-Turn power switch to target on/off.
-No arguments: print status.
-@end deffn
-
 @deffn {Interface Driver} {bcm2835gpio}
 This SoC is present in Raspberry Pi which is a cheap single-board computer
 exposing some GPIOs on its expansion header.
diff --git a/src/jtag/Makefile.am b/src/jtag/Makefile.am
index b82914bcb..8bc87a484 100644
--- a/src/jtag/Makefile.am
+++ b/src/jtag/Makefile.am
@@ -8,10 +8,6 @@ CLEANFILES += %D%/minidriver_imp.h
 
 if MINIDRIVER
 
-if ZY1000
-JTAG_SRCS += %D%/zy1000/zy1000.c
-JTAG_MINIDRIVER_DIR = %D%/zy1000
-endif
 if MINIDRIVER_DUMMY
 JTAG_SRCS += %D%/minidummy/minidummy.c
 JTAG_MINIDRIVER_DIR = %D%/minidummy
diff --git a/src/jtag/interfaces.c b/src/jtag/interfaces.c
index 061a78f9c..d229d8cb0 100644
--- a/src/jtag/interfaces.c
+++ b/src/jtag/interfaces.c
@@ -42,9 +42,7 @@
  * that contain an adapter_driver structure that can added to this list.
  */
 
-#if BUILD_ZY1000 == 1
-extern struct adapter_driver zy1000_adapter_driver;
-#elif defined(BUILD_MINIDRIVER_DUMMY)
+#if defined(BUILD_MINIDRIVER_DUMMY)
 extern struct adapter_driver minidummy_adapter_driver;
 #else /* standard drivers */
 #if BUILD_PARPORT == 1
@@ -162,9 +160,7 @@ extern struct adapter_driver rshim_dap_adapter_driver;
  * or some number of standard driver interfaces, never both.
  */
 struct adapter_driver *adapter_drivers[] = {
-#if BUILD_ZY1000 == 1
-		&zy1000_adapter_driver,
-#elif defined(BUILD_MINIDRIVER_DUMMY)
+#if defined(BUILD_MINIDRIVER_DUMMY)
 		&minidummy_adapter_driver,
 #else /* standard drivers */
 #if BUILD_PARPORT == 1
diff --git a/src/jtag/jtag.h b/src/jtag/jtag.h
index 2fa580223..044d7c0c2 100644
--- a/src/jtag/jtag.h
+++ b/src/jtag/jtag.h
@@ -46,15 +46,6 @@
 typedef enum tap_state {
 	TAP_INVALID = -1,
 
-#if BUILD_ZY1000
-	/* These are the old numbers. Leave as-is for now... */
-	TAP_RESET    = 0, TAP_IDLE = 8,
-	TAP_DRSELECT = 1, TAP_DRCAPTURE = 2, TAP_DRSHIFT = 3, TAP_DREXIT1 = 4,
-	TAP_DRPAUSE  = 5, TAP_DREXIT2 = 6, TAP_DRUPDATE = 7,
-	TAP_IRSELECT = 9, TAP_IRCAPTURE = 10, TAP_IRSHIFT = 11, TAP_IREXIT1 = 12,
-	TAP_IRPAUSE  = 13, TAP_IREXIT2 = 14, TAP_IRUPDATE = 15,
-
-#else
 	/* Proper ARM recommended numbers */
 	TAP_DREXIT2 = 0x0,
 	TAP_DREXIT1 = 0x1,
@@ -72,8 +63,6 @@ typedef enum tap_state {
 	TAP_IRUPDATE = 0xd,
 	TAP_IRCAPTURE = 0xe,
 	TAP_RESET = 0x0f,
-
-#endif
 } tap_state_t;
 
 /**
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index e5c3b0f75..f1e69e591 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -29,7 +29,7 @@ proc init_reset { mode } {
 #########
 
 # TODO: power_restore and power_dropout are currently neither
-# documented nor supported except on ZY1000.
+# documented nor supported.
 
 proc power_restore {} {
 	echo "Sensed power restore, running reset init and halting GDB."
@@ -55,7 +55,7 @@ proc power_dropout {} {
 #########
 
 # TODO: srst_deasserted and srst_asserted are currently neither
-# documented nor supported except on ZY1000.
+# documented nor supported.
 
 proc srst_deasserted {} {
 	echo "Sensed nSRST deasserted, running reset init and halting GDB."
diff --git a/src/jtag/zy1000/jtag_minidriver.h b/src/jtag/zy1000/jtag_minidriver.h
deleted file mode 100644
index 7d1ede5d4..000000000
--- a/src/jtag/zy1000/jtag_minidriver.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2007-2010 by Øyvind Harboe                              *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-/* used to test manual mode */
-#define TEST_MANUAL() 0
-#define VERBOSE(a)
-
-#if BUILD_ZY1000_MASTER
-
-#define ZY1000_PEEK(a, b) do {b = *((volatile uint32_t *)(a)); } while (0)
-#define ZY1000_POKE(a, b) do {*((volatile uint32_t *)(a)) = b; } while (0)
-extern volatile void *zy1000_jtag_master;
-#define ZY1000_JTAG_BASE ((unsigned long)zy1000_jtag_master)
-
-#else
-
-/* redirect this to TCP/IP */
-#define ZY1000_JTAG_BASE 0
-extern void zy1000_tcpout(uint32_t address, uint32_t data);
-extern uint32_t zy1000_tcpin(uint32_t address);
-#define ZY1000_PEEK(a, b) b = zy1000_tcpin(a)
-#define ZY1000_POKE(a, b) zy1000_tcpout(a, b)
-
-#endif
-
-#if BUILD_ZY1000_MASTER
-/* FIFO empty? */
-static inline void waitIdle(void)
-{
-	uint32_t empty;
-	do {
-		ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty);
-	} while ((empty & 0x100) == 0);
-}
-
-static inline void zy1000_flush_readqueue(void)
-{
-	/* Not used w/hardware fifo */
-}
-static inline void zy1000_flush_callbackqueue(void)
-{
-	/* Not used w/hardware fifo */
-}
-#else
-extern void waitIdle(void);
-void zy1000_flush_readqueue(void);
-void zy1000_flush_callbackqueue(void);
-void zy1000_jtag_add_callback4(jtag_callback_t callback,
-		jtag_callback_data_t data0,
-		jtag_callback_data_t data1,
-		jtag_callback_data_t data2,
-		jtag_callback_data_t data3);
-void zy1000_jtag_add_callback(jtag_callback1_t callback, jtag_callback_data_t data0);
-#endif
-
-static inline void waitQueue(void)
-{
-/*	waitIdle(); */
-}
-
-static inline void sampleShiftRegister(void)
-{
-#if 0
-	uint32_t dummy;
-	waitIdle();
-	ZY1000_PEEK(ZY1000_JTAG_BASE + 0xc, dummy);
-#endif
-}
-
-static inline void setCurrentState(enum tap_state state)
-{
-	uint32_t a;
-	a = state;
-	int repeat = 0;
-	if (state == TAP_RESET) {
-		/* The FPGA nor we know the current state of the CPU TAP */
-		/* controller. This will move it to TAP for sure. */
-		/*  */
-		/* 5 should be enough here, 7 is what OpenOCD uses */
-		repeat = 7;
-	}
-	waitQueue();
-	sampleShiftRegister();
-	ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8) | (a << 4) | a);
-
-}
-
-/*
- * Enter state and cause repeat transitions *out* of that state. So if the endState != state, then
- * the transition from state to endState counts as a transition out of state.
- */
-static inline void shiftValueInner(const enum tap_state state,
-	const enum tap_state endState,
-	int repeat,
-	uint32_t value)
-{
-	uint32_t a, b;
-	a = state;
-	b = endState;
-	waitQueue();
-	sampleShiftRegister();
-	ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value);
-#if 1
-#if TEST_MANUAL()
-	if ((state == TAP_DRSHIFT) && (endState != TAP_DRSHIFT)) {
-		int i;
-		setCurrentState(state);
-		for (i = 0; i < repeat; i++) {
-			int tms;
-			tms = 0;
-			if ((i == repeat-1) && (state != endState))
-				tms = 1;
-					/* shift out value */
-			waitIdle();
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, (((value >> i)&1) << 1) | tms);
-		}
-		waitIdle();
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
-		waitIdle();
-		/* ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_DRSHIFT); // set this state and things
-		 * break => expected */
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_DRPAUSE);	/* set this and things will
-									 * work => expected. Not
-									 * setting this is not
-									 * sufficient to make things
-									 * break. */
-		setCurrentState(endState);
-	} else
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8) | (a << 4) | b);
-
-#else
-	/* fast version */
-	ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8) | (a << 4) | b);
-#endif
-#else
-	/* maximum debug version */
-	if ((repeat > 0) && ((state == TAP_DRSHIFT) || (state == TAP_SI))) {
-		int i;
-		/* sample shift register for every bit. */
-		for (i = 0; i < repeat-1; i++) {
-			sampleShiftRegister();
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value >> i);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (1 << 8) | (a << 4) | a);
-		}
-		sampleShiftRegister();
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0xc, value >> (repeat-1));
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (1 << 8) | (a << 4) | b);
-	} else {
-		sampleShiftRegister();
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x8, (repeat << 8) | (a << 4) | b);
-	}
-	sampleShiftRegister();
-#endif
-}
-
-#if BUILD_ZY1000_MASTER
-#define interface_jtag_add_callback(callback, in) callback(in)
-#define interface_jtag_add_callback4(callback, in, data1, data2, \
-		data3) jtag_set_error(callback(in, data1, data2, data3))
-#else
-#define interface_jtag_add_callback(callback, in) zy1000_jtag_add_callback(callback, in)
-#define interface_jtag_add_callback4(callback, in, data1, data2, data3) zy1000_jtag_add_callback4( \
-	callback, \
-	in, \
-	data1, \
-	data2, \
-	data3)
-#endif
diff --git a/src/jtag/zy1000/zy1000.c b/src/jtag/zy1000/zy1000.c
deleted file mode 100644
index 669e6f45c..000000000
--- a/src/jtag/zy1000/zy1000.c
+++ /dev/null
@@ -1,1259 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2007-2010 by Øyvind Harboe                              *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-/* This file supports the zy1000 debugger:
- *
- * http://www.ultsol.com/index.php/component/content/article/8/33-zylin-zy1000-jtag-probe
- *
- * The zy1000 is a standalone debugger that has a web interface and
- * requires no drivers on the developer host as all communication
- * is via TCP/IP. The zy1000 gets it performance(~400-700kBytes/s
- * DCC downloads @ 16MHz target) as it has an FPGA to hardware
- * accelerate the JTAG commands, while offering *very* low latency
- * between OpenOCD and the FPGA registers.
- *
- * The disadvantage of the zy1000 is that it has a feeble CPU compared to
- * a PC(ca. 50-500 DMIPS depending on how one counts it), whereas a PC
- * is on the order of 10000 DMIPS(i.e. at a factor of 20-200).
- *
- * The zy1000 revc hardware is using an Altera Nios CPU, whereas the
- * revb is using ARM7 + Xilinx.
- *
- * See Zylin web pages or contact Zylin for more information.
- *
- * The reason this code is in OpenOCD rather than OpenOCD linked with the
- * ZY1000 code is that OpenOCD is the long road towards getting
- * libopenocd into place. libopenocd will support both low performance,
- * low latency systems(embedded) and high performance high latency
- * systems(PCs).
- */
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <pthread.h>
-
-#include <target/embeddedice.h>
-#include <jtag/minidriver.h>
-#include <jtag/interface.h>
-#include <time.h>
-#include <helper/time_support.h>
-
-#include <netinet/tcp.h>
-
-/* Assume we're connecting to a revc w/60MHz clock. */
-#define ZYLIN_KHZ 60000
-
-/* The software needs to check if it's in RCLK mode or not */
-static bool zy1000_rclk;
-
-static int zy1000_khz(int khz, int *jtag_speed)
-{
-	if (khz == 0)
-		*jtag_speed = 0;
-	else {
-		int speed;
-		/* Round speed up to nearest divisor.
-		 *
-		 * E.g. 16000kHz
-		 * (64000 + 15999) / 16000 = 4
-		 * (4 + 1) / 2 = 2
-		 * 2 * 2 = 4
-		 *
-		 * 64000 / 4 = 16000
-		 *
-		 * E.g. 15999
-		 * (64000 + 15998) / 15999 = 5
-		 * (5 + 1) / 2 = 3
-		 * 3 * 2 = 6
-		 *
-		 * 64000 / 6 = 10666
-		 *
-		 */
-		speed = (ZYLIN_KHZ + (khz - 1)) / khz;
-		speed = (speed + 1) / 2;
-		speed *= 2;
-		if (speed > 8190) {
-			/* maximum dividend */
-			speed = 8190;
-		}
-		*jtag_speed = speed;
-	}
-	return ERROR_OK;
-}
-
-static int zy1000_speed_div(int speed, int *khz)
-{
-	if (speed == 0)
-		*khz = 0;
-	else
-		*khz = ZYLIN_KHZ / speed;
-
-	return ERROR_OK;
-}
-
-static bool readPowerDropout(void)
-{
-	uint32_t state;
-	/* sample and clear power dropout */
-	ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x80);
-	ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, state);
-	bool powerDropout;
-	powerDropout = (state & 0x80) != 0;
-	return powerDropout;
-}
-
-
-static bool readSRST(void)
-{
-	uint32_t state;
-	/* sample and clear SRST sensing */
-	ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000040);
-	ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, state);
-	bool srstAsserted;
-	srstAsserted = (state & 0x40) != 0;
-	return srstAsserted;
-}
-
-static int zy1000_srst_asserted(int *srst_asserted)
-{
-	*srst_asserted = readSRST();
-	return ERROR_OK;
-}
-
-static int zy1000_power_dropout(int *dropout)
-{
-	*dropout = readPowerDropout();
-	return ERROR_OK;
-}
-
-/* Wait for SRST to assert or deassert */
-static void waitSRST(bool asserted)
-{
-	bool first = true;
-	int64_t start = 0;
-	int64_t total = 0;
-	const char *mode = asserted ? "assert" : "deassert";
-
-	for (;; ) {
-		bool srstAsserted = readSRST();
-		if ((asserted && srstAsserted) || (!asserted && !srstAsserted)) {
-			if (total > 1)
-				LOG_USER("SRST took %dms to %s", (int)total, mode);
-			break;
-		}
-
-		if (first) {
-			first = false;
-			start = timeval_ms();
-		}
-
-		total = timeval_ms() - start;
-
-		keep_alive();
-
-		if (total > 5000) {
-			LOG_ERROR("SRST took too long to %s: %" PRId64 "ms", mode, total);
-			break;
-		}
-	}
-}
-
-void zy1000_reset(int trst, int srst)
-{
-	LOG_DEBUG("zy1000 trst=%d, srst=%d", trst, srst);
-
-	/* flush the JTAG FIFO. Not flushing the queue before messing with
-	 * reset has such interesting bugs as causing hard to reproduce
-	 * RCLK bugs as RCLK will stop responding when TRST is asserted
-	 */
-	waitIdle();
-
-	if (!srst)
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x00000001);
-	else {
-		/* Danger!!! if clk != 0 when in
-		 * idle in TAP_IDLE, reset halt on str912 will fail.
-		 */
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000001);
-
-		waitSRST(true);
-	}
-
-	if (!trst)
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x00000002);
-	else {
-		/* assert reset */
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x00000002);
-	}
-
-	if (trst || (srst && (jtag_get_reset_config() & RESET_SRST_PULLS_TRST))) {
-		/* we're now in the RESET state until trst is deasserted */
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_RESET);
-	} else {
-		/* We'll get RCLK failure when we assert TRST, so clear any false positives here */
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x400);
-	}
-
-	/* wait for srst to float back up */
-	if ((!srst && ((jtag_get_reset_config() & RESET_TRST_PULLS_SRST) == 0)) ||
-			(!srst && !trst && (jtag_get_reset_config() & RESET_TRST_PULLS_SRST)))
-		waitSRST(false);
-}
-
-int zy1000_speed(int speed)
-{
-	/* flush JTAG master FIFO before setting speed */
-	waitIdle();
-
-	zy1000_rclk = false;
-
-	if (speed == 0) {
-		/*0 means RCLK*/
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x100);
-		zy1000_rclk = true;
-		LOG_DEBUG("jtag_speed using RCLK");
-	} else {
-		if (speed > 8190 || speed < 2) {
-			LOG_USER(
-				"valid ZY1000 jtag_speed=[8190,2]. With divisor is %dkHz / even values between 8190-2, i.e. min %dHz, max %dMHz",
-				ZYLIN_KHZ,
-				(ZYLIN_KHZ * 1000) / 8190,
-				ZYLIN_KHZ / (2 * 1000));
-			return ERROR_COMMAND_SYNTAX_ERROR;
-		}
-
-		int khz;
-		speed &= ~1;
-		zy1000_speed_div(speed, &khz);
-		LOG_USER("jtag_speed %d => JTAG clk=%d kHz", speed, khz);
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x100);
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x1c, speed);
-	}
-	return ERROR_OK;
-}
-
-static bool savePower;
-
-static void setPower(bool power)
-{
-	savePower = power;
-	if (power)
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x8);
-	else
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x10, 0x8);
-}
-
-COMMAND_HANDLER(handle_power_command)
-{
-	switch (CMD_ARGC) {
-		case 1: {
-			bool enable;
-			COMMAND_PARSE_ON_OFF(CMD_ARGV[0], enable);
-			setPower(enable);
-		}
-			/* fall through */
-		case 0:
-			LOG_INFO("Target power %s", savePower ? "on" : "off");
-			break;
-		default:
-			return ERROR_COMMAND_SYNTAX_ERROR;
-	}
-
-	return ERROR_OK;
-}
-
-#if !BUILD_ZY1000_MASTER
-static char *tcp_server = "notspecified";
-static int jim_zy1000_server(Jim_Interp *interp, int argc, Jim_Obj * const *argv)
-{
-	if (argc != 2)
-		return JIM_ERR;
-
-	tcp_server = strdup(Jim_GetString(argv[1], NULL));
-
-	return JIM_OK;
-}
-#endif
-
-static int zylinjtag_Jim_Command_powerstatus(Jim_Interp *interp,
-	int argc,
-	Jim_Obj * const *argv)
-{
-	if (argc != 1) {
-		Jim_WrongNumArgs(interp, 1, argv, "powerstatus");
-		return JIM_ERR;
-	}
-
-	bool dropout = readPowerDropout();
-
-	Jim_SetResult(interp, Jim_NewIntObj(interp, dropout));
-
-	return JIM_OK;
-}
-
-int zy1000_quit(void)
-{
-
-	return ERROR_OK;
-}
-
-int interface_jtag_execute_queue(void)
-{
-	uint32_t empty;
-
-	waitIdle();
-
-	/* We must make sure to write data read back to memory location before we return
-	 * from this fn
-	 */
-	zy1000_flush_readqueue();
-
-	/* and handle any callbacks... */
-	zy1000_flush_callbackqueue();
-
-	if (zy1000_rclk) {
-		/* Only check for errors when using RCLK to speed up
-		 * jtag over TCP/IP
-		 */
-		ZY1000_PEEK(ZY1000_JTAG_BASE + 0x10, empty);
-		/* clear JTAG error register */
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x14, 0x400);
-
-		if ((empty&0x400) != 0) {
-			LOG_WARNING("RCLK timeout");
-			/* the error is informative only as we don't want to break the firmware if there
-			 * is a false positive.
-			 */
-			/*		return ERROR_FAIL; */
-		}
-	}
-	return ERROR_OK;
-}
-
-static void writeShiftValue(uint8_t *data, int bits);
-
-/* here we shuffle N bits out/in */
-static inline void scanBits(const uint8_t *out_value,
-	uint8_t *in_value,
-	int num_bits,
-	bool pause_now,
-	tap_state_t shiftState,
-	tap_state_t end_state)
-{
-	tap_state_t pause_state = shiftState;
-	for (int j = 0; j < num_bits; j += 32) {
-		int k = num_bits - j;
-		if (k > 32) {
-			k = 32;
-			/* we have more to shift out */
-		} else if (pause_now) {
-			/* this was the last to shift out this time */
-			pause_state = end_state;
-		}
-
-		/* we have (num_bits + 7)/8 bytes of bits to toggle out. */
-		/* bits are pushed out LSB to MSB */
-		uint32_t value;
-		value = 0;
-		if (out_value != NULL) {
-			for (int l = 0; l < k; l += 8)
-				value |= out_value[(j + l)/8]<<l;
-		}
-		/* mask away unused bits for easier debugging */
-		if (k < 32)
-			value &= ~(((uint32_t)0xffffffff) << k);
-		else {
-			/* Shifting by >= 32 is not defined by the C standard
-			 * and will in fact shift by &0x1f bits on nios */
-		}
-
-		shiftValueInner(shiftState, pause_state, k, value);
-
-		if (in_value != NULL)
-			writeShiftValue(in_value + (j/8), k);
-	}
-}
-
-static inline void scanFields(int num_fields,
-	const struct scan_field *fields,
-	tap_state_t shiftState,
-	tap_state_t end_state)
-{
-	for (int i = 0; i < num_fields; i++) {
-		scanBits(fields[i].out_value,
-			fields[i].in_value,
-			fields[i].num_bits,
-			(i == num_fields-1),
-			shiftState,
-			end_state);
-	}
-}
-
-int interface_jtag_add_ir_scan(struct jtag_tap *active,
-	const struct scan_field *fields,
-	tap_state_t state)
-{
-	int scan_size = 0;
-	struct jtag_tap *tap, *nextTap;
-	tap_state_t pause_state = TAP_IRSHIFT;
-
-	for (tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = nextTap) {
-		nextTap = jtag_tap_next_enabled(tap);
-		if (nextTap == NULL)
-			pause_state = state;
-		scan_size = tap->ir_length;
-
-		/* search the list */
-		if (tap == active) {
-			scanFields(1, fields, TAP_IRSHIFT, pause_state);
-			/* update device information */
-			buf_cpy(fields[0].out_value, tap->cur_instr, scan_size);
-
-			tap->bypass = 0;
-		} else {
-			/* if a device isn't listed, set it to BYPASS */
-			assert(scan_size <= 32);
-			shiftValueInner(TAP_IRSHIFT, pause_state, scan_size, 0xffffffff);
-
-			/* Optimization code will check what the cur_instr is set to, so
-			 * we must set it to bypass value.
-			 */
-			buf_set_ones(tap->cur_instr, tap->ir_length);
-
-			tap->bypass = 1;
-		}
-	}
-
-	return ERROR_OK;
-}
-
-int interface_jtag_add_plain_ir_scan(int num_bits,
-	const uint8_t *out_bits,
-	uint8_t *in_bits,
-	tap_state_t state)
-{
-	scanBits(out_bits, in_bits, num_bits, true, TAP_IRSHIFT, state);
-	return ERROR_OK;
-}
-
-int interface_jtag_add_dr_scan(struct jtag_tap *active,
-	int num_fields,
-	const struct scan_field *fields,
-	tap_state_t state)
-{
-	struct jtag_tap *tap, *nextTap;
-	tap_state_t pause_state = TAP_DRSHIFT;
-	for (tap = jtag_tap_next_enabled(NULL); tap != NULL; tap = nextTap) {
-		nextTap = jtag_tap_next_enabled(tap);
-		if (nextTap == NULL)
-			pause_state = state;
-
-		/* Find a range of fields to write to this tap */
-		if (tap == active) {
-			assert(!tap->bypass);
-
-			scanFields(num_fields, fields, TAP_DRSHIFT, pause_state);
-		} else {
-			/* Shift out a 0 for disabled tap's */
-			assert(tap->bypass);
-			shiftValueInner(TAP_DRSHIFT, pause_state, 1, 0);
-		}
-	}
-	return ERROR_OK;
-}
-
-int interface_jtag_add_plain_dr_scan(int num_bits,
-	const uint8_t *out_bits,
-	uint8_t *in_bits,
-	tap_state_t state)
-{
-	scanBits(out_bits, in_bits, num_bits, true, TAP_DRSHIFT, state);
-	return ERROR_OK;
-}
-
-int interface_jtag_add_tlr(void)
-{
-	setCurrentState(TAP_RESET);
-	return ERROR_OK;
-}
-
-int interface_jtag_add_reset(int req_trst, int req_srst)
-{
-	zy1000_reset(req_trst, req_srst);
-	return ERROR_OK;
-}
-
-static int zy1000_jtag_add_clocks(int num_cycles, tap_state_t state, tap_state_t clockstate)
-{
-	/* num_cycles can be 0 */
-	setCurrentState(clockstate);
-
-	/* execute num_cycles, 32 at the time. */
-	int i;
-	for (i = 0; i < num_cycles; i += 32) {
-		int num;
-		num = 32;
-		if (num_cycles-i < num)
-			num = num_cycles-i;
-		shiftValueInner(clockstate, clockstate, num, 0);
-	}
-
-#if !TEST_MANUAL()
-	/* finish in end_state */
-	setCurrentState(state);
-#else
-	tap_state_t t = TAP_IDLE;
-	/* test manual drive code on any target */
-	int tms;
-	uint8_t tms_scan = tap_get_tms_path(t, state);
-	int tms_count = tap_get_tms_path_len(tap_get_state(), tap_get_end_state());
-
-	for (i = 0; i < tms_count; i++) {
-		tms = (tms_scan >> i) & 1;
-		waitIdle();
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x28,  tms);
-	}
-	waitIdle();
-	ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, state);
-#endif
-
-	return ERROR_OK;
-}
-
-int interface_jtag_add_runtest(int num_cycles, tap_state_t state)
-{
-	return zy1000_jtag_add_clocks(num_cycles, state, TAP_IDLE);
-}
-
-int interface_jtag_add_clocks(int num_cycles)
-{
-	return zy1000_jtag_add_clocks(num_cycles, cmd_queue_cur_state, cmd_queue_cur_state);
-}
-
-int interface_add_tms_seq(unsigned num_bits, const uint8_t *seq, enum tap_state state)
-{
-	/*wait for the fifo to be empty*/
-	waitIdle();
-
-	for (unsigned i = 0; i < num_bits; i++) {
-		int tms;
-
-		if (((seq[i/8] >> (i % 8)) & 1) == 0)
-			tms = 0;
-		else
-			tms = 1;
-
-		waitIdle();
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, tms);
-	}
-
-	waitIdle();
-	if (state != TAP_INVALID)
-		ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, state);
-	else {
-		/* this would be normal if
-		 * we are switching to SWD mode */
-	}
-	return ERROR_OK;
-}
-
-int interface_jtag_add_pathmove(int num_states, const tap_state_t *path)
-{
-	int state_count;
-	int tms = 0;
-
-	state_count = 0;
-
-	tap_state_t cur_state = cmd_queue_cur_state;
-
-	uint8_t seq[16];
-	memset(seq, 0, sizeof(seq));
-	assert(num_states < (int)((sizeof(seq) * 8)));
-
-	while (num_states) {
-		if (tap_state_transition(cur_state, false) == path[state_count])
-			tms = 0;
-		else if (tap_state_transition(cur_state, true) == path[state_count])
-			tms = 1;
-		else {
-			LOG_ERROR("BUG: %s -> %s isn't a valid TAP transition",
-				tap_state_name(cur_state), tap_state_name(path[state_count]));
-			exit(-1);
-		}
-
-		seq[state_count/8] = seq[state_count/8] | (tms << (state_count % 8));
-
-		cur_state = path[state_count];
-		state_count++;
-		num_states--;
-	}
-
-	return interface_add_tms_seq(state_count, seq, cur_state);
-}
-
-static void jtag_pre_post_bits(struct jtag_tap *tap, int *pre, int *post)
-{
-	/* bypass bits before and after */
-	int pre_bits = 0;
-	int post_bits = 0;
-
-	bool found = false;
-	struct jtag_tap *cur_tap, *nextTap;
-	for (cur_tap = jtag_tap_next_enabled(NULL); cur_tap != NULL; cur_tap = nextTap) {
-		nextTap = jtag_tap_next_enabled(cur_tap);
-		if (cur_tap == tap)
-			found = true;
-		else {
-			if (found)
-				post_bits++;
-			else
-				pre_bits++;
-		}
-	}
-	*pre = pre_bits;
-	*post = post_bits;
-}
-
-void embeddedice_write_dcc(struct jtag_tap *tap,
-	int reg_addr,
-	const uint8_t *buffer,
-	int little,
-	int count)
-{
-#if 0
-	int i;
-	for (i = 0; i < count; i++) {
-		embeddedice_write_reg_inner(tap, reg_addr, fast_target_buffer_get_u32(buffer,
-				little));
-		buffer += 4;
-	}
-#else
-	int pre_bits;
-	int post_bits;
-	jtag_pre_post_bits(tap, &pre_bits, &post_bits);
-
-	if ((pre_bits > 32) || (post_bits + 6 > 32)) {
-		int i;
-		for (i = 0; i < count; i++) {
-			embeddedice_write_reg_inner(tap, reg_addr,
-				fast_target_buffer_get_u32(buffer, little));
-			buffer += 4;
-		}
-	} else {
-		int i;
-		for (i = 0; i < count; i++) {
-			/* Fewer pokes means we get to use the FIFO more efficiently */
-			shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, pre_bits, 0);
-			shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32,
-				fast_target_buffer_get_u32(buffer, little));
-			/* Danger! here we need to exit into the TAP_IDLE state to make
-			 * DCC pick up this value.
-			 */
-			shiftValueInner(TAP_DRSHIFT, TAP_IDLE, 6 + post_bits,
-				(reg_addr | (1 << 5)));
-			buffer += 4;
-		}
-	}
-#endif
-}
-
-int arm11_run_instr_data_to_core_noack_inner(struct jtag_tap *tap,
-	uint32_t opcode,
-	uint32_t *data,
-	size_t count)
-{
-	/* bypass bits before and after */
-	int pre_bits;
-	int post_bits;
-	jtag_pre_post_bits(tap, &pre_bits, &post_bits);
-	post_bits += 2;
-
-	if ((pre_bits > 32) || (post_bits > 32)) {
-		int arm11_run_instr_data_to_core_noack_inner_default(struct jtag_tap *tap,
-				uint32_t opcode, uint32_t *data, size_t count);
-		return arm11_run_instr_data_to_core_noack_inner_default(tap, opcode, data, count);
-	} else {
-		static const uint8_t zero;
-
-		/* FIX!!!!!! the target_write_memory() API started this nasty problem
-		 * with unaligned uint32_t * pointers... */
-		const uint8_t *t = (const uint8_t *)data;
-
-		while (--count > 0) {
-#if 1
-			/* Danger! This code doesn't update cmd_queue_cur_state, so
-			 * invoking jtag_add_pathmove() before jtag_add_dr_scan() after
-			 * this loop would fail!
-			 */
-			shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, pre_bits, 0);
-
-			uint32_t value;
-			value = *t++;
-			value |= (*t++<<8);
-			value |= (*t++<<16);
-			value |= (*t++<<24);
-
-			shiftValueInner(TAP_DRSHIFT, TAP_DRSHIFT, 32, value);
-			/* minimum 2 bits */
-			shiftValueInner(TAP_DRSHIFT, TAP_DRPAUSE, post_bits, 0);
-
-			/* copy & paste from arm11_dbgtap.c */
-			/* TAP_DREXIT2, TAP_DRUPDATE, TAP_IDLE, TAP_IDLE, TAP_IDLE, TAP_DRSELECT,
-			 * TAP_DRCAPTURE, TAP_DRSHIFT */
-			/* KLUDGE! we have to flush the fifo or the Nios CPU locks up.
-			 * This is probably a bug in the Avalon bus(cross clocking bridge?)
-			 * or in the jtag registers module.
-			 */
-			waitIdle();
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 1);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 1);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 1);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x28, 0);
-			/* we don't have to wait for the queue to empty here */
-			ZY1000_POKE(ZY1000_JTAG_BASE + 0x20, TAP_DRSHIFT);
-			waitIdle();
-#else
-			static const tap_state_t arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay[] = {
-				TAP_DREXIT2, TAP_DRUPDATE, TAP_IDLE, TAP_IDLE, TAP_IDLE,
-				TAP_DRSELECT, TAP_DRCAPTURE, TAP_DRSHIFT
-			};
-
-			struct scan_field fields[2] = {
-					{ .num_bits = 32, .out_value = t },
-					{ .num_bits = 2, .out_value = &zero },
-			};
-			t += 4;
-
-			jtag_add_dr_scan(tap,
-				2,
-				fields,
-				TAP_IDLE);
-
-			jtag_add_pathmove(ARRAY_SIZE(arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay),
-				arm11_MOVE_DRPAUSE_IDLE_DRPAUSE_with_delay);
-#endif
-		}
-
-		struct scan_field fields[2] = {
-				{ .num_bits = 32, .out_value = t },
-				{ .num_bits = 2, .out_value = &zero },
-		};
-
-		/* This will happen on the last iteration updating cmd_queue_cur_state
-		 * so we don't have to track it during the common code path
-		 */
-		jtag_add_dr_scan(tap,
-			2,
-			fields,
-			TAP_IDLE);
-
-		return jtag_execute_queue();
-	}
-}
-
-static const struct command_registration zy1000_commands[] = {
-	{
-		.name = "power",
-		.handler = handle_power_command,
-		.mode = COMMAND_ANY,
-		.help = "Turn power switch to target on/off. "
-			"With no arguments, prints status.",
-		.usage = "('on'|'off)",
-	},
-#if !BUILD_ZY1000_MASTER
-	{
-		.name = "zy1000_server",
-		.mode = COMMAND_ANY,
-		.jim_handler = jim_zy1000_server,
-		.help = "Tcpip address for ZY1000 server.",
-		.usage = "address",
-	},
-#endif
-	{
-		.name = "powerstatus",
-		.mode = COMMAND_ANY,
-		.jim_handler = zylinjtag_Jim_Command_powerstatus,
-		.help = "Returns power status of target",
-	},
-	COMMAND_REGISTRATION_DONE
-};
-
-#if !BUILD_ZY1000_MASTER
-
-static int tcp_ip = -1;
-
-/* Write large packets if we can */
-static size_t out_pos;
-static uint8_t out_buffer[16384];
-static size_t in_pos;
-static size_t in_write;
-static uint8_t in_buffer[16384];
-
-static bool flush_writes(void)
-{
-	bool ok = (write(tcp_ip, out_buffer, out_pos) == (int)out_pos);
-	out_pos = 0;
-	return ok;
-}
-
-static bool writeLong(uint32_t l)
-{
-	int i;
-	for (i = 0; i < 4; i++) {
-		uint8_t c = (l >> (i*8))&0xff;
-		out_buffer[out_pos++] = c;
-		if (out_pos >= sizeof(out_buffer)) {
-			if (!flush_writes())
-				return false;
-		}
-	}
-	return true;
-}
-
-static bool readLong(uint32_t *out_data)
-{
-	uint32_t data = 0;
-	int i;
-	for (i = 0; i < 4; i++) {
-		uint8_t c;
-		if (in_pos == in_write) {
-			/* If we have some data that we can send, send them before
-			 * we wait for more data
-			 */
-			if (out_pos > 0) {
-				if (!flush_writes())
-					return false;
-			}
-
-			/* read more */
-			int t;
-			t = read(tcp_ip, in_buffer, sizeof(in_buffer));
-			if (t < 1)
-				return false;
-			in_write = (size_t) t;
-			in_pos = 0;
-		}
-		c = in_buffer[in_pos++];
-
-		data |= (c << (i*8));
-	}
-	*out_data = data;
-	return true;
-}
-
-enum ZY1000_CMD {
-	ZY1000_CMD_POKE = 0x0,
-	ZY1000_CMD_PEEK = 0x8,
-	ZY1000_CMD_SLEEP = 0x1,
-	ZY1000_CMD_WAITIDLE = 2
-};
-
-#include <sys/socket.h>	/* for socket(), connect(), send(), and recv() */
-#include <arpa/inet.h>	/* for sockaddr_in and inet_addr() */
-
-/* We initialize this late since we need to know the server address
- * first.
- */
-static void tcpip_open(void)
-{
-	if (tcp_ip >= 0)
-		return;
-
-	struct sockaddr_in echoServAddr;/* Echo server address */
-
-	/* Create a reliable, stream socket using TCP */
-	tcp_ip = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP);
-	if (tcp_ip < 0) {
-		fprintf(stderr, "Failed to connect to zy1000 server\n");
-		exit(-1);
-	}
-
-	/* Construct the server address structure */
-	memset(&echoServAddr, 0, sizeof(echoServAddr));	/* Zero out structure */
-	echoServAddr.sin_family = AF_INET;	/* Internet address family */
-	echoServAddr.sin_addr.s_addr = inet_addr(tcp_server);	/* Server IP address */
-	echoServAddr.sin_port = htons(7777);	/* Server port */
-
-	/* Establish t...
 
[truncated message content]

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-42-g26a57b06c

[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  26a57b06cf3a11a5c002f0f85a2f3f4a05f630f7 (commit)
       via  113f949ac11f28e4e653824bed11e48a2c699559 (commit)
       via  64b486e74f9e492da2922cab127f6dcd454474fb (commit)
       via  70ead8ff5d2af43aa79fbc14f80fe370d569df52 (commit)
      from  d02e29dabaff43bf5fb2aa2ea7778ace2223545d (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 26a57b06cf3a11a5c002f0f85a2f3f4a05f630f7
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Nov 1 10:41:47 2020 +0100

    oocd_trace: drop the code, deprecated in v0.10.0
    
    The code for oocd_trace has been marked as deprecated in release
    v0.10.0, 4 years ago.
    
    Time to drop it!
    
    Change-Id: I989f8345dee4ff2369bcf5e2e2ace86bbd5aa6a5
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6088
    Tested-by: jenkins

diff --git a/configure.ac b/configure.ac
index a8c2e9daf..7b5551656 100644
--- a/configure.ac
+++ b/configure.ac
@@ -328,11 +328,6 @@ AC_ARG_ENABLE([gw16012],
   AS_HELP_STRING([--enable-gw16012], [Enable building support for the Gateworks GW16012 JTAG Programmer]),
   [build_gw16012=$enableval], [build_gw16012=no])
 
-AC_ARG_ENABLE([oocd_trace],
-  AS_HELP_STRING([--enable-oocd_trace],
-  [Enable building support for some prototype OpenOCD+trace ETM capture hardware]),
-  [build_oocd_trace=$enableval], [build_oocd_trace=no])
-
 AC_ARG_ENABLE([buspirate],
   AS_HELP_STRING([--enable-buspirate], [Enable building support for the Buspirate]),
   [build_buspirate=$enableval], [build_buspirate=no])
@@ -600,12 +595,6 @@ AS_IF([test "x$build_gw16012" = "xyes"], [
   AC_DEFINE([BUILD_GW16012], [0], [0 if you don't want the Gateworks GW16012 driver.])
 ])
 
-AS_IF([test "x$build_oocd_trace" = "xyes"], [
-  AC_DEFINE([BUILD_OOCD_TRACE], [1], [1 if you want the OpenOCD+trace ETM capture driver.])
-], [
-  AC_DEFINE([BUILD_OOCD_TRACE], [0], [0 if you don't want the OpenOCD+trace ETM capture driver.])
-])
-
 AS_IF([test "x$build_buspirate" = "xyes"], [
   AC_DEFINE([BUILD_BUSPIRATE], [1], [1 if you want the Buspirate JTAG driver.])
 ], [
@@ -778,7 +767,6 @@ AM_CONDITIONAL([JTAG_DPI], [test "x$build_jtag_dpi" = "xyes" -o "x$build_jtag_dp
 AM_CONDITIONAL([USB_BLASTER_DRIVER], [test "x$enable_usb_blaster" != "xno" -o "x$enable_usb_blaster_2" != "xno"])
 AM_CONDITIONAL([AMTJTAGACCEL], [test "x$build_amtjtagaccel" = "xyes"])
 AM_CONDITIONAL([GW16012], [test "x$build_gw16012" = "xyes"])
-AM_CONDITIONAL([OOCD_TRACE], [test "x$build_oocd_trace" = "xyes"])
 AM_CONDITIONAL([REMOTE_BITBANG], [test "x$build_remote_bitbang" = "xyes"])
 AM_CONDITIONAL([BUSPIRATE], [test "x$build_buspirate" = "xyes"])
 AM_CONDITIONAL([SYSFSGPIO], [test "x$build_sysfsgpio" = "xyes"])
@@ -885,13 +873,6 @@ m4_foreach([adapter], [USB1_ADAPTERS, USB0_ADAPTERS,
 ])
 echo
 
-AS_IF([test "x$build_oocd_trace" = "xyes"], [
-  echo 'WARNING! Deprecated configure option (--enable-oocd_trace)'
-  echo 'The oocd_trace driver is deprecated and will be removed in the next release.'
-  echo 'If you regularly use this driver, please report to the OpenOCD Mailing List.'
-  echo
-])
-
 AS_IF([test "x$build_zy1000" = "xyes" -o "x$build_zy1000_master" = "xyes"], [
   echo 'WARNING! Deprecated configure option (--enable-zy1000, --enable-zy1000-master)'
   echo 'Support for the ZY1000 platform is deprecated and will be removed in the next'
diff --git a/doc/openocd.texi b/doc/openocd.texi
index 34168fdaa..06d90faca 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -8866,29 +8866,6 @@ how the event caused trouble.
 
 @end deffn
 
-@deffn {Trace Port Driver} oocd_trace
-This driver isn't available unless OpenOCD was explicitly configured
-with the @option{--enable-oocd_trace} option. You probably don't want
-to configure it unless you've built the appropriate prototype hardware;
-it's @emph{proof-of-concept} software.
-
-Use the @option{oocd_trace} driver if you are configuring an ETM that's
-connected to an off-chip trace connector.
-
-@deffn {Config Command} {oocd_trace config} target tty
-Associates the ETM for @var{target} with a trace driver which
-collects data through the serial port @var{tty}.
-@end deffn
-
-@deffn Command {oocd_trace resync}
-Re-synchronizes with the capture clock.
-@end deffn
-
-@deffn Command {oocd_trace status}
-Reports whether the capture clock is locked or not.
-@end deffn
-@end deffn
-
 @anchor{armcrosstrigger}
 @section ARM Cross-Trigger Interface
 @cindex CTI
diff --git a/src/target/Makefile.am b/src/target/Makefile.am
index 6605b678b..34a78517a 100644
--- a/src/target/Makefile.am
+++ b/src/target/Makefile.am
@@ -1,9 +1,3 @@
-if OOCD_TRACE
-OOCD_TRACE_FILES = %D%/oocd_trace.c
-else
-OOCD_TRACE_FILES =
-endif
-
 %C%_libtarget_la_LIBADD = %D%/openrisc/libopenrisc.la \
 	%D%/riscv/libriscv.la
 
@@ -111,7 +105,6 @@ ARM_DEBUG_SRC = \
 	%D%/trace.c \
 	%D%/etb.c \
 	%D%/etm.c \
-	$(OOCD_TRACE_FILES) \
 	%D%/etm_dummy.c \
 	%D%/arm_tpiu_swo.c \
 	%D%/arm_cti.c
@@ -225,7 +218,6 @@ ARC_SRC = \
 	%D%/mips32_pracc.h \
 	%D%/mips32_dmaacc.h \
 	%D%/mips64_pracc.h \
-	%D%/oocd_trace.h \
 	%D%/register.h \
 	%D%/target.h \
 	%D%/target_type.h \
diff --git a/src/target/etm.c b/src/target/etm.c
index faa941fed..19f3691bd 100644
--- a/src/target/etm.c
+++ b/src/target/etm.c
@@ -27,11 +27,6 @@
 #include "register.h"
 #include "etm_dummy.h"
 
-#if BUILD_OOCD_TRACE == 1
-#include "oocd_trace.h"
-#endif
-
-
 /*
  * ARM "Embedded Trace Macrocell" (ETM) support -- direct JTAG access.
  *
@@ -642,9 +637,6 @@ static int etm_write_reg(struct reg *reg, uint32_t value)
 static struct etm_capture_driver *etm_capture_drivers[] = {
 	&etb_capture_driver,
 	&etm_dummy_capture_driver,
-#if BUILD_OOCD_TRACE == 1
-	&oocd_trace_capture_driver,
-#endif
 	NULL
 };
 
diff --git a/src/target/oocd_trace.c b/src/target/oocd_trace.c
deleted file mode 100644
index f38916a0b..000000000
--- a/src/target/oocd_trace.c
+++ /dev/null
@@ -1,417 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2007 by Dominic Rath                                    *
- *   Dom...@gm...                                                   *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "arm.h"
-#include "etm.h"
-#include "oocd_trace.h"
-
-/*
- * This is "proof of concept" code, for prototype hardware:
- * https://lists.berlios.de/pipermail/openocd-development/2007-September/000336.html
- */
-
-static int oocd_trace_read_reg(struct oocd_trace *oocd_trace, int reg, uint32_t *value)
-{
-	size_t bytes_written, bytes_read, bytes_to_read;
-	uint8_t cmd;
-
-	cmd = 0x10 | (reg & 0x7);
-	bytes_written = write(oocd_trace->tty_fd, &cmd, 1);
-	if (bytes_written < 1)
-		return ERROR_FAIL;
-
-	bytes_to_read = 4;
-	while (bytes_to_read > 0) {
-		bytes_read = read(oocd_trace->tty_fd, ((uint8_t *)value) + 4 - bytes_to_read, bytes_to_read);
-		bytes_to_read -= bytes_read;
-	}
-
-	LOG_DEBUG("reg #%i: 0x%8.8x", reg, *value);
-
-	return ERROR_OK;
-}
-
-static int oocd_trace_write_reg(struct oocd_trace *oocd_trace, int reg, uint32_t value)
-{
-	size_t bytes_written;
-	uint8_t data[5];
-
-	data[0] = 0x18 | (reg & 0x7);
-	data[1] = value & 0xff;
-	data[2] = (value & 0xff00) >> 8;
-	data[3] = (value & 0xff0000) >> 16;
-	data[4] = (value & 0xff000000) >> 24;
-
-	bytes_written = write(oocd_trace->tty_fd, data, 5);
-	if (bytes_written < 5)
-		return ERROR_FAIL;
-
-	LOG_DEBUG("reg #%i: 0x%8.8x", reg, value);
-
-	return ERROR_OK;
-}
-
-static int oocd_trace_read_memory(struct oocd_trace *oocd_trace, uint8_t *data, uint32_t address, uint32_t size)
-{
-	size_t bytes_written, bytes_to_read;
-	ssize_t bytes_read;
-	uint8_t cmd;
-
-	oocd_trace_write_reg(oocd_trace, OOCD_TRACE_ADDRESS, address);
-	oocd_trace_write_reg(oocd_trace, OOCD_TRACE_SDRAM_COUNTER, size);
-
-	cmd = 0x20;
-	bytes_written = write(oocd_trace->tty_fd, &cmd, 1);
-	if (bytes_written < 1)
-		return ERROR_FAIL;
-
-	bytes_to_read = size * 16;
-	while (bytes_to_read > 0) {
-		bytes_read = read(oocd_trace->tty_fd,
-				((uint8_t *)data) + (size * 16) - bytes_to_read, bytes_to_read);
-		if (bytes_read < 0)
-			LOG_DEBUG("read() returned %zi (%s)", bytes_read, strerror(errno));
-		else
-			bytes_to_read -= bytes_read;
-	}
-
-	return ERROR_OK;
-}
-
-static int oocd_trace_init(struct etm_context *etm_ctx)
-{
-	uint8_t trash[256];
-	struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
-	size_t bytes_read;
-
-	oocd_trace->tty_fd = open(oocd_trace->tty, O_RDWR | O_NOCTTY | O_NONBLOCK);
-
-	if (oocd_trace->tty_fd < 0) {
-		LOG_ERROR("can't open tty");
-		return ERROR_ETM_CAPTURE_INIT_FAILED;
-	}
-
-	/* clear input & output buffers, then switch to "blocking mode" */
-	tcflush(oocd_trace->tty_fd, TCOFLUSH);
-	tcflush(oocd_trace->tty_fd, TCIFLUSH);
-	fcntl(oocd_trace->tty_fd, F_SETFL, fcntl(oocd_trace->tty_fd, F_GETFL) & ~O_NONBLOCK);
-
-	tcgetattr(oocd_trace->tty_fd, &oocd_trace->oldtio); /* save current port settings */
-
-	bzero(&oocd_trace->newtio, sizeof(oocd_trace->newtio));
-	oocd_trace->newtio.c_cflag = CS8 | CLOCAL | CREAD | B2500000;
-
-	oocd_trace->newtio.c_iflag = IGNPAR | IGNBRK | IXON | IXOFF;
-	oocd_trace->newtio.c_oflag = 0;
-
-	/* set input mode (non-canonical, no echo,...) */
-	oocd_trace->newtio.c_lflag = 0;
-
-	cfmakeraw(&oocd_trace->newtio);
-	oocd_trace->newtio.c_cc[VTIME] = 1;   /* inter-character timer used */
-	oocd_trace->newtio.c_cc[VMIN] = 0;   /* blocking read until 0 chars received */
-
-	tcflush(oocd_trace->tty_fd, TCIFLUSH);
-	tcsetattr(oocd_trace->tty_fd, TCSANOW, &oocd_trace->newtio);
-
-	/* occasionally one bogus character is left in the input buffer
-	 * read up any leftover characters to ensure communication is in sync */
-	do {
-		bytes_read = read(oocd_trace->tty_fd, trash, sizeof(trash));
-		if (bytes_read)
-			LOG_DEBUG("%zi bytes read", bytes_read);
-	} while (bytes_read > 0);
-
-	return ERROR_OK;
-}
-
-static trace_status_t oocd_trace_status(struct etm_context *etm_ctx)
-{
-	struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
-	uint32_t status;
-
-	oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status);
-
-	/* if tracing is currently idle, return this information */
-	if (etm_ctx->capture_status == TRACE_IDLE)
-		return etm_ctx->capture_status;
-	else if (etm_ctx->capture_status & TRACE_RUNNING) {
-		/* check Full bit to identify an overflow */
-		if (status & 0x4)
-			etm_ctx->capture_status |= TRACE_OVERFLOWED;
-
-		/* check Triggered bit to identify trigger condition */
-		if (status & 0x2)
-			etm_ctx->capture_status |= TRACE_TRIGGERED;
-
-		if (status & 0x1) {
-			etm_ctx->capture_status &= ~TRACE_RUNNING;
-			etm_ctx->capture_status |= TRACE_COMPLETED;
-		}
-	}
-
-	return etm_ctx->capture_status;
-}
-
-static int oocd_trace_read_trace(struct etm_context *etm_ctx)
-{
-	struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
-	uint32_t status, address;
-	uint32_t first_frame = 0x0;
-	uint32_t num_frames = 1048576;
-	uint8_t *trace_data;
-	uint32_t i;
-
-	oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status);
-	oocd_trace_read_reg(oocd_trace, OOCD_TRACE_ADDRESS, &address);
-
-	/* check if we overflowed, and adjust first frame of the trace accordingly
-	 * if we didn't overflow, read only up to the frame that would be written next,
-	 * i.e. don't read invalid entries
-	 */
-	if (status & 0x4)
-		first_frame = address;
-	else
-		num_frames = address;
-
-	/* read data into temporary array for unpacking
-	 * one frame from OpenOCD + trace corresponds to 16 trace cycles
-	 */
-	trace_data = malloc(sizeof(uint8_t) * num_frames * 16);
-	oocd_trace_read_memory(oocd_trace, trace_data, first_frame, num_frames);
-
-	if (etm_ctx->trace_depth > 0)
-		free(etm_ctx->trace_data);
-
-	etm_ctx->trace_depth = num_frames * 16;
-	etm_ctx->trace_data = malloc(sizeof(struct etmv1_trace_data) * etm_ctx->trace_depth);
-
-	for (i = 0; i < num_frames * 16; i++) {
-		etm_ctx->trace_data[i].pipestat = (trace_data[i] & 0x7);
-		etm_ctx->trace_data[i].packet = (trace_data[i] & 0x78) >> 3;
-		etm_ctx->trace_data[i].flags = 0;
-
-		if ((trace_data[i] & 0x80) >> 7)
-			etm_ctx->trace_data[i].flags |= ETMV1_TRACESYNC_CYCLE;
-
-		if (etm_ctx->trace_data[i].pipestat == STAT_TR) {
-			etm_ctx->trace_data[i].pipestat = etm_ctx->trace_data[i].packet & 0x7;
-			etm_ctx->trace_data[i].flags |= ETMV1_TRIGGER_CYCLE;
-		}
-	}
-
-	free(trace_data);
-
-	return ERROR_OK;
-}
-
-static int oocd_trace_start_capture(struct etm_context *etm_ctx)
-{
-	struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
-	uint32_t control = 0x1;	/* 0x1: enabled */
-	uint32_t trigger_count;
-
-	if (((etm_ctx->control & ETM_PORT_MODE_MASK) != ETM_PORT_NORMAL)
-		|| ((etm_ctx->control & ETM_PORT_WIDTH_MASK) != ETM_PORT_4BIT)) {
-		LOG_DEBUG("OpenOCD + trace only supports normal 4-bit ETM mode");
-		return ERROR_ETM_PORTMODE_NOT_SUPPORTED;
-	}
-
-	if ((etm_ctx->control & ETM_PORT_CLOCK_MASK) == ETM_PORT_HALF_CLOCK)
-		control |= 0x2;	/* half rate clock, capture at twice the clock rate */
-
-	/* OpenOCD + trace holds up to 16 million samples,
-	 * but trigger counts is set in multiples of 16 */
-	trigger_count = (1048576 * /* trigger_percent */ 50) / 100;
-
-	/* capturing always starts at address zero */
-	oocd_trace_write_reg(oocd_trace, OOCD_TRACE_ADDRESS, 0x0);
-	oocd_trace_write_reg(oocd_trace, OOCD_TRACE_TRIGGER_COUNTER, trigger_count);
-	oocd_trace_write_reg(oocd_trace, OOCD_TRACE_CONTROL, control);
-
-	/* we're starting a new trace, initialize capture status */
-	etm_ctx->capture_status = TRACE_RUNNING;
-
-	return ERROR_OK;
-}
-
-static int oocd_trace_stop_capture(struct etm_context *etm_ctx)
-{
-	struct oocd_trace *oocd_trace = etm_ctx->capture_driver_priv;
-
-	/* trace stopped, just clear running flag, but preserve others */
-	etm_ctx->capture_status &= ~TRACE_RUNNING;
-
-	oocd_trace_write_reg(oocd_trace, OOCD_TRACE_CONTROL, 0x0);
-
-	return ERROR_OK;
-}
-
-COMMAND_HANDLER(handle_oocd_trace_config_command)
-{
-	struct target *target;
-	struct arm *arm;
-
-	if (CMD_ARGC != 2)
-		return ERROR_COMMAND_SYNTAX_ERROR;
-
-	target = get_current_target(CMD_CTX);
-	arm = target_to_arm(target);
-	if (!is_arm(arm)) {
-		command_print(CMD, "current target isn't an ARM");
-		return ERROR_FAIL;
-	}
-
-	if (arm->etm) {
-		struct oocd_trace *oocd_trace = malloc(sizeof(struct oocd_trace));
-
-		arm->etm->capture_driver_priv = oocd_trace;
-		oocd_trace->etm_ctx = arm->etm;
-
-		/* copy name of TTY device used to communicate with OpenOCD + trace */
-		oocd_trace->tty = strndup(CMD_ARGV[1], 256);
-	} else
-		LOG_ERROR("target has no ETM defined, OpenOCD + trace left unconfigured");
-
-	return ERROR_OK;
-}
-
-COMMAND_HANDLER(handle_oocd_trace_status_command)
-{
-	struct target *target;
-	struct arm *arm;
-	struct oocd_trace *oocd_trace;
-	uint32_t status;
-
-	target = get_current_target(CMD_CTX);
-
-	arm = target_to_arm(target);
-	if (!is_arm(arm)) {
-		command_print(CMD, "current target isn't an ARM");
-		return ERROR_FAIL;
-	}
-
-	if (!arm->etm) {
-		command_print(CMD, "current target doesn't have an ETM configured");
-		return ERROR_FAIL;
-	}
-
-	if (strcmp(arm->etm->capture_driver->name, "oocd_trace") != 0) {
-		command_print(CMD, "current target's ETM capture driver isn't 'oocd_trace'");
-		return ERROR_FAIL;
-	}
-
-	oocd_trace = (struct oocd_trace *)arm->etm->capture_driver_priv;
-
-	oocd_trace_read_reg(oocd_trace, OOCD_TRACE_STATUS, &status);
-
-	if (status & 0x8)
-		command_print(CMD, "trace clock locked");
-	else
-		command_print(CMD, "no trace clock");
-
-	return ERROR_OK;
-}
-
-COMMAND_HANDLER(handle_oocd_trace_resync_command)
-{
-	struct target *target;
-	struct arm *arm;
-	struct oocd_trace *oocd_trace;
-	size_t bytes_written;
-	uint8_t cmd_array[1];
-
-	target = get_current_target(CMD_CTX);
-
-	arm = target_to_arm(target);
-	if (!is_arm(arm)) {
-		command_print(CMD, "current target isn't an ARM");
-		return ERROR_FAIL;
-	}
-
-	if (!arm->etm) {
-		command_print(CMD, "current target doesn't have an ETM configured");
-		return ERROR_FAIL;
-	}
-
-	if (strcmp(arm->etm->capture_driver->name, "oocd_trace") != 0) {
-		command_print(CMD, "current target's ETM capture driver isn't 'oocd_trace'");
-		return ERROR_FAIL;
-	}
-
-	oocd_trace = (struct oocd_trace *)arm->etm->capture_driver_priv;
-
-	cmd_array[0] = 0xf0;
-
-	bytes_written = write(oocd_trace->tty_fd, cmd_array, 1);
-	if (bytes_written < 1)
-		return ERROR_FAIL;
-
-	command_print(CMD, "requesting traceclock resync");
-	LOG_DEBUG("resyncing traceclk pll");
-
-	return ERROR_OK;
-}
-
-static const struct command_registration oocd_trace_all_command_handlers[] = {
-	{
-		.name = "config",
-		.handler = handle_oocd_trace_config_command,
-		.mode = COMMAND_CONFIG,
-		.usage = "<target> <tty>",
-	},
-	{
-		.name = "status",
-		.handler = handle_oocd_trace_status_command,
-		.mode = COMMAND_EXEC,
-		.usage = "",
-		.help = "display OpenOCD + trace status",
-	},
-	{
-		.name = "resync",
-		.handler = handle_oocd_trace_resync_command,
-		.mode = COMMAND_EXEC,
-		.usage = "",
-		.help = "resync OpenOCD + trace capture clock",
-	},
-	COMMAND_REGISTRATION_DONE
-};
-static const struct command_registration oocd_trace_command_handlers[] = {
-	{
-		.name = "oocd_trace",
-		.mode = COMMAND_ANY,
-		.help = "OpenOCD trace capture driver command group",
-		.usage = "",
-		.chain = oocd_trace_all_command_handlers,
-	},
-	COMMAND_REGISTRATION_DONE
-};
-
-struct etm_capture_driver oocd_trace_capture_driver = {
-	.name = "oocd_trace",
-	.commands = oocd_trace_command_handlers,
-	.init = oocd_trace_init,
-	.status = oocd_trace_status,
-	.start_capture = oocd_trace_start_capture,
-	.stop_capture = oocd_trace_stop_capture,
-	.read_trace = oocd_trace_read_trace,
-};
diff --git a/src/target/oocd_trace.h b/src/target/oocd_trace.h
deleted file mode 100644
index e7584e4c9..000000000
--- a/src/target/oocd_trace.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/***************************************************************************
- *   Copyright (C) 2007 by Dominic Rath                                    *
- *   Dom...@gm...                                                   *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- ***************************************************************************/
-
-#ifndef OPENOCD_TARGET_OOCD_TRACE_H
-#define OPENOCD_TARGET_OOCD_TRACE_H
-
-#include <termios.h>
-
-/* registers */
-enum {
-	OOCD_TRACE_ID = 0x7,
-	OOCD_TRACE_ADDRESS = 0x0,
-	OOCD_TRACE_TRIGGER_COUNTER = 0x01,
-	OOCD_TRACE_CONTROL = 0x2,
-	OOCD_TRACE_STATUS = 0x3,
-	OOCD_TRACE_SDRAM_COUNTER = 0x4,
-};
-
-/* commands */
-enum {
-	OOCD_TRACE_NOP = 0x0,
-	OOCD_TRACE_READ_REG = 0x10,
-	OOCD_TRACE_WRITE_REG = 0x18,
-	OOCD_TRACE_READ_RAM = 0x20,
-/*	OOCD_TRACE_WRITE_RAM = 0x28, */
-	OOCD_TRACE_RESYNC = 0xf0,
-};
-
-struct oocd_trace {
-	struct etm_context *etm_ctx;
-	char *tty;
-	int tty_fd;
-	struct termios oldtio, newtio;
-};
-
-extern struct etm_capture_driver oocd_trace_capture_driver;
-
-#endif /* OPENOCD_TARGET_OOCD_TRACE_H */

commit 113f949ac11f28e4e653824bed11e48a2c699559
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Nov 1 00:14:52 2020 +0100

    target: remove handling of target's deprecated_name
    
    We do not have anymore any deprecated target name.
    Drop the code to handle deprecated target names and the placehold
    in struct target_type.
    
    This patch is separated from the patch that drops the remaining
    deprecated target names to be ready to revert this if there is any
    need in the future.
    
    Change-Id: I96fca7ffa39d8292f81e79f115ea45c4a30035d7
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6087
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/target/target.c b/src/target/target.c
index eb83daebb..200368b13 100644
--- a/src/target/target.c
+++ b/src/target/target.c
@@ -5678,15 +5678,6 @@ static int target_create(Jim_GetOptInfo *goi)
 			/* found */
 			break;
 		}
-
-		/* check for deprecated name */
-		if (target_types[x]->deprecated_name) {
-			if (0 == strcmp(cp, target_types[x]->deprecated_name)) {
-				/* found */
-				LOG_WARNING("target name is deprecated use: \'%s\'", target_types[x]->name);
-				break;
-			}
-		}
 	}
 	if (target_types[x] == NULL) {
 		Jim_SetResultFormatted(goi->interp, "Unknown target type %s, try one of ", cp);
diff --git a/src/target/target_type.h b/src/target/target_type.h
index 4bdea721e..0f3df0002 100644
--- a/src/target/target_type.h
+++ b/src/target/target_type.h
@@ -40,7 +40,6 @@ struct target_type {
 	 * field directly, use target_type_name() instead.
 	 */
 	const char *name;
-	const char *deprecated_name;
 
 	/* poll current target status */
 	int (*poll)(struct target *target);

commit 64b486e74f9e492da2922cab127f6dcd454474fb
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Nov 1 00:10:55 2020 +0100

    target: remove target names already deprecated in v0.8.0
    
    Some target name were marked as deprecated in release v0.7.0 and
    v0.8.0, almost 7 years ago, and replaced with more 'actual' names.
    We can reasonably expect that in these 7 years any user of OpenOCD
    has already migrated to v0.8.0 or to some newer release, thus has
    already updated any local/personal script to get rid of the
    deprecated message.
    
    Drop the target names already deprecated in v0.8.0.
    
    Change-Id: I7c7491496db1b302b4eb1e9fc6090b58d4acf05a
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6086
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>
    Tested-by: jenkins
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/target/cortex_a.c b/src/target/cortex_a.c
index d27c298b6..5018a91d4 100644
--- a/src/target/cortex_a.c
+++ b/src/target/cortex_a.c
@@ -3143,7 +3143,6 @@ static const struct command_registration cortex_a_command_handlers[] = {
 
 struct target_type cortexa_target = {
 	.name = "cortex_a",
-	.deprecated_name = "cortex_a8",
 
 	.poll = cortex_a_poll,
 	.arch_state = armv7a_arch_state,
diff --git a/src/target/cortex_m.c b/src/target/cortex_m.c
index 2a973e1f6..6dc33c867 100644
--- a/src/target/cortex_m.c
+++ b/src/target/cortex_m.c
@@ -2501,7 +2501,6 @@ static const struct command_registration cortex_m_command_handlers[] = {
 
 struct target_type cortexm_target = {
 	.name = "cortex_m",
-	.deprecated_name = "cortex_m3",
 
 	.poll = cortex_m_poll,
 	.arch_state = armv7m_arch_state,
diff --git a/src/target/hla_target.c b/src/target/hla_target.c
index 9ac344245..cd57dd207 100644
--- a/src/target/hla_target.c
+++ b/src/target/hla_target.c
@@ -640,7 +640,6 @@ static const struct command_registration adapter_command_handlers[] = {
 
 struct target_type hla_target = {
 	.name = "hla_target",
-	.deprecated_name = "stm32_stlink",
 
 	.init_target = adapter_init_target,
 	.deinit_target = cortex_m_deinit_target,

commit 70ead8ff5d2af43aa79fbc14f80fe370d569df52
Author: Antonio Borneo <bor...@gm...>
Date:   Sat Oct 31 23:58:33 2020 +0100

    startup.tcl: remove commands already deprecated in v0.7.0
    
    Some command were already marked as deprecated in release v0.7.0,
    more then 7 years ago, and for some of them the depredation date
    is even earlier.
    We can reasonably expect that in these 7 years any user of OpenOCD
    has already migrated to v0.7.0 or to some following intermediate
    build, thus has already updated any local/personal script to get
    rid of the deprecated message.
    
    Drop the commands already deprecated in v0.7.0.
    
    Change-Id: I81cdc415ab855ebf30980ef5199f9780c5d7f932
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6085
    Tested-by: jenkins
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/flash/startup.tcl b/src/flash/startup.tcl
index 280a059a3..7d9dbc7da 100644
--- a/src/flash/startup.tcl
+++ b/src/flash/startup.tcl
@@ -119,14 +119,3 @@ proc stm32g4x args { eval stm32l4x $args }
 proc stm32l5x args { eval stm32l4x $args }
 proc stm32wbx args { eval stm32l4x $args }
 proc stm32wlx args { eval stm32l4x $args }
-
-# ease migration to updated flash driver
-proc stm32x args {
-	echo "DEPRECATED! use 'stm32f1x $args' not 'stm32x $args'"
-	eval stm32f1x $args
-}
-
-proc stm32f2xxx args {
-	echo "DEPRECATED! use 'stm32f2x $args' not 'stm32f2xxx $args'"
-	eval stm32f2x $args
-}
diff --git a/src/jtag/startup.tcl b/src/jtag/startup.tcl
index 82327a39b..e5c3b0f75 100644
--- a/src/jtag/startup.tcl
+++ b/src/jtag/startup.tcl
@@ -117,23 +117,8 @@ proc jtag_ntrst_assert_width args {
 # JTAG-specific names despite the fact that the operations were not
 # specific to JTAG, or otherwise had troublesome/misleading names.
 #
-# FIXME phase these aids out after about April 2011
+# FIXME phase these aids out after some releases
 #
-proc jtag_khz args {
-	echo "DEPRECATED! use 'adapter speed' not 'jtag_khz'"
-	eval adapter speed $args
-}
-
-proc jtag_nsrst_delay args {
-	echo "DEPRECATED! use 'adapter srst delay' not 'jtag_nsrst_delay'"
-	eval adapter srst delay $args
-}
-
-proc jtag_nsrst_assert_width args {
-	echo "DEPRECATED! use 'adapter srst pulse_width' not 'jtag_nsrst_assert_width'"
-	eval adapter srst pulse_width $args
-}
-
 proc jtag_reset args {
 	echo "DEPRECATED! use 'adapter \[de\]assert' not 'jtag_reset'"
 	switch $args {
@@ -150,32 +135,6 @@ proc jtag_reset args {
 	}
 }
 
-# stlink migration helpers
-proc stlink_device_desc args {
-	echo "DEPRECATED! use 'hla_device_desc' not 'stlink_device_desc'"
-	eval hla_device_desc $args
-}
-
-proc stlink_serial args {
-	echo "DEPRECATED! use 'hla_serial' not 'stlink_serial'"
-	eval hla_serial $args
-}
-
-proc stlink_layout args {
-	echo "DEPRECATED! use 'hla_layout' not 'stlink_layout'"
-	eval hla_layout $args
-}
-
-proc stlink_vid_pid args {
-	echo "DEPRECATED! use 'hla_vid_pid' not 'stlink_vid_pid'"
-	eval hla_vid_pid $args
-}
-
-proc stlink args {
-	echo "DEPRECATED! use 'hla' not 'stlink'"
-	eval hla $args
-}
-
 proc adapter_khz args {
 	echo "DEPRECATED! use 'adapter speed' not 'adapter_khz'"
 	eval adapter speed $args
diff --git a/src/target/startup.tcl b/src/target/startup.tcl
index ca39b1816..a8f78ab49 100644
--- a/src/target/startup.tcl
+++ b/src/target/startup.tcl
@@ -179,12 +179,6 @@ proc using_hla {} {
 
 #########
 
-# Temporary migration aid.  May be removed starting in January 2011.
-proc armv4_5 params {
-	echo "DEPRECATED! use 'arm $params' not 'armv4_5 $params'"
-	arm $params
-}
-
 # Target/chain configuration scripts can either execute commands directly
 # or define a procedure which is executed once all configuration
 # scripts have completed.
@@ -212,14 +206,3 @@ proc init_target_events {} {
 # Additionally board config scripts can define a procedure init_board that will be executed after init and init_targets
 proc init_board {} {
 }
-
-# deprecated target name cmds
-proc cortex_m3 args {
-	echo "DEPRECATED! use 'cortex_m' not 'cortex_m3'"
-	eval cortex_m $args
-}
-
-proc cortex_a8 args {
-	echo "DEPRECATED! use 'cortex_a' not 'cortex_a8'"
-	eval cortex_a $args
-}

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

Summary of changes:
 configure.ac             |  19 ---
 doc/openocd.texi         |  23 ---
 src/flash/startup.tcl    |  11 --
 src/jtag/startup.tcl     |  43 +----
 src/target/Makefile.am   |   8 -
 src/target/cortex_a.c    |   1 -
 src/target/cortex_m.c    |   1 -
 src/target/etm.c         |   8 -
 src/target/hla_target.c  |   1 -
 src/target/oocd_trace.c  | 417 -----------------------------------------------
 src/target/oocd_trace.h  |  53 ------
 src/target/startup.tcl   |  17 --
 src/target/target.c      |   9 -
 src/target/target_type.h |   1 -
 14 files changed, 1 insertion(+), 611 deletions(-)
 delete mode 100644 src/target/oocd_trace.c
 delete mode 100644 src/target/oocd_trace.h


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-38-gd02e29dab

[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  d02e29dabaff43bf5fb2aa2ea7778ace2223545d (commit)
       via  cda7bc9a4c6c1b665cfdd055397cc59483e40ef8 (commit)
       via  ab0def0f3878c6521a5d1626e9123112c7875297 (commit)
      from  8d6f7c92239a54ce77d7a268f51b49445470fe00 (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 d02e29dabaff43bf5fb2aa2ea7778ace2223545d
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Nov 1 00:22:49 2020 +0100

    openocd: remove command line flag -p/--pipe deprecated in v0.5.0
    
    The OpenOCD command line flag -p/--pipe was marked as deprecated
    in release v0.5.0, more than 9 years ago.
    We can reasonably expect that in these 9 years any user of OpenOCD
    has already migrated to v0.5.0 or to some newer release, thus has
    already updated any local/personal script to get rid of the
    deprecated message.
    
    Drop the command line flag already deprecated in v0.5.0.
    
    Change-Id: I2faeb592ed2c2f67c2d3227f118093e39fcf4a8c
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6084
    Tested-by: jenkins
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 640687da5..34168fdaa 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -2155,9 +2155,6 @@ disables the gdb server.
 When using "pipe", also use log_output to redirect the log
 output to a file so as not to flood the stdin/out pipes.
 
-The -p/--pipe option is deprecated and a warning is printed
-as it is equivalent to passing in -c "gdb_port pipe; log_output openocd.log".
-
 Any other string is interpreted as named pipe to listen to.
 Output pipe is the same name as input pipe, but with 'o' appended,
 e.g. /var/gdb, /var/gdbo.
diff --git a/src/helper/options.c b/src/helper/options.c
index 0ccbf5642..477d7b303 100644
--- a/src/helper/options.c
+++ b/src/helper/options.c
@@ -54,7 +54,6 @@ static const struct option long_options[] = {
 	{"search",		required_argument,		0,				's'},
 	{"log_output",	required_argument,		0,				'l'},
 	{"command",		required_argument,		0,				'c'},
-	{"pipe",		no_argument,			0,				'p'},
 	{0, 0, 0, 0}
 };
 
@@ -281,7 +280,7 @@ int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[])
 		/* getopt_long stores the option index here. */
 		int option_index = 0;
 
-		c = getopt_long(argc, argv, "hvd::l:f:s:c:p", long_options, &option_index);
+		c = getopt_long(argc, argv, "hvd::l:f:s:c:", long_options, &option_index);
 
 		/* Detect the end of the options. */
 		if (c == -1)
@@ -321,13 +320,6 @@ int parse_cmdline_args(struct command_context *cmd_ctx, int argc, char *argv[])
 				if (optarg)
 				    add_config_command(optarg);
 				break;
-			case 'p':
-				/* to replicate the old syntax this needs to be synchronous
-				 * otherwise the gdb stdin will overflow with the warning message */
-				command_run_line(cmd_ctx, "gdb_port pipe; log_output openocd.log");
-				LOG_WARNING("deprecated option: -p/--pipe. Use '-c \"gdb_port pipe; "
-						"log_output openocd.log\"' instead.");
-				break;
 			default:  /* '?' */
 				/* getopt will emit an error message, all we have to do is bail. */
 				return ERROR_FAIL;

commit cda7bc9a4c6c1b665cfdd055397cc59483e40ef8
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Nov 1 00:45:05 2020 +0100

    target/arm920t: remove command 'arm920t cp15i' deprecated in v0.4.0
    
    The command 'arm920t cp15i' was marked as deprecated in release
    v0.4.0, almost 11 years ago.
    We can reasonably expect that in these years any user of OpenOCD
    has already migrated to v0.4.0 or to some newer release, thus has
    already updated any local/personal script.
    There is no run-time warning about the deprecation, but it is
    reported in the help and in the documentation.
    
    Drop the command already deprecated in v0.4.0.
    
    Change-Id: I755c4283e13e125558fcd73b15fe20498eae95ca
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6083
    Tested-by: jenkins
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 934c37e5d..640687da5 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -9167,18 +9167,6 @@ shown in bits 38..33 of table 9-9 in the ARM920T TRM.
 (Not all registers can be written.)
 @end deffn
 
-@deffn Command {arm920t cp15i} opcode [value [address]]
-@emph{DEPRECATED -- avoid using this.
-Use the @command{arm mrc} or @command{arm mcr} commands instead.}
-
-Interpreted access using ARM instruction @var{opcode}, which should
-be the value of either an MRC or MCR instruction
-(as shown tables 9-11, 9-12, and 9-13 in the ARM920T TRM).
-If no @var{value} is provided, the result is displayed.
-Else if that value is written using the specified @var{address},
-or using zero if no other address is provided.
-@end deffn
-
 @deffn Command {arm920t read_cache} filename
 Dump the content of ICache and DCache to a file named @file{filename}.
 @end deffn
diff --git a/src/target/arm920t.c b/src/target/arm920t.c
index c96975a77..80f6d7045 100644
--- a/src/target/arm920t.c
+++ b/src/target/arm920t.c
@@ -1511,80 +1511,6 @@ COMMAND_HANDLER(arm920t_handle_cp15_command)
 	return ERROR_OK;
 }
 
-COMMAND_HANDLER(arm920t_handle_cp15i_command)
-{
-	int retval;
-	struct target *target = get_current_target(CMD_CTX);
-	struct arm920t_common *arm920t = target_to_arm920(target);
-
-	retval = arm920t_verify_pointer(CMD, arm920t);
-	if (retval != ERROR_OK)
-		return retval;
-
-
-	if (target->state != TARGET_HALTED) {
-		command_print(CMD, "target must be stopped for "
-			"\"%s\" command", CMD_NAME);
-		return ERROR_OK;
-	}
-
-	/* one argument, read a register.
-	 * two arguments, write it.
-	 */
-	if (CMD_ARGC >= 1) {
-		uint32_t opcode;
-		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], opcode);
-
-		if (CMD_ARGC == 1) {
-			uint32_t value;
-			retval = arm920t_read_cp15_interpreted(target,
-					opcode, 0x0, &value);
-			if (retval != ERROR_OK) {
-				command_print(CMD,
-					"couldn't execute %8.8" PRIx32,
-					opcode);
-				/* REVISIT why lie? "return retval"? */
-				return ERROR_OK;
-			}
-
-			command_print(CMD, "%8.8" PRIx32 ": %8.8" PRIx32,
-				opcode, value);
-		} else if (CMD_ARGC == 2) {
-			uint32_t value;
-			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
-			retval = arm920t_write_cp15_interpreted(target,
-					opcode, value, 0);
-			if (retval != ERROR_OK) {
-				command_print(CMD,
-					"couldn't execute %8.8" PRIx32,
-					opcode);
-				/* REVISIT why lie? "return retval"? */
-				return ERROR_OK;
-			}
-			command_print(CMD, "%8.8" PRIx32 ": %8.8" PRIx32,
-				opcode, value);
-		} else if (CMD_ARGC == 3) {
-			uint32_t value;
-			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
-			uint32_t address;
-			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[2], address);
-			retval = arm920t_write_cp15_interpreted(target,
-					opcode, value, address);
-			if (retval != ERROR_OK) {
-				command_print(CMD,
-					"couldn't execute %8.8" PRIx32, opcode);
-				/* REVISIT why lie? "return retval"? */
-				return ERROR_OK;
-			}
-			command_print(CMD, "%8.8" PRIx32 ": %8.8" PRIx32
-				" %8.8" PRIx32, opcode, value, address);
-		}
-	} else
-		return ERROR_COMMAND_SYNTAX_ERROR;
-
-	return ERROR_OK;
-}
-
 COMMAND_HANDLER(arm920t_handle_cache_info_command)
 {
 	int retval;
@@ -1640,15 +1566,6 @@ static const struct command_registration arm920t_exec_command_handlers[] = {
 		.help = "display/modify cp15 register",
 		.usage = "regnum [value]",
 	},
-	{
-		.name = "cp15i",
-		.handler = arm920t_handle_cp15i_command,
-		.mode = COMMAND_EXEC,
-		/* prefer using less error-prone "arm mcr" or "arm mrc" */
-		.help = "display/modify cp15 register using ARM opcode"
-			" (DEPRECATED)",
-		.usage = "instruction [value [address]]",
-	},
 	{
 		.name = "cache_info",
 		.handler = arm920t_handle_cache_info_command,

commit ab0def0f3878c6521a5d1626e9123112c7875297
Author: Antonio Borneo <bor...@gm...>
Date:   Sun Nov 1 00:38:13 2020 +0100

    target/arm720t: remove command 'arm720t cp15' deprecated in v0.4.0
    
    The command 'arm720t cp15' was marked as deprecated in release
    v0.4.0, almost 11 years ago.
    We can reasonably expect that in these years any user of OpenOCD
    has already migrated to v0.4.0 or to some newer release, thus has
    already updated any local/personal script.
    There is no run-time warning about the deprecation, but it is
    reported in the help and in the documentation.
    
    Drop the command already deprecated in v0.4.0.
    
    Change-Id: I2b325d0312d96ca5e5f0f1bad13bb162b3b75c52
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: http://openocd.zylin.com/6082
    Tested-by: jenkins
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/doc/openocd.texi b/doc/openocd.texi
index 0c1714e49..934c37e5d 100644
--- a/doc/openocd.texi
+++ b/doc/openocd.texi
@@ -9114,23 +9114,6 @@ cables (FT2232), but might be unsafe if used with targets running at very low
 speeds, like the 32kHz startup clock of an AT91RM9200.
 @end deffn
 
-@subsection ARM720T specific commands
-@cindex ARM720T
-
-These commands are available to ARM720T based CPUs,
-which are implementations of the ARMv4T architecture
-based on the ARM7TDMI-S integer core.
-They are available in addition to the ARM and ARM7/ARM9 commands.
-
-@deffn Command {arm720t cp15} opcode [value]
-@emph{DEPRECATED -- avoid using this.
-Use the @command{arm mrc} or @command{arm mcr} commands instead.}
-
-Display cp15 register returned by the ARM instruction @var{opcode};
-else if a @var{value} is provided, that value is written to that register.
-The @var{opcode} should be the value of either an MRC or MCR instruction.
-@end deffn
-
 @subsection ARM9 specific commands
 @cindex ARM9
 
diff --git a/src/target/arm720t.c b/src/target/arm720t.c
index e04cab2e7..daa44e46a 100644
--- a/src/target/arm720t.c
+++ b/src/target/arm720t.c
@@ -233,16 +233,6 @@ static void arm720t_pre_restore_context(struct target *target)
 	arm720t_write_cp15(target, 0xee060f10, arm720t->far_reg);
 }
 
-static int arm720t_verify_pointer(struct command_invocation *cmd,
-		struct arm720t_common *arm720t)
-{
-	if (arm720t->common_magic != ARM720T_COMMON_MAGIC) {
-		command_print(cmd, "target is not an ARM720");
-		return ERROR_TARGET_INVALID;
-	}
-	return ERROR_OK;
-}
-
 static int arm720t_arch_state(struct target *target)
 {
 	struct arm720t_common *arm720t = target_to_arm720(target);
@@ -441,55 +431,6 @@ static int arm720t_target_create(struct target *target, Jim_Interp *interp)
 	return arm720t_init_arch_info(target, arm720t, target->tap);
 }
 
-COMMAND_HANDLER(arm720t_handle_cp15_command)
-{
-	int retval;
-	struct target *target = get_current_target(CMD_CTX);
-	struct arm720t_common *arm720t = target_to_arm720(target);
-
-	retval = arm720t_verify_pointer(CMD, arm720t);
-	if (retval != ERROR_OK)
-		return retval;
-
-	if (target->state != TARGET_HALTED) {
-		command_print(CMD, "target must be stopped for \"%s\" command", CMD_NAME);
-		return ERROR_OK;
-	}
-
-	/* one or more argument, access a single register (write if second argument is given */
-	if (CMD_ARGC >= 1) {
-		uint32_t opcode;
-		COMMAND_PARSE_NUMBER(u32, CMD_ARGV[0], opcode);
-
-		if (CMD_ARGC == 1) {
-			uint32_t value;
-			retval = arm720t_read_cp15(target, opcode, &value);
-			if (retval != ERROR_OK) {
-				command_print(CMD, "couldn't access cp15 with opcode 0x%8.8" PRIx32 "", opcode);
-				return ERROR_OK;
-			}
-
-			retval = jtag_execute_queue();
-			if (retval != ERROR_OK)
-				return retval;
-
-			command_print(CMD, "0x%8.8" PRIx32 ": 0x%8.8" PRIx32 "", opcode, value);
-		} else if (CMD_ARGC == 2) {
-			uint32_t value;
-			COMMAND_PARSE_NUMBER(u32, CMD_ARGV[1], value);
-
-			retval = arm720t_write_cp15(target, opcode, value);
-			if (retval != ERROR_OK) {
-				command_print(CMD, "couldn't access cp15 with opcode 0x%8.8" PRIx32 "", opcode);
-				return ERROR_OK;
-			}
-			command_print(CMD, "0x%8.8" PRIx32 ": 0x%8.8" PRIx32 "", opcode, value);
-		}
-	}
-
-	return ERROR_OK;
-}
-
 static int arm720t_mrc(struct target *target, int cpnum,
 		uint32_t op1, uint32_t op2,
 		uint32_t CRn, uint32_t CRm,
@@ -523,30 +464,10 @@ static int arm720t_mcr(struct target *target, int cpnum,
 			value);
 }
 
-static const struct command_registration arm720t_exec_command_handlers[] = {
-	{
-		.name = "cp15",
-		.handler = arm720t_handle_cp15_command,
-		.mode = COMMAND_EXEC,
-		/* prefer using less error-prone "arm mcr" or "arm mrc" */
-		.help = "display/modify cp15 register using ARM opcode"
-			" (DEPRECATED)",
-		.usage = "instruction [value]",
-	},
-	COMMAND_REGISTRATION_DONE
-};
-
 static const struct command_registration arm720t_command_handlers[] = {
 	{
 		.chain = arm7_9_command_handlers,
 	},
-	{
-		.name = "arm720t",
-		.mode = COMMAND_ANY,
-		.help = "arm720t command group",
-		.usage = "",
-		.chain = arm720t_exec_command_handlers,
-	},
 	COMMAND_REGISTRATION_DONE
 };
 

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

Summary of changes:
 doc/openocd.texi     | 32 --------------------
 src/helper/options.c | 10 +------
 src/target/arm720t.c | 79 -------------------------------------------------
 src/target/arm920t.c | 83 ----------------------------------------------------
 4 files changed, 1 insertion(+), 203 deletions(-)


hooks/post-receive
-- 
Main OpenOCD repository

[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.11.0-35-g8d6f7c922

[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  8d6f7c92239a54ce77d7a268f51b49445470fe00 (commit)
      from  4c00f96fc2e32397da5b46ca3428a992333548da (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 8d6f7c92239a54ce77d7a268f51b49445470fe00
Author: Raúl Sanchez Siles <ras...@gm...>
Date:   Sat Mar 13 01:09:01 2021 +0100

    flash/stm32l4x: zero init stm32l4_flash_bank struct on flash bank initialization
    
    This is specially needed when, in the probe routine, device is not
    found among the stm32l4_parts. In this case, the stm32l4_flash_bank->part_info
    is undefined and inadvertentanly used afterwards:
    part_info = stm32l4_info->part_info;
    
    If the stm32l4_flash_bank is zero init, the probe routine checks for
    the validity of the part_info field in the previous struct and correctly
    detects the unsupported (or not found) condition, raising an error
    rather than a SIGSEGV
    
    Change-Id: I7d9d669fb3fa7f8f0903acd60046966b4acb0031
    Signed-off-by: Raúl Sánchez Siles <ras...@gm...>
    Reviewed-on: http://openocd.zylin.com/6103
    Tested-by: jenkins
    Reviewed-by: Tarek BOCHKATI <tar...@gm...>
    Reviewed-by: Oleksij Rempel <li...@re...>
    Reviewed-by: Tomas Vanek <va...@fb...>

diff --git a/src/flash/nor/stm32l4x.c b/src/flash/nor/stm32l4x.c
index 55a8d8ff3..89c5ac3fe 100644
--- a/src/flash/nor/stm32l4x.c
+++ b/src/flash/nor/stm32l4x.c
@@ -439,7 +439,7 @@ FLASH_BANK_COMMAND_HANDLER(stm32l4_flash_bank_command)
 	if (CMD_ARGC < 6)
 		return ERROR_COMMAND_SYNTAX_ERROR;
 
-	stm32l4_info = malloc(sizeof(struct stm32l4_flash_bank));
+	stm32l4_info = calloc(1, sizeof(struct stm32l4_flash_bank));
 	if (!stm32l4_info)
 		return ERROR_FAIL; /* Checkme: What better error to use?*/
 	bank->driver_priv = stm32l4_info;

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

Summary of changes:
 src/flash/nor/stm32l4x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository