Merge up to 88b9bd3 from upstream

Conflicts:

* `configure.ac`: commit bd5649d
  ("Support cJTAG JScan3 mode") and commit
  7d0e125 ("jtag/drivers: Add support
  for CH347-based JTAG adapters")
* `src/jtag/drivers/ftdi.c`: commit
  f61098c ("Rename ftdi_oscan1 to
  ftdi_cjtag") and commit 867611d
  ("jtag: drivers: align switch and case statements") -- resolved by
  aligning the statements.
* `src/rtos/freertos.c`: commit 50a5971
  ("RISC-V Freertos support (#582)") and commit commit
  3954896 ("rtos/FreeRTOS: fix next
  pointer member offset in FreeRTOS lists") -- dropped the upstream
  change since the offsets are dynamically computed by
  `freertos_compute_offsets()`.
* `src/rtos/freertos.c`:  due to commit
  b3b790e ("rtos: rework
  rtos_create()") -- the change is already adopted.
* `src/rtos/hwthread.c`: commit 95cb368
  ("Merge up to 1f3f635 from upstream")
  and commit c545b9c ("rtos/hwthread:
  use printf format specifier") -- resolved in favour of upstream
  version.
* `src/rtos/rtos.c`: commit 737f013
  ("Support RV32/RV64 mainline/metal stackings (#586)") and commit
  b3b790e ("rtos: rework
  rtos_create()") -- adjusted the handlers, adopted the error checks.
* `src/server/gdb_server.c`: commit
  52c9ae0 ("server/gdb_server: Handle
  events if first target is unavailable") and commit
  7f57e72 ("gdb_server: Operate on
  available targets.") -- resolved in favor of the version from RISC-V
  OpenOCD, since it is being upstreamed. Link:
  https://review.openocd.org/c/openocd/+/8914
* `src/target/breakpoints.c`: commit
  b1f3a75 ("target/riscv: Don't resume
  unavailable harts.") and commit
  ddef9cf ("target: align switch and
  case statements") -- aligned the statements.
* `src/target/riscv/riscv.c`: due to commit
  325e6d3 ("target: Use 'bool' data
  type in mmu()") -- adjusted to use `bool` instead of `int`.
* `src/target/target.c`: commit 41b5b54
  ("Revert "break from long loops on shutdown request"") and commit
  9fe3780 ("openocd: drop iteration
  downsampling for keep_alive()") -- also dropped the downsampling.
* `src/helper/base64.[ch]`: due to commit
  6a3abda ("helper: add base64
  encoding/decoding helpers from FreeBSD") -- resolved in favour of
  upstream.

Change-Id: I179c142a0f0c168683d48b6ae0956328ab289a2f
Signed-off-by: Evgeniy Naydanov <[email protected]>

Author: en-sc

HACKING

@@ -195,7 +195,9 @@ git remote add review https://USERNAME:[email protected]/p/openocd.git
 Gerrit server, even if you plan to use several local branches for different
 topics. It is possible because @c for/master is not a traditional Git
 branch.
-  -# You will need to install this hook, we will look into a better solution:
+  -# You will need to install this hook to automatically add the
+     field "Change-Id:" in the commit message, as required by Gerrit.
+     We will look into a better solution:
 @code
 wget https://review.openocd.org/tools/hooks/commit-msg
 mv commit-msg .git/hooks
@@ -272,6 +274,12 @@ doc: fix typos
 @code
 git pull --rebase origin master
 @endcode
+
+-# When you create a new version of an old patch, check that the new patch
+   keeps the same 'Change-Id:' field of the old patch.
+   This allows the Gerrit server to recognize the patch as a new version of
+   the older one and keeps track of the history and the review process.
+
 -# Send the patches to the Gerrit server for review:
 @code
 git push review

LICENSES/dual/CC-BY-4.0

@@ -187,7 +187,21 @@ OpenOCD, can be broken down into:
       License-Text:
         Full license text
 
-2. Exceptions:
+2. Dual Licensing Only:
+
+   These licenses should only be used to dual license code with another
+   license in addition to a preferred license.  These licenses are available
+   from the directory::
+
+      LICENSES/dual/
+
+   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.
+
+3. Exceptions:
 
    Some licenses can be amended with exceptions which grant certain rights
    which the original license does not.  These exceptions are available
@@ -244,7 +258,7 @@ OpenOCD, can be broken down into:
       License-Text:
         Full license text
 
-3. Stand-alone licenses:
+4. 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.

LICENSES/license-rules.txt

@@ -18,7 +18,7 @@ License-Text:
 
 
  Copyright (C) 2000,2001,2002  Free Software Foundation, Inc.
-     51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+     <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 

LICENSES/preferred/GFDL-1.2

@@ -15,7 +15,7 @@ License-Text:
                        Version 2, June 1991
 
  Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ <https://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -317,8 +317,7 @@ the "copyright" line and a pointer to where the full notice is found.
     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.
+    with this program; if not, see <https://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 

LICENSES/preferred/GPL-2.0

@@ -16,7 +16,7 @@ GNU LESSER GENERAL PUBLIC LICENSE
 Version 2.1, February 1999
 
 Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+<https://fsf.org/>
 
 Everyone is permitted to copy and distribute verbatim copies of this
 license document, but changing it is not allowed.
@@ -486,9 +486,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
 for more details.
 
 You should have received a copy of the GNU Lesser General Public License
-along with this library; 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.
+along with this library; if not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
 
 You should also get your employer (if you work as a programmer) or your
 school, if any, to sign a "copyright disclaimer" for the library, if

LICENSES/preferred/LGPL-2.1

@@ -1,16 +1,14 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
-# not a GNU package. You can remove this line, if
-# have all needed files, that a GNU package needs
-AUTOMAKE_OPTIONS = gnu 1.6
+AUTOMAKE_OPTIONS = gnu 1.14
 
 .DELETE_ON_ERROR:
 
 # make sure we pass the correct jimtcl flags to distcheck
 AM_DISTCHECK_CONFIGURE_FLAGS = --disable-install-jim
 
 # do not run Jim Tcl tests (esp. during distcheck)
-check-recursive: SUBDIRS :=
+check-recursive: SUBDIRS := $(SUBDIRS:jimtcl=)
 
 nobase_dist_pkgdata_DATA = \
 	contrib/libdcc/dcc_stdio.c \
@@ -36,6 +34,9 @@ EXTRA_DIST += jimtcl/configure.gnu
 DISTCLEANFILES += jimtcl/jsmn/jsmn.o
 endif
 
+SUBDIRS += testing
+DIST_SUBDIRS += testing
+
 # common flags used in openocd build
 AM_CFLAGS = $(GCC_WARNINGS)
 AM_LDFLAGS =
@@ -67,6 +68,7 @@ EXTRA_DIST += \
 	$(EXTRA_DIST_NEWS) \
 	Doxyfile.in \
 	LICENSES/license-rules.txt \
+	LICENSES/dual/CC-BY-4.0 \
 	LICENSES/exceptions/eCos-exception-2.0 \
 	LICENSES/preferred/BSD-1-Clause \
 	LICENSES/preferred/BSD-2-Clause \

Makefile.am

@@ -191,6 +191,11 @@ and compiling the OpenOCD source code. That file is provided by
 default for all GNU autotools packages. If you are not familiar with
 the GNU autotools, then you should read those instructions first.
 
+Note: if the INSTALL file is not present, it means you are using the
+source code from a development branch, not from an OpenOCD release.
+In this case, follow the instructions 'Compiling OpenOCD' below and
+the file will be created by the first command './bootstrap'.
+
 The remainder of this document tries to provide some instructions for
 those looking for a quick-install.
 

README

@@ -10,18 +10,6 @@ host. See README for the generic instructions.
 Also, the MSYS2 project provides both ready-made binaries and an easy
 way to self-compile from their software repository out of the box.
 
-Native MinGW-w64/MSYS compilation
------------------------------
-
-As MSYS doesn't come with pkg-config pre-installed, you need to add it
-manually. The easiest way to do that is to download pkg-config-lite
-from:
-
-  http://sourceforge.net/projects/pkgconfiglite/
-
-Then simply unzip the archive to the root directory of your MinGW-w64
-installation.
-
 USB adapters
 ------------