diff options
author | Dimitris Papastamos <dimitris.papastamos@arm.com> | 2018-08-03 09:36:49 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-08-03 09:36:49 +0100 |
commit | 0454f64b72e3b6a2d3c2a47dead322eb528e709f (patch) | |
tree | e0861b8c2d4997875a09fc0a31bf37946010da56 | |
parent | 90b19376b9263bb688918758812f860ce7f81db4 (diff) | |
parent | 327cfc273fc63d20a73371e45cf549a961014042 (diff) |
Merge pull request #1503 from ARM-software/dh/dual-lic
Update license information in readme.rst
-rw-r--r-- | readme.rst | 19 |
1 files changed, 14 insertions, 5 deletions
@@ -33,16 +33,25 @@ license text is included in those source files. - The stdlib source code is derived from FreeBSD code, which uses various 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 terms of the BSD-2-Clause license. +- The libfdt source code is disjunctively dual licensed + (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 - project under the terms of the NCSA license (also known as the University of - Illinois/NCSA Open Source License). +- The LLVM compiler-rt source code is disjunctively dual licensed + (NCSA OR MIT). It is used by this project under the terms of the NCSA + 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 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 ------------ |