From e1d302e554729e85832bd1fb005abec1c39b2889 Mon Sep 17 00:00:00 2001 From: Michael D Kinney Date: Wed, 3 Apr 2019 16:06:35 -0700 Subject: PcAtChipsetPkg: 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 Reviewed-by: Ray Ni --- PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.c | 8 +------- PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c | 8 +------- PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf | 8 +------- PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.uni | 8 +------- PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c | 8 +------- PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf | 8 +------- PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.uni | 8 +------- PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.c | 8 +------- PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf | 8 +------- PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.uni | 8 +------- PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf | 8 +------- PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.uni | 8 +------- PcAtChipsetPkg/Library/BaseIoApicLib/IoApicLib.c | 8 +------- PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.c | 8 +------- PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.inf | 8 +------- PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.uni | 8 +------- PcAtChipsetPkg/Library/SerialIoLib/PcAtSerialPortLib.uni | 8 +------- PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf | 8 +------- PcAtChipsetPkg/Library/SerialIoLib/SerialPortLib.c | 8 +------- 19 files changed, 19 insertions(+), 133 deletions(-) (limited to 'PcAtChipsetPkg/Library') diff --git a/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.c b/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.c index 9817bea21f..7dc11014a5 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.c +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/AcpiTimerLib.c @@ -2,13 +2,7 @@ ACPI Timer implements one instance of Timer Library. Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
- 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/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c b/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c index 2d79c6c1f1..9ad8ced992 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c @@ -2,13 +2,7 @@ ACPI Timer implements one instance of Timer Library. Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
- 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/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf b/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf index b7f737e30a..7f129e6a35 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf @@ -8,13 +8,7 @@ # is compatible with both 24-bit and 32-bit ACPI timers. # # Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
-# 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/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.uni b/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.uni index c0421c3b5a..a981455727 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.uni +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.uni @@ -6,13 +6,7 @@ // // Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// -// 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/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c index 9ed10ef2e2..3ad831b15e 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c @@ -2,13 +2,7 @@ ACPI Timer implements one instance of Timer Library. Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
- 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/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf index 601041c801..d86356f4ff 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf @@ -8,13 +8,7 @@ # is compatible with both 24-bit and 32-bit ACPI timers. # # Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
-# 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/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.uni b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.uni index bf31abf81d..e732ab6b97 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.uni +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.uni @@ -6,13 +6,7 @@ // // Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
// -// 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/PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.c b/PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.c index a504bd8a3c..a669794c3b 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.c +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.c @@ -2,13 +2,7 @@ ACPI Timer implements one instance of Timer Library. Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
- 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/PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf b/PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf index 1d8c95a3ec..33608effac 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.inf @@ -8,13 +8,7 @@ # is compatible with both 24-bit and 32-bit ACPI timers. # # Copyright (c) 2013 - 2018, Intel Corporation. All rights reserved.
-# 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/PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.uni b/PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.uni index 668161b14a..b6e96e4e12 100644 --- a/PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.uni +++ b/PcAtChipsetPkg/Library/AcpiTimerLib/PeiAcpiTimerLib.uni @@ -6,13 +6,7 @@ // // Copyright (c) 2018, Intel Corporation. All rights reserved.
// -// 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/PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf b/PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf index f549f74534..b66d7b9df2 100644 --- a/PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf +++ b/PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.inf @@ -2,13 +2,7 @@ # Library instance for I/O APIC library class # # Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.
-# 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/PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.uni b/PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.uni index 9b533a33f1..5931b2520b 100644 --- a/PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.uni +++ b/PcAtChipsetPkg/Library/BaseIoApicLib/BaseIoApicLib.uni @@ -5,13 +5,7 @@ // // Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
// -// 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/PcAtChipsetPkg/Library/BaseIoApicLib/IoApicLib.c b/PcAtChipsetPkg/Library/BaseIoApicLib/IoApicLib.c index 0b8f888e7e..7a3c9aca8d 100644 --- a/PcAtChipsetPkg/Library/BaseIoApicLib/IoApicLib.c +++ b/PcAtChipsetPkg/Library/BaseIoApicLib/IoApicLib.c @@ -5,13 +5,7 @@ handles cases where I/O APIC is disabled. Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.
- 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/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.c b/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.c index 237ae883e9..eccef89ebe 100644 --- a/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.c +++ b/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.c @@ -2,13 +2,7 @@ Reset System Library functions for PCAT platforms Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
- 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/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.inf b/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.inf index 248ec2e2c5..3f3d0e4a1f 100644 --- a/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.inf +++ b/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.inf @@ -2,13 +2,7 @@ # Library instance for ResetSystem library class for PCAT systems # # Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
-# 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/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.uni b/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.uni index be6f29f56b..ea2a910365 100644 --- a/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.uni +++ b/PcAtChipsetPkg/Library/ResetSystemLib/ResetSystemLib.uni @@ -5,13 +5,7 @@ // // Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// -// 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/PcAtChipsetPkg/Library/SerialIoLib/PcAtSerialPortLib.uni b/PcAtChipsetPkg/Library/SerialIoLib/PcAtSerialPortLib.uni index e42e0eba5a..2efd21ca6f 100644 --- a/PcAtChipsetPkg/Library/SerialIoLib/PcAtSerialPortLib.uni +++ b/PcAtChipsetPkg/Library/SerialIoLib/PcAtSerialPortLib.uni @@ -5,13 +5,7 @@ // // Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
// -// 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/PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf b/PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf index 959d6e27c9..d02259a07c 100644 --- a/PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf +++ b/PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf @@ -2,13 +2,7 @@ # Library instance for SerialIo library class # # Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.
-# 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/PcAtChipsetPkg/Library/SerialIoLib/SerialPortLib.c b/PcAtChipsetPkg/Library/SerialIoLib/SerialPortLib.c index d1a1c6a03f..93affe151e 100644 --- a/PcAtChipsetPkg/Library/SerialIoLib/SerialPortLib.c +++ b/PcAtChipsetPkg/Library/SerialIoLib/SerialPortLib.c @@ -2,13 +2,7 @@ UART Serial Port library functions Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.
- 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 **/ -- cgit v1.2.3