Skip to content

Commit 7fb168c

Browse files
committed
Merge up to c2cfeee from upstream
* `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: Ide0f7813c4870344ed7ed4a7dafb26d959b9efd5 Signed-off-by: Evgeniy Naydanov <[email protected]>
2 parents 48483a8 + c2cfeee commit 7fb168c

File tree

350 files changed

+25299
-15437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+25299
-15437
lines changed

HACKING

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,9 @@ git remote add review https://USERNAME:[email protected]/p/openocd.git
195195
Gerrit server, even if you plan to use several local branches for different
196196
topics. It is possible because @c for/master is not a traditional Git
197197
branch.
198-
-# You will need to install this hook, we will look into a better solution:
198+
-# You will need to install this hook to automatically add the
199+
field "Change-Id:" in the commit message, as required by Gerrit.
200+
We will look into a better solution:
199201
@code
200202
wget https://review.openocd.org/tools/hooks/commit-msg
201203
mv commit-msg .git/hooks
@@ -272,6 +274,12 @@ doc: fix typos
272274
@code
273275
git pull --rebase origin master
274276
@endcode
277+
278+
-# When you create a new version of an old patch, check that the new patch
279+
keeps the same 'Change-Id:' field of the old patch.
280+
This allows the Gerrit server to recognize the patch as a new version of
281+
the older one and keeps track of the history and the review process.
282+
275283
-# Send the patches to the Gerrit server for review:
276284
@code
277285
git push review

LICENSES/dual/CC-BY-4.0

Lines changed: 409 additions & 0 deletions
Large diffs are not rendered by default.

LICENSES/license-rules.txt

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,21 @@ OpenOCD, can be broken down into:
187187
License-Text:
188188
Full license text
189189

190-
2. Exceptions:
190+
2. Dual Licensing Only:
191+
192+
These licenses should only be used to dual license code with another
193+
license in addition to a preferred license. These licenses are available
194+
from the directory::
195+
196+
LICENSES/dual/
197+
198+
in the OpenOCD source tree.
199+
200+
The files in this directory contain the full license text and
201+
`Metatags`_. The file names are identical to the SPDX license
202+
identifier which shall be used for the license in source files.
203+
204+
3. Exceptions:
191205

192206
Some licenses can be amended with exceptions which grant certain rights
193207
which the original license does not. These exceptions are available
@@ -244,7 +258,7 @@ OpenOCD, can be broken down into:
244258
License-Text:
245259
Full license text
246260

247-
3. Stand-alone licenses:
261+
4. Stand-alone licenses:
248262

249263
These licenses should only be used for stand-alone applications that are
250264
distributed with OpenOCD but are not included in the OpenOCD binary.

LICENSES/preferred/GFDL-1.2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ License-Text:
1818

1919

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

LICENSES/preferred/GPL-2.0

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ License-Text:
1515
Version 2, June 1991
1616

1717
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
18-
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18+
<https://fsf.org/>
1919
Everyone is permitted to copy and distribute verbatim copies
2020
of this license document, but changing it is not allowed.
2121

@@ -317,8 +317,7 @@ the "copyright" line and a pointer to where the full notice is found.
317317
GNU General Public License for more details.
318318

319319
You should have received a copy of the GNU General Public License along
320-
with this program; if not, write to the Free Software Foundation, Inc.,
321-
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
320+
with this program; if not, see <https://www.gnu.org/licenses/>.
322321

323322
Also add information on how to contact you by electronic and paper mail.
324323

LICENSES/preferred/LGPL-2.1

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ GNU LESSER GENERAL PUBLIC LICENSE
1616
Version 2.1, February 1999
1717

1818
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
19-
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
19+
<https://fsf.org/>
2020

2121
Everyone is permitted to copy and distribute verbatim copies of this
2222
license document, but changing it is not allowed.
@@ -486,9 +486,9 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
486486
for more details.
487487

488488
You should have received a copy of the GNU Lesser General Public License
489-
along with this library; if not, write to the Free Software Foundation,
490-
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Also add
491-
information on how to contact you by electronic and paper mail.
489+
along with this library; if not, see <https://www.gnu.org/licenses/>.
490+
491+
Also add information on how to contact you by electronic and paper mail.
492492

493493
You should also get your employer (if you work as a programmer) or your
494494
school, if any, to sign a "copyright disclaimer" for the library, if

Makefile.am

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
# SPDX-License-Identifier: GPL-2.0-or-later
22

3-
# not a GNU package. You can remove this line, if
4-
# have all needed files, that a GNU package needs
5-
AUTOMAKE_OPTIONS = gnu 1.6
3+
AUTOMAKE_OPTIONS = gnu 1.14
64

75
.DELETE_ON_ERROR:
86

97
# make sure we pass the correct jimtcl flags to distcheck
108
AM_DISTCHECK_CONFIGURE_FLAGS = --disable-install-jim
119

1210
# do not run Jim Tcl tests (esp. during distcheck)
13-
check-recursive: SUBDIRS :=
11+
check-recursive: SUBDIRS := $(SUBDIRS:jimtcl=)
1412

1513
nobase_dist_pkgdata_DATA = \
1614
contrib/libdcc/dcc_stdio.c \
@@ -36,6 +34,9 @@ EXTRA_DIST += jimtcl/configure.gnu
3634
DISTCLEANFILES += jimtcl/jsmn/jsmn.o
3735
endif
3836

37+
SUBDIRS += testing
38+
DIST_SUBDIRS += testing
39+
3940
# common flags used in openocd build
4041
AM_CFLAGS = $(GCC_WARNINGS)
4142
AM_LDFLAGS =
@@ -67,6 +68,7 @@ EXTRA_DIST += \
6768
$(EXTRA_DIST_NEWS) \
6869
Doxyfile.in \
6970
LICENSES/license-rules.txt \
71+
LICENSES/dual/CC-BY-4.0 \
7072
LICENSES/exceptions/eCos-exception-2.0 \
7173
LICENSES/preferred/BSD-1-Clause \
7274
LICENSES/preferred/BSD-2-Clause \

0 commit comments

Comments
 (0)