Skip to content

Commit d0f224b

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents bb96f44 + efe9022 commit d0f224b

File tree

341 files changed

+15175
-5825
lines changed

Some content is hidden

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

341 files changed

+15175
-5825
lines changed

AUTHORS

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,2 @@
1-
Dominic Rath <[email protected]>
2-
Magnus Lundin <[email protected]>
3-
Michael Fischer <[email protected]>
4-
Spencer Oliver <[email protected]>
5-
Carsten Schlote <[email protected]>
6-
Øyvind Harboe <[email protected]>
7-
Duane Ellis <[email protected]>
8-
Michael Schwingen <[email protected]>
9-
Rick Altherr <[email protected]>
10-
David Brownell <[email protected]>
11-
Vincint Palatin <[email protected]>
12-
Zachary T Welch <[email protected]>
1+
Please check the source code files and/or Git history for a list of all authors
2+
and contributors.

HACKING

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,6 @@ topics. It is possible because @c for/master is not a traditional Git
155155
branch.
156156
-# You will need to install this hook, we will look into a better solution:
157157
@code
158-
scp -p -P 29418 [email protected]:hooks/commit-msg .git/hooks/
159-
@endcode
160-
Or with http only:
161-
@code
162158
wget https://review.openocd.org/tools/hooks/commit-msg
163159
mv commit-msg .git/hooks
164160
chmod +x .git/hooks/commit-msg

LICENSES/license-rules.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,6 @@ OpenOCD, can be broken down into:
173173

174174
File format examples::
175175

176-
Valid-License-Identifier: GPL-2.0
177176
Valid-License-Identifier: GPL-2.0-only
178177
Valid-License-Identifier: GPL-2.0-or-later
179178
SPDX-URL: https://spdx.org/licenses/GPL-2.0.html
@@ -182,8 +181,6 @@ OpenOCD, can be broken down into:
182181
tag/value pairs into a comment according to the placement
183182
guidelines in the licensing rules documentation.
184183
For 'GNU General Public License (GPL) version 2 only' use:
185-
SPDX-License-Identifier: GPL-2.0
186-
or
187184
SPDX-License-Identifier: GPL-2.0-only
188185
For 'GNU General Public License (GPL) version 2 or any later version' use:
189186
SPDX-License-Identifier: GPL-2.0-or-later

LICENSES/preferred/CC0-1.0

Lines changed: 130 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,130 @@
1+
Valid-License-Identifier: CC0-1.0
2+
SPDX-URL: https://spdx.org/licenses/CC0-1.0.html
3+
Usage-Guide:
4+
To use the Creative Commons Zero v1.0 Universal License put the following
5+
SPDX tag/value pair into a comment according to the placement guidelines in
6+
the licensing rules documentation:
7+
SPDX-License-Identifier: CC0-1.0
8+
License-Text:
9+
10+
Creative Commons Legal Code
11+
12+
CC0 1.0 Universal
13+
14+
CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
15+
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
16+
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
17+
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
18+
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
19+
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
20+
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
21+
HEREUNDER.
22+
23+
Statement of Purpose
24+
25+
The laws of most jurisdictions throughout the world automatically confer
26+
exclusive Copyright and Related Rights (defined below) upon the creator
27+
and subsequent owner(s) (each and all, an "owner") of an original work of
28+
authorship and/or a database (each, a "Work").
29+
30+
Certain owners wish to permanently relinquish those rights to a Work for
31+
the purpose of contributing to a commons of creative, cultural and
32+
scientific works ("Commons") that the public can reliably and without fear
33+
of later claims of infringement build upon, modify, incorporate in other
34+
works, reuse and redistribute as freely as possible in any form whatsoever
35+
and for any purposes, including without limitation commercial purposes.
36+
These owners may contribute to the Commons to promote the ideal of a free
37+
culture and the further production of creative, cultural and scientific
38+
works, or to gain reputation or greater distribution for their Work in
39+
part through the use and efforts of others.
40+
41+
For these and/or other purposes and motivations, and without any
42+
expectation of additional consideration or compensation, the person
43+
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
44+
is an owner of Copyright and Related Rights in the Work, voluntarily
45+
elects to apply CC0 to the Work and publicly distribute the Work under its
46+
terms, with knowledge of his or her Copyright and Related Rights in the
47+
Work and the meaning and intended legal effect of CC0 on those rights.
48+
49+
1. Copyright and Related Rights. A Work made available under CC0 may be
50+
protected by copyright and related or neighboring rights ("Copyright and
51+
Related Rights"). Copyright and Related Rights include, but are not
52+
limited to, the following:
53+
54+
i. the right to reproduce, adapt, distribute, perform, display,
55+
communicate, and translate a Work;
56+
ii. moral rights retained by the original author(s) and/or performer(s);
57+
iii. publicity and privacy rights pertaining to a person's image or
58+
likeness depicted in a Work;
59+
iv. rights protecting against unfair competition in regards to a Work,
60+
subject to the limitations in paragraph 4(a), below;
61+
v. rights protecting the extraction, dissemination, use and reuse of data
62+
in a Work;
63+
vi. database rights (such as those arising under Directive 96/9/EC of the
64+
European Parliament and of the Council of 11 March 1996 on the legal
65+
protection of databases, and under any national implementation
66+
thereof, including any amended or successor version of such
67+
directive); and
68+
vii. other similar, equivalent or corresponding rights throughout the
69+
world based on applicable law or treaty, and any national
70+
implementations thereof.
71+
72+
2. Waiver. To the greatest extent permitted by, but not in contravention
73+
of, applicable law, Affirmer hereby overtly, fully, permanently,
74+
irrevocably and unconditionally waives, abandons, and surrenders all of
75+
Affirmer's Copyright and Related Rights and associated claims and causes
76+
of action, whether now known or unknown (including existing as well as
77+
future claims and causes of action), in the Work (i) in all territories
78+
worldwide, (ii) for the maximum duration provided by applicable law or
79+
treaty (including future time extensions), (iii) in any current or future
80+
medium and for any number of copies, and (iv) for any purpose whatsoever,
81+
including without limitation commercial, advertising or promotional
82+
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
83+
member of the public at large and to the detriment of Affirmer's heirs and
84+
successors, fully intending that such Waiver shall not be subject to
85+
revocation, rescission, cancellation, termination, or any other legal or
86+
equitable action to disrupt the quiet enjoyment of the Work by the public
87+
as contemplated by Affirmer's express Statement of Purpose.
88+
89+
3. Public License Fallback. Should any part of the Waiver for any reason
90+
be judged legally invalid or ineffective under applicable law, then the
91+
Waiver shall be preserved to the maximum extent permitted taking into
92+
account Affirmer's express Statement of Purpose. In addition, to the
93+
extent the Waiver is so judged Affirmer hereby grants to each affected
94+
person a royalty-free, non transferable, non sublicensable, non exclusive,
95+
irrevocable and unconditional license to exercise Affirmer's Copyright and
96+
Related Rights in the Work (i) in all territories worldwide, (ii) for the
97+
maximum duration provided by applicable law or treaty (including future
98+
time extensions), (iii) in any current or future medium and for any number
99+
of copies, and (iv) for any purpose whatsoever, including without
100+
limitation commercial, advertising or promotional purposes (the
101+
"License"). The License shall be deemed effective as of the date CC0 was
102+
applied by Affirmer to the Work. Should any part of the License for any
103+
reason be judged legally invalid or ineffective under applicable law, such
104+
partial invalidity or ineffectiveness shall not invalidate the remainder
105+
of the License, and in such case Affirmer hereby affirms that he or she
106+
will not (i) exercise any of his or her remaining Copyright and Related
107+
Rights in the Work or (ii) assert any associated claims and causes of
108+
action with respect to the Work, in either case contrary to Affirmer's
109+
express Statement of Purpose.
110+
111+
4. Limitations and Disclaimers.
112+
113+
a. No trademark or patent rights held by Affirmer are waived, abandoned,
114+
surrendered, licensed or otherwise affected by this document.
115+
b. Affirmer offers the Work as-is and makes no representations or
116+
warranties of any kind concerning the Work, express, implied,
117+
statutory or otherwise, including without limitation warranties of
118+
title, merchantability, fitness for a particular purpose, non
119+
infringement, or the absence of latent or other defects, accuracy, or
120+
the present or absence of errors, whether or not discoverable, all to
121+
the greatest extent permissible under applicable law.
122+
c. Affirmer disclaims responsibility for clearing rights of other persons
123+
that may apply to the Work or any use thereof, including without
124+
limitation any person's Copyright and Related Rights in the Work.
125+
Further, Affirmer disclaims responsibility for obtaining any necessary
126+
consents, permissions or other rights required for any use of the
127+
Work.
128+
d. Affirmer understands and acknowledges that Creative Commons is not a
129+
party to this document and has no duty or obligation with respect to
130+
this CC0 or use of the Work.

LICENSES/preferred/GPL-2.0

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
Valid-License-Identifier: GPL-2.0
21
Valid-License-Identifier: GPL-2.0-only
32
Valid-License-Identifier: GPL-2.0-or-later
43
SPDX-URL: https://spdx.org/licenses/GPL-2.0.html
@@ -7,8 +6,6 @@ Usage-Guide:
76
tag/value pairs into a comment according to the placement
87
guidelines in the licensing rules documentation.
98
For 'GNU General Public License (GPL) version 2 only' use:
10-
SPDX-License-Identifier: GPL-2.0
11-
or
129
SPDX-License-Identifier: GPL-2.0-only
1310
For 'GNU General Public License (GPL) version 2 or any later version' use:
1411
SPDX-License-Identifier: GPL-2.0-or-later

LICENSES/stand-alone/Apache-2.0

Lines changed: 189 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,189 @@
1+
Valid-License-Identifier: Apache-2.0
2+
SPDX-URL: https://spdx.org/licenses/Apache-2.0.html
3+
Usage-Guide:
4+
Do NOT use on OpenOCD code. The Apache-2.0 is not GPL2 compatible. It may only
5+
be used for dual-licensed files where the other license is GPL2 compatible.
6+
If you end up using this it MUST be used together with a GPL2 compatible
7+
license using "OR".
8+
It may also be used for stand-alone code NOT linked within the OpenOCD binary
9+
but distributed with OpenOCD.
10+
To use the Apache License version 2.0 put the following SPDX tag/value
11+
pair into a comment according to the placement guidelines in the
12+
licensing rules documentation:
13+
SPDX-License-Identifier: Apache-2.0
14+
License-Text:
15+
16+
Apache License
17+
18+
Version 2.0, January 2004
19+
20+
http://www.apache.org/licenses/
21+
22+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
23+
24+
1. Definitions.
25+
26+
"License" shall mean the terms and conditions for use, reproduction, and
27+
distribution as defined by Sections 1 through 9 of this document.
28+
29+
"Licensor" shall mean the copyright owner or entity authorized by the
30+
copyright owner that is granting the License.
31+
32+
"Legal Entity" shall mean the union of the acting entity and all other
33+
entities that control, are controlled by, or are under common control with
34+
that entity. For the purposes of this definition, "control" means (i) the
35+
power, direct or indirect, to cause the direction or management of such
36+
entity, whether by contract or otherwise, or (ii) ownership of fifty
37+
percent (50%) or more of the outstanding shares, or (iii) beneficial
38+
ownership of such entity.
39+
40+
"You" (or "Your") shall mean an individual or Legal Entity exercising
41+
permissions granted by this License.
42+
43+
"Source" form shall mean the preferred form for making modifications,
44+
including but not limited to software source code, documentation source,
45+
and configuration files.
46+
47+
"Object" form shall mean any form resulting from mechanical transformation
48+
or translation of a Source form, including but not limited to compiled
49+
object code, generated documentation, and conversions to other media types.
50+
51+
"Work" shall mean the work of authorship, whether in Source or Object form,
52+
made available under the License, as indicated by a copyright notice that
53+
is included in or attached to the work (an example is provided in the
54+
Appendix below).
55+
56+
"Derivative Works" shall mean any work, whether in Source or Object form,
57+
that is based on (or derived from) the Work and for which the editorial
58+
revisions, annotations, elaborations, or other modifications represent, as
59+
a whole, an original work of authorship. For the purposes of this License,
60+
Derivative Works shall not include works that remain separable from, or
61+
merely link (or bind by name) to the interfaces of, the Work and Derivative
62+
Works thereof.
63+
64+
"Contribution" shall mean any work of authorship, including the original
65+
version of the Work and any modifications or additions to that Work or
66+
Derivative Works thereof, that is intentionally submitted to Licensor for
67+
inclusion in the Work by the copyright owner or by an individual or Legal
68+
Entity authorized to submit on behalf of the copyright owner. For the
69+
purposes of this definition, "submitted" means any form of electronic,
70+
verbal, or written communication sent to the Licensor or its
71+
representatives, including but not limited to communication on electronic
72+
mailing lists, source code control systems, and issue tracking systems that
73+
are managed by, or on behalf of, the Licensor for the purpose of discussing
74+
and improving the Work, but excluding communication that is conspicuously
75+
marked or otherwise designated in writing by the copyright owner as "Not a
76+
Contribution."
77+
78+
"Contributor" shall mean Licensor and any individual or Legal Entity on
79+
behalf of whom a Contribution has been received by Licensor and
80+
subsequently incorporated within the Work.
81+
82+
2. Grant of Copyright License. Subject to the terms and conditions of this
83+
License, each Contributor hereby grants to You a perpetual, worldwide,
84+
non-exclusive, no-charge, royalty-free, irrevocable copyright license to
85+
reproduce, prepare Derivative Works of, publicly display, publicly
86+
perform, sublicense, and distribute the Work and such Derivative Works
87+
in Source or Object form.
88+
89+
3. Grant of Patent License. Subject to the terms and conditions of this
90+
License, each Contributor hereby grants to You a perpetual, worldwide,
91+
non-exclusive, no-charge, royalty-free, irrevocable (except as stated in
92+
this section) patent license to make, have made, use, offer to sell,
93+
sell, import, and otherwise transfer the Work, where such license
94+
applies only to those patent claims licensable by such Contributor that
95+
are necessarily infringed by their Contribution(s) alone or by
96+
combination of their Contribution(s) with the Work to which such
97+
Contribution(s) was submitted. If You institute patent litigation
98+
against any entity (including a cross-claim or counterclaim in a
99+
lawsuit) alleging that the Work or a Contribution incorporated within
100+
the Work constitutes direct or contributory patent infringement, then
101+
any patent licenses granted to You under this License for that Work
102+
shall terminate as of the date such litigation is filed.
103+
104+
4. Redistribution. You may reproduce and distribute copies of the Work or
105+
Derivative Works thereof in any medium, with or without modifications,
106+
and in Source or Object form, provided that You meet the following
107+
conditions:
108+
109+
a. You must give any other recipients of the Work or Derivative Works a
110+
copy of this License; and
111+
112+
b. You must cause any modified files to carry prominent notices stating
113+
that You changed the files; and
114+
115+
c. You must retain, in the Source form of any Derivative Works that You
116+
distribute, all copyright, patent, trademark, and attribution notices
117+
from the Source form of the Work, excluding those notices that do not
118+
pertain to any part of the Derivative Works; and
119+
120+
d. If the Work includes a "NOTICE" text file as part of its
121+
distribution, then any Derivative Works that You distribute must
122+
include a readable copy of the attribution notices contained within
123+
such NOTICE file, excluding those notices that do not pertain to any
124+
part of the Derivative Works, in at least one of the following
125+
places: within a NOTICE text file distributed as part of the
126+
Derivative Works; within the Source form or documentation, if
127+
provided along with the Derivative Works; or, within a display
128+
generated by the Derivative Works, if and wherever such third-party
129+
notices normally appear. The contents of the NOTICE file are for
130+
informational purposes only and do not modify the License. You may
131+
add Your own attribution notices within Derivative Works that You
132+
distribute, alongside or as an addendum to the NOTICE text from the
133+
Work, provided that such additional attribution notices cannot be
134+
construed as modifying the License.
135+
136+
You may add Your own copyright statement to Your modifications and may
137+
provide additional or different license terms and conditions for use,
138+
reproduction, or distribution of Your modifications, or for any such
139+
Derivative Works as a whole, provided Your use, reproduction, and
140+
distribution of the Work otherwise complies with the conditions stated
141+
in this License.
142+
143+
5. Submission of Contributions. Unless You explicitly state otherwise, any
144+
Contribution intentionally submitted for inclusion in the Work by You to
145+
the Licensor shall be under the terms and conditions of this License,
146+
without any additional terms or conditions. Notwithstanding the above,
147+
nothing herein shall supersede or modify the terms of any separate
148+
license agreement you may have executed with Licensor regarding such
149+
Contributions.
150+
151+
6. Trademarks. This License does not grant permission to use the trade
152+
names, trademarks, service marks, or product names of the Licensor,
153+
except as required for reasonable and customary use in describing the
154+
origin of the Work and reproducing the content of the NOTICE file.
155+
156+
7. Disclaimer of Warranty. Unless required by applicable law or agreed to
157+
in writing, Licensor provides the Work (and each Contributor provides
158+
its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
159+
OF ANY KIND, either express or implied, including, without limitation,
160+
any warranties or conditions of TITLE, NON-INFRINGEMENT,
161+
MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely
162+
responsible for determining the appropriateness of using or
163+
redistributing the Work and assume any risks associated with Your
164+
exercise of permissions under this License.
165+
166+
8. Limitation of Liability. In no event and under no legal theory, whether
167+
in tort (including negligence), contract, or otherwise, unless required
168+
by applicable law (such as deliberate and grossly negligent acts) or
169+
agreed to in writing, shall any Contributor be liable to You for
170+
damages, including any direct, indirect, special, incidental, or
171+
consequential damages of any character arising as a result of this
172+
License or out of the use or inability to use the Work (including but
173+
not limited to damages for loss of goodwill, work stoppage, computer
174+
failure or malfunction, or any and all other commercial damages or
175+
losses), even if such Contributor has been advised of the possibility of
176+
such damages.
177+
178+
9. Accepting Warranty or Additional Liability. While redistributing the
179+
Work or Derivative Works thereof, You may choose to offer, and charge a
180+
fee for, acceptance of support, warranty, indemnity, or other liability
181+
obligations and/or rights consistent with this License. However, in
182+
accepting such obligations, You may act only on Your own behalf and on
183+
Your sole responsibility, not on behalf of any other Contributor, and
184+
only if You agree to indemnify, defend, and hold each Contributor
185+
harmless for any liability incurred by, or claims asserted against, such
186+
Contributor by reason of your accepting any such warranty or additional
187+
liability.
188+
189+
END OF TERMS AND CONDITIONS

0 commit comments

Comments
 (0)