Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
0454f64b
Unverified
Commit
0454f64b
authored
6 years ago
by
Dimitris Papastamos
Committed by
GitHub
6 years ago
Browse files
Options
Download
Plain Diff
Merge pull request #1503 from ARM-software/dh/dual-lic
Update license information in readme.rst
parents
90b19376
327cfc27
master
v2.5
v2.5-rc1
v2.5-rc0
v2.4
v2.4-rc2
v2.4-rc1
v2.4-rc0
v2.3
v2.3-rc2
v2.3-rc1
v2.3-rc0
v2.2
v2.2-rc2
v2.2-rc1
v2.2-rc0
v2.1
v2.1-rc1
v2.1-rc0
v2.0
v2.0-rc0
v1.6
v1.6-rc1
v1.6-rc0
arm_cca_v0.2
arm_cca_v0.1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
readme.rst
+14
-5
readme.rst
with
14 additions
and
5 deletions
+14
-5
readme.rst
View file @
0454f64b
...
@@ -33,16 +33,25 @@ license text is included in those source files.
...
@@ -33,16 +33,25 @@ license text is included in those source files.
- The stdlib source code is derived from FreeBSD code, which uses various
- The stdlib source code is derived from FreeBSD code, which uses various
BSD licenses, including BSD-3-Clause and BSD-2-Clause.
BSD licenses, including BSD-3-Clause and BSD-2-Clause.
- The libfdt source code is dual licensed. It is used by this project under
- The libfdt source code is disjunctively dual licensed
the terms of the BSD-2-Clause license.
(GPL-2.0+ OR BSD-2-Clause). It is used by this project under the terms of
the BSD-2-Clause license. Any contributions to this code must be made under
the terms of both licenses.
- The LLVM compiler-rt source code is dual licensed. It is used by this
- The LLVM compiler-rt source code is disjunctively dual licensed
project under the terms of the NCSA license (also known as the University of
(NCSA OR MIT). It is used by this project under the terms of the NCSA
Illinois/NCSA Open Source License).
license (also known as the University of Illinois/NCSA Open Source License),
which is a permissive license compatible with BSD-3-Clause. Any
contributions to this code must be made under the terms of both licenses.
- The zlib source code is licensed under the Zlib license, which is a
- The zlib source code is licensed under the Zlib license, which is a
permissive license compatible with BSD-3-Clause.
permissive license compatible with BSD-3-Clause.
- Some STMicroelectronics platform source code is disjunctively dual licensed
(GPL-2.0+ OR BSD-3-Clause). It is used by this project under the terms of the
BSD-3-Clause license. Any contributions to this code must be made under the
terms of both licenses.
This release
This release
------------
------------
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment
Menu
Projects
Groups
Snippets
Help