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/Bus/Pci/IdeControllerDxe/ComponentName.c | 8 +------- PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.c | 8 +------- PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.h | 8 +------- PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.uni | 8 +------- PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf | 8 +------- PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerExtra.uni | 8 +------- 6 files changed, 6 insertions(+), 42 deletions(-) (limited to 'PcAtChipsetPkg/Bus') diff --git a/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/ComponentName.c b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/ComponentName.c index 76fc211398..4f08ec1598 100644 --- a/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/ComponentName.c +++ b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/ComponentName.c @@ -3,13 +3,7 @@ "IDE Controller Init Driver" Copyright (c) 2008 - 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/Bus/Pci/IdeControllerDxe/IdeController.c b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.c index 4ce091c216..8f41c7c3f4 100644 --- a/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.c +++ b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.c @@ -4,13 +4,7 @@ is responsible for early initialization of IDE controller. Copyright (c) 2008 - 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/Bus/Pci/IdeControllerDxe/IdeController.h b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.h index 8df0201f30..a5bbbcc4e1 100644 --- a/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.h +++ b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.h @@ -2,13 +2,7 @@ Header file for IDE controller driver. Copyright (c) 2008 - 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/Bus/Pci/IdeControllerDxe/IdeController.uni b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.uni index ce1ea4d083..22a6b1870d 100644 --- a/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.uni +++ b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.uni @@ -5,13 +5,7 @@ // // Copyright (c) 2008 - 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/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf index efffc56f06..d697751a39 100644 --- a/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf +++ b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerDxe.inf @@ -3,13 +3,7 @@ # IDE Bus driver to support platform dependent timing information. # # Copyright (c) 2008 - 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/Bus/Pci/IdeControllerDxe/IdeControllerExtra.uni b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerExtra.uni index a06438b5c5..a6d7618e9e 100644 --- a/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerExtra.uni +++ b/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeControllerExtra.uni @@ -3,13 +3,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 // // **/ -- cgit v1.2.3