andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1503 from ARM-software/dh/dual-lic 

Update license information in readme.rst
This commit is contained in:
Dimitris Papastamos 2018-08-03 09:36:49 +01:00 committed by GitHub
parent 90b19376b9 327cfc273f
commit 0454f64b72
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
readme.rst
View File

@ -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
------------ ------------