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/Application | |
| 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/Application')
| -rw-r--r-- | UefiCpuPkg/Application/Cpuid/Cpuid.c | 8 | ||||
| -rw-r--r-- | UefiCpuPkg/Application/Cpuid/Cpuid.inf | 7 | ||||
| -rw-r--r-- | UefiCpuPkg/Application/Cpuid/Cpuid.uni | 7 | ||||
| -rw-r--r-- | UefiCpuPkg/Application/Cpuid/CpuidExtra.uni | 7 |
4 files changed, 4 insertions, 25 deletions
diff --git a/UefiCpuPkg/Application/Cpuid/Cpuid.c b/UefiCpuPkg/Application/Cpuid/Cpuid.c index 30d43e9..2f90703 100644 --- a/UefiCpuPkg/Application/Cpuid/Cpuid.c +++ b/UefiCpuPkg/Application/Cpuid/Cpuid.c @@ -2,13 +2,7 @@ UEFI Application to display CPUID leaf information.
Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.<BR>
- 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/Application/Cpuid/Cpuid.inf b/UefiCpuPkg/Application/Cpuid/Cpuid.inf index 0d71b11..24f24bf 100644 --- a/UefiCpuPkg/Application/Cpuid/Cpuid.inf +++ b/UefiCpuPkg/Application/Cpuid/Cpuid.inf @@ -8,12 +8,7 @@ #
# Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
#
-# 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/Application/Cpuid/Cpuid.uni b/UefiCpuPkg/Application/Cpuid/Cpuid.uni index 32dee43..b22b598 100644 --- a/UefiCpuPkg/Application/Cpuid/Cpuid.uni +++ b/UefiCpuPkg/Application/Cpuid/Cpuid.uni @@ -8,12 +8,7 @@ //
// Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
//
-// 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/Application/Cpuid/CpuidExtra.uni b/UefiCpuPkg/Application/Cpuid/CpuidExtra.uni index b4251e2..1b3e562 100644 --- a/UefiCpuPkg/Application/Cpuid/CpuidExtra.uni +++ b/UefiCpuPkg/Application/Cpuid/CpuidExtra.uni @@ -8,12 +8,7 @@ //
// Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>
//
-// 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
//
// **/
|