diff options
| author | Michael D Kinney <michael.d.kinney@intel.com> | 2019-04-03 16:07:22 -0700 |
|---|---|---|
| committer | Michael D Kinney <michael.d.kinney@intel.com> | 2019-04-09 10:58:28 -0700 |
| commit | 0acd869796ded1266e69487dff717cd69d6031f9 (patch) | |
| tree | f69a79ed56e2a127d463d207da6cf106e253ffbe /UefiCpuPkg/CpuS3DataDxe | |
| parent | 86094561f67467814043a8863601ba5e84d9ebca (diff) | |
| download | edk2-0acd869796ded1266e69487dff717cd69d6031f9.zip edk2-0acd869796ded1266e69487dff717cd69d6031f9.tar.gz edk2-0acd869796ded1266e69487dff717cd69d6031f9.tar.bz2 | |
UefiCpuPkg: Replace BSD License with BSD+Patent License
https://bugzilla.tianocore.org/show_bug.cgi?id=1373
Replace BSD 2-Clause License with BSD+Patent License. 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
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Diffstat (limited to 'UefiCpuPkg/CpuS3DataDxe')
| -rw-r--r-- | UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c | 8 | ||||
| -rw-r--r-- | UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf | 8 | ||||
| -rw-r--r-- | UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni | 8 | ||||
| -rw-r--r-- | UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni | 8 |
4 files changed, 4 insertions, 28 deletions
diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c b/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c index 1b847e4..2be335d 100644 --- a/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c +++ b/UefiCpuPkg/CpuS3DataDxe/CpuS3Data.c @@ -12,13 +12,7 @@ and customized if these additional features are required. Copyright (c) 2013 - 2017, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2015, Red Hat, Inc.
-This program and the accompanying materials
-are licensed and made available under the terms and conditions of the BSD License
-which accompanies this distribution. The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
**/
diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf index c167315..510133a 100644 --- a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf +++ b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf @@ -12,13 +12,7 @@ # Copyright (c) 2013-2016, Intel Corporation. All rights reserved.<BR>
# Copyright (c) 2015, Red Hat, Inc.
#
-# This program and the accompanying materials
-# are licensed and made available under the terms and conditions of the BSD License
-# which accompanies this distribution. The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
#
##
diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni index 4a0218f..d16c03f 100644 --- a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni +++ b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni @@ -13,13 +13,7 @@ //
// Copyright (c) 2015, Red Hat, Inc.
//
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// **/
diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni index 050f25f..42653f2 100644 --- a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni +++ b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni @@ -5,13 +5,7 @@ //
// Copyright (c) 2015, Red Hat, Inc.
//
-// This program and the accompanying materials
-// are licensed and made available under the terms and conditions of the BSD License
-// which accompanies this distribution. The full text of the license may be found at
-// http://opensource.org/licenses/bsd-license.php
-//
-// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+// SPDX-License-Identifier: BSD-2-Clause-Patent
//
// **/
|