diff options
author | Dan Handley <dan.handley@arm.com> | 2018-07-25 16:42:10 +0100 |
---|---|---|
committer | Dan Handley <dan.handley@arm.com> | 2018-07-31 09:47:15 +0100 |
commit | 327cfc273fc63d20a73371e45cf549a961014042 (patch) | |
tree | e1ea3e2dfafc10fabd1ba4df13ef2d5b3bbf54df /readme.rst | |
parent | 72bc63185c37696877b189cf86c8f52d11911622 (diff) | |
download | arm-trusted-firmware-327cfc273fc63d20a73371e45cf549a961014042.tar.gz |
Update license information in readme.rstdh/dual-lic
Added information on how disjunctively dual licensed code from
other projects is treated in the TF-A project.
Change-Id: Idca329abba4d36bd3c4fd722ac1556940b9135a2
Signed-off-by: Dan Handley <dan.handley@arm.com>
Diffstat (limited to 'readme.rst')
-rw-r--r-- | readme.rst | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/readme.rst b/readme.rst index c87936ced..a82af64a0 100644 --- a/readme.rst +++ b/readme.rst @@ -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 ------------ |