OvmfPkg: 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: Laszlo Ersek <lersek@redhat.com>

8 files changed, 8 insertions, 56 deletions

diff --git a/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c
index 938b77c..2ed1bae 100644
--- a/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c
+++ b/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.c
@@ -4,13 +4,7 @@
   Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.<BR>

   Copyright (c) 2011, Andrei Warkentin <andreiw@motorola.com>

 

-  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/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.h b/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.h
index 475da70..0ac9902 100644
--- a/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.h
+++ b/OvmfPkg/Library/AcpiTimerLib/AcpiTimerLib.h
@@ -3,13 +3,7 @@
 

   Copyright (C) 2014, Gabriel L. Somlo <somlo@cmu.edu>

 

-  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

 **/

 

 #ifndef _ACPI_TIMER_LIB_INTERNAL_H_

diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c
index a839495..aa2b5fa 100644
--- a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c
+++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c
@@ -3,13 +3,7 @@
 

   Copyright (C) 2014, Gabriel L. Somlo <somlo@cmu.edu>

 

-  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

 **/

 

 #include <Library/DebugLib.h>

diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
index 764edcf..21bf79c 100644
--- a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
+++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
@@ -4,13 +4,7 @@
 #  Copyright (C) 2014, Gabriel L. Somlo <somlo@cmu.edu>

 #  Copyright (c) 2008 - 2010, 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/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
index dbbecc9..dd022ac 100644
--- a/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
+++ b/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
@@ -4,13 +4,7 @@
   Copyright (c) 2008 - 2012, Intel Corporation. All rights reserved.

   Copyright (c) 2011, Andrei Warkentin <andreiw@motorola.com>

 

-  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

 **/

 

 #include <Library/DebugLib.h>

diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.inf b/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.inf
index 113d180..8f9bedb 100644
--- a/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.inf
+++ b/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.inf
@@ -3,13 +3,7 @@
 #

 #  Copyright (c) 2008 - 2010, 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/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c
index e673434..ae976cb 100644
--- a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c
+++ b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c
@@ -3,13 +3,7 @@
 

   Copyright (C) 2014, Gabriel L. Somlo <somlo@cmu.edu>

 

-  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

 **/

 

 #include <Library/DebugLib.h>

diff --git a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
index 4116d5e..e29872a 100644
--- a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
+++ b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
@@ -4,13 +4,7 @@
 #  Copyright (C) 2014, Gabriel L. Somlo <somlo@cmu.edu>

 #  Copyright (c) 2008 - 2010, 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

 #

 ##