diff options
author | Michael D Kinney <michael.d.kinney@intel.com> | 2019-05-14 17:43:59 -0700 |
---|---|---|
committer | Michael D Kinney <michael.d.kinney@intel.com> | 2019-05-17 14:21:32 -0700 |
commit | ae604e4ffe8f6570608bb61ddee09b5187ba9344 (patch) | |
tree | 989b5fc27ce466a864328e140cd513b4d40ec78e /Platform/AMD | |
parent | 12542983fa2e2611017f8a7210dd1edb88d7e686 (diff) |
edk2-platforms: Change License.txt from 2-Clause BSD to BSD+Patent
Change License.txt in the root of the edk2-platforms repository from
the 2-Clause BSD License to the BSD+Patent License.
The text difference between these licenses in the patch is larger
than expected due to different choices for the position of the line
breaks. The text from the BSD 2-Clause license and its disclaimer
are the same. New clauses from the BSD+Patent license have been
added.
The License.txt files in other directories that contain the 2-Clause
BSD License are deleted. The single License.txt in the root of the
edk2-platforms repository with the BSD+Patent License contents is the
preferred license for the edk2-platforms repository.
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
This change is based on the following emails:
https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
RFCs with detailed process for the license change:
V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Thad Gillispie <thad.gillispie@intel.com>
Cc: Daocheng Bu <daocheng.bu@intel.com>
Cc: Isaac W Oram <isaac.w.oram@intel.com>
Cc: Maciej Piwko <maciej.piwko@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Cc: Shifei A Lu <shifei.a.lu@intel.com>
Cc: Xiaohu Zhou <bowen.zhou@intel.com>
Cc: Ankit Sinha <ankit.sinha@intel.com>
Cc: Sai Chaganty <rangasai.v.chaganty@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Diffstat (limited to 'Platform/AMD')
-rw-r--r-- | Platform/AMD/License.txt | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/Platform/AMD/License.txt b/Platform/AMD/License.txt deleted file mode 100644 index ff85835d..00000000 --- a/Platform/AMD/License.txt +++ /dev/null @@ -1,25 +0,0 @@ -Copyright (c) 2013 - 2016, AMD Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
|