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>

44 files changed, 44 insertions, 309 deletions

diff --git a/OvmfPkg/Include/Guid/OvmfPlatformConfig.h b/OvmfPkg/Include/Guid/OvmfPlatformConfig.h
index ea3c26c43a..19b3936cf9 100644
--- a/OvmfPkg/Include/Guid/OvmfPlatformConfig.h
+++ b/OvmfPkg/Include/Guid/OvmfPlatformConfig.h
@@ -3,13 +3,7 @@
 

   Copyright (C) 2014, Red Hat, Inc.

 

-  This program and the accompanying materials are licensed and made available

-  under the terms and conditions of the BSD License that 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/Include/Guid/QemuRamfb.h b/OvmfPkg/Include/Guid/QemuRamfb.h
index 5c9dffb1f0..b0102ec053 100644
--- a/OvmfPkg/Include/Guid/QemuRamfb.h
+++ b/OvmfPkg/Include/Guid/QemuRamfb.h
@@ -4,13 +4,7 @@
 

   Copyright (C) 2018, Red Hat, Inc.

 

-  This program and the accompanying materials are licensed and made available

-  under the terms and conditions of the BSD License that 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/Include/Guid/RootBridgesConnectedEventGroup.h b/OvmfPkg/Include/Guid/RootBridgesConnectedEventGroup.h
index b6803d4195..b85f8743c6 100644
--- a/OvmfPkg/Include/Guid/RootBridgesConnectedEventGroup.h
+++ b/OvmfPkg/Include/Guid/RootBridgesConnectedEventGroup.h
@@ -9,13 +9,7 @@
 

   Copyright (C) 2016, 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

 **/

 

 #ifndef _ROOT_BRIDGES_CONNECTED_EVENT_GROUP_H_

diff --git a/OvmfPkg/Include/Guid/VirtioMmioTransport.h b/OvmfPkg/Include/Guid/VirtioMmioTransport.h
index f17d7b1b42..91e1f13910 100644
--- a/OvmfPkg/Include/Guid/VirtioMmioTransport.h
+++ b/OvmfPkg/Include/Guid/VirtioMmioTransport.h
@@ -4,13 +4,7 @@
 

   Copyright (C) 2014, Red Hat, Inc.

 

-  This program and the accompanying materials are licensed and made available

-  under the terms and conditions of the BSD License that 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/Include/Guid/XenBusRootDevice.h b/OvmfPkg/Include/Guid/XenBusRootDevice.h
index 2b6e710180..932f6cf7fe 100644
--- a/OvmfPkg/Include/Guid/XenBusRootDevice.h
+++ b/OvmfPkg/Include/Guid/XenBusRootDevice.h
@@ -3,13 +3,7 @@
 

   Copyright (C) 2015, Linaro Ltd.

 

-  This program and the accompanying materials are licensed and made available

-  under the terms and conditions of the BSD License that 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/Include/Guid/XenInfo.h b/OvmfPkg/Include/Guid/XenInfo.h
index d512b0b63f..25d76a7828 100644
--- a/OvmfPkg/Include/Guid/XenInfo.h
+++ b/OvmfPkg/Include/Guid/XenInfo.h
@@ -2,13 +2,7 @@
   XenInfo HOB passed by PEI into DXE.

 

 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 that 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/Include/IndustryStandard/E820.h b/OvmfPkg/Include/IndustryStandard/E820.h
index aeafd89f25..1fa0956d2c 100644
--- a/OvmfPkg/Include/IndustryStandard/E820.h
+++ b/OvmfPkg/Include/IndustryStandard/E820.h
@@ -3,14 +3,7 @@
 Copyright (c) 2013, Citrix Systems UK Ltd.

 Copyright (c) 2006 - 2013, 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/OvmfPkg/Include/IndustryStandard/I440FxPiix4.h b/OvmfPkg/Include/IndustryStandard/I440FxPiix4.h
index efe6e5c278..e7d7fde14c 100644
--- a/OvmfPkg/Include/IndustryStandard/I440FxPiix4.h
+++ b/OvmfPkg/Include/IndustryStandard/I440FxPiix4.h
@@ -8,13 +8,7 @@
   Copyright (C) 2015, Red Hat, Inc.

   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 __I440FX_PIIX4_H__

diff --git a/OvmfPkg/Include/IndustryStandard/LegacyVgaBios.h b/OvmfPkg/Include/IndustryStandard/LegacyVgaBios.h
index d55d1283f4..317dac3a56 100644
--- a/OvmfPkg/Include/IndustryStandard/LegacyVgaBios.h
+++ b/OvmfPkg/Include/IndustryStandard/LegacyVgaBios.h
@@ -8,13 +8,7 @@
 

   Copyright (C) 2014, 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

 **/

 

 #ifndef __LEGACY_VGA_BIOS_H__

diff --git a/OvmfPkg/Include/IndustryStandard/LinuxBzimage.h b/OvmfPkg/Include/IndustryStandard/LinuxBzimage.h
index a6d8999730..aa00ddaf41 100644
--- a/OvmfPkg/Include/IndustryStandard/LinuxBzimage.h
+++ b/OvmfPkg/Include/IndustryStandard/LinuxBzimage.h
@@ -1,13 +1,7 @@
 /** @file

 

   Copyright (c) 2011 - 2013, 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/OvmfPkg/Include/IndustryStandard/Q35MchIch9.h b/OvmfPkg/Include/IndustryStandard/Q35MchIch9.h
index 193a262e5b..391cb46222 100644
--- a/OvmfPkg/Include/IndustryStandard/Q35MchIch9.h
+++ b/OvmfPkg/Include/IndustryStandard/Q35MchIch9.h
@@ -6,13 +6,7 @@
   Copyright (C) 2015, Red Hat, Inc.

   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 __Q35_MCH_ICH9_H__

diff --git a/OvmfPkg/Include/IndustryStandard/QemuFwCfg.h b/OvmfPkg/Include/IndustryStandard/QemuFwCfg.h
index 8c32f83e8e..7969aba3ca 100644
--- a/OvmfPkg/Include/IndustryStandard/QemuFwCfg.h
+++ b/OvmfPkg/Include/IndustryStandard/QemuFwCfg.h
@@ -6,13 +6,7 @@
   Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>

   Copyright (C) 2013 - 2017, 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

 **/

 

 #ifndef __FW_CFG_H__

diff --git a/OvmfPkg/Include/IndustryStandard/QemuPciBridgeCapabilities.h b/OvmfPkg/Include/IndustryStandard/QemuPciBridgeCapabilities.h
index bf2373c556..e4fc5df26e 100644
--- a/OvmfPkg/Include/IndustryStandard/QemuPciBridgeCapabilities.h
+++ b/OvmfPkg/Include/IndustryStandard/QemuPciBridgeCapabilities.h
@@ -6,13 +6,7 @@
 

   Copyright (C) 2017, 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

 **/

 

 #ifndef __QEMU_PCI_BRIDGE_CAPABILITIES_H__

diff --git a/OvmfPkg/Include/IndustryStandard/QemuTpm.h b/OvmfPkg/Include/IndustryStandard/QemuTpm.h
index a342cbc347..a43e2547bd 100644
--- a/OvmfPkg/Include/IndustryStandard/QemuTpm.h
+++ b/OvmfPkg/Include/IndustryStandard/QemuTpm.h
@@ -6,13 +6,7 @@
   Copyright (C) 2018, Red Hat, Inc.

   Copyright (c) 2018, IBM 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

 **/

 

 #ifndef __QEMU_TPM_H__

diff --git a/OvmfPkg/Include/IndustryStandard/Virtio.h b/OvmfPkg/Include/IndustryStandard/Virtio.h
index dddec38831..ad6111f3aa 100644
--- a/OvmfPkg/Include/IndustryStandard/Virtio.h
+++ b/OvmfPkg/Include/IndustryStandard/Virtio.h
@@ -6,13 +6,7 @@
   Copyright (C) 2012-2016, Red Hat, Inc.

   Portion of Copyright (C) 2013, ARM Ltd.

 

-  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/Include/IndustryStandard/Virtio095.h b/OvmfPkg/Include/IndustryStandard/Virtio095.h
index 6bf77cb320..fe886d223e 100644
--- a/OvmfPkg/Include/IndustryStandard/Virtio095.h
+++ b/OvmfPkg/Include/IndustryStandard/Virtio095.h
@@ -6,13 +6,7 @@
   Copyright (C) 2012-2016, Red Hat, Inc.

   Portion of Copyright (C) 2013, ARM Ltd.

 

-  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/Include/IndustryStandard/Virtio095Net.h b/OvmfPkg/Include/IndustryStandard/Virtio095Net.h
index 819604289e..9c0ed5ed24 100644
--- a/OvmfPkg/Include/IndustryStandard/Virtio095Net.h
+++ b/OvmfPkg/Include/IndustryStandard/Virtio095Net.h
@@ -4,13 +4,7 @@
 

   Copyright (C) 2013-2016, 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/OvmfPkg/Include/IndustryStandard/Virtio10.h b/OvmfPkg/Include/IndustryStandard/Virtio10.h
index 7d51aa36b3..3c1592d1fd 100644
--- a/OvmfPkg/Include/IndustryStandard/Virtio10.h
+++ b/OvmfPkg/Include/IndustryStandard/Virtio10.h
@@ -4,13 +4,7 @@
   Copyright (C) 2016, Red Hat, Inc.

   Copyright (C) 2017, AMD, 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

 **/

 

 #ifndef _VIRTIO_1_0_H_

diff --git a/OvmfPkg/Include/IndustryStandard/Virtio10Net.h b/OvmfPkg/Include/IndustryStandard/Virtio10Net.h
index cfd25fc414..69dcaca465 100644
--- a/OvmfPkg/Include/IndustryStandard/Virtio10Net.h
+++ b/OvmfPkg/Include/IndustryStandard/Virtio10Net.h
@@ -4,13 +4,7 @@
 

   Copyright (C) 2016, 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

 **/

 

 #ifndef _VIRTIO_1_0_NET_H_

diff --git a/OvmfPkg/Include/IndustryStandard/VirtioBlk.h b/OvmfPkg/Include/IndustryStandard/VirtioBlk.h
index 2ce528a12e..23da619d77 100644
--- a/OvmfPkg/Include/IndustryStandard/VirtioBlk.h
+++ b/OvmfPkg/Include/IndustryStandard/VirtioBlk.h
@@ -5,13 +5,7 @@
 

   Copyright (C) 2012, 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/OvmfPkg/Include/IndustryStandard/VirtioGpu.h b/OvmfPkg/Include/IndustryStandard/VirtioGpu.h
index 9c3516e71e..b0094a5ac6 100644
--- a/OvmfPkg/Include/IndustryStandard/VirtioGpu.h
+++ b/OvmfPkg/Include/IndustryStandard/VirtioGpu.h
@@ -14,13 +14,7 @@
 

   Copyright (C) 2016, 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/OvmfPkg/Include/IndustryStandard/VirtioNet.h b/OvmfPkg/Include/IndustryStandard/VirtioNet.h
index 9b0bfdc585..c9315a029c 100644
--- a/OvmfPkg/Include/IndustryStandard/VirtioNet.h
+++ b/OvmfPkg/Include/IndustryStandard/VirtioNet.h
@@ -4,13 +4,7 @@
 

   Copyright (C) 2013-2016, 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/OvmfPkg/Include/IndustryStandard/VirtioScsi.h b/OvmfPkg/Include/IndustryStandard/VirtioScsi.h
index 0c9b520904..7969d41c1b 100644
--- a/OvmfPkg/Include/IndustryStandard/VirtioScsi.h
+++ b/OvmfPkg/Include/IndustryStandard/VirtioScsi.h
@@ -5,13 +5,7 @@
 

   Copyright (C) 2012, 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/OvmfPkg/Include/Library/LoadLinuxLib.h b/OvmfPkg/Include/Library/LoadLinuxLib.h
index d33249903c..483f8d4b9c 100644
--- a/OvmfPkg/Include/Library/LoadLinuxLib.h
+++ b/OvmfPkg/Include/Library/LoadLinuxLib.h
@@ -2,13 +2,7 @@
   Load/boot UEFI Linux.

 

   Copyright (c) 2011 - 2013, 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/OvmfPkg/Include/Library/MemEncryptSevLib.h b/OvmfPkg/Include/Library/MemEncryptSevLib.h
index 1e2ec8641d..64dd6977b0 100644
--- a/OvmfPkg/Include/Library/MemEncryptSevLib.h
+++ b/OvmfPkg/Include/Library/MemEncryptSevLib.h
@@ -4,13 +4,7 @@
 

   Copyright (c) 2017, AMD Incorporated. 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/OvmfPkg/Include/Library/NvVarsFileLib.h b/OvmfPkg/Include/Library/NvVarsFileLib.h
index a9548678f3..1b924be324 100644
--- a/OvmfPkg/Include/Library/NvVarsFileLib.h
+++ b/OvmfPkg/Include/Library/NvVarsFileLib.h
@@ -2,13 +2,7 @@
   Provides functions to save and restore NV variables in a file.

 

   Copyright (c) 2009, 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/OvmfPkg/Include/Library/PciCapLib.h b/OvmfPkg/Include/Library/PciCapLib.h
index 22a1ad624b..9f834ccb6e 100644
--- a/OvmfPkg/Include/Library/PciCapLib.h
+++ b/OvmfPkg/Include/Library/PciCapLib.h
@@ -6,13 +6,7 @@
 

   Copyright (C) 2018, 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

 **/

 

 #ifndef __PCI_CAP_LIB_H__

diff --git a/OvmfPkg/Include/Library/PciCapPciIoLib.h b/OvmfPkg/Include/Library/PciCapPciIoLib.h
index 553715fd50..9524ff3e97 100644
--- a/OvmfPkg/Include/Library/PciCapPciIoLib.h
+++ b/OvmfPkg/Include/Library/PciCapPciIoLib.h
@@ -4,13 +4,7 @@
 

   Copyright (C) 2018, 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

 **/

 

 #ifndef __PCI_CAP_PCI_IO_LIB_H__

diff --git a/OvmfPkg/Include/Library/PciCapPciSegmentLib.h b/OvmfPkg/Include/Library/PciCapPciSegmentLib.h
index 6b6930288d..1c9c28e2a7 100644
--- a/OvmfPkg/Include/Library/PciCapPciSegmentLib.h
+++ b/OvmfPkg/Include/Library/PciCapPciSegmentLib.h
@@ -4,13 +4,7 @@
 

   Copyright (C) 2018, 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

 **/

 

 #ifndef __PCI_CAP_PCI_SEGMENT_LIB_H__

diff --git a/OvmfPkg/Include/Library/PlatformBmPrintScLib.h b/OvmfPkg/Include/Library/PlatformBmPrintScLib.h
index 1777f9d7c9..11d2481017 100644
--- a/OvmfPkg/Include/Library/PlatformBmPrintScLib.h
+++ b/OvmfPkg/Include/Library/PlatformBmPrintScLib.h
@@ -8,13 +8,7 @@
 

   Copyright (C) 2019, 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

 **/

 

 #ifndef __PLATFORM_BM_PRINT_SC_LIB__

diff --git a/OvmfPkg/Include/Library/PlatformFvbLib.h b/OvmfPkg/Include/Library/PlatformFvbLib.h
index d4d09b2ebd..dc0569808c 100644
--- a/OvmfPkg/Include/Library/PlatformFvbLib.h
+++ b/OvmfPkg/Include/Library/PlatformFvbLib.h
@@ -3,13 +3,7 @@
   Firmare Volume Block driver.

 

   Copyright (c) 2009 - 2011, 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/OvmfPkg/Include/Library/QemuBootOrderLib.h b/OvmfPkg/Include/Library/QemuBootOrderLib.h
index d17de3bb8f..03dea786c9 100644
--- a/OvmfPkg/Include/Library/QemuBootOrderLib.h
+++ b/OvmfPkg/Include/Library/QemuBootOrderLib.h
@@ -4,13 +4,7 @@
 

   Copyright (C) 2012-2014, 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

 **/

 

 #ifndef __QEMU_BOOT_ORDER_LIB_H__

diff --git a/OvmfPkg/Include/Library/QemuFwCfgLib.h b/OvmfPkg/Include/Library/QemuFwCfgLib.h
index 596e3f25d5..68002bb654 100644
--- a/OvmfPkg/Include/Library/QemuFwCfgLib.h
+++ b/OvmfPkg/Include/Library/QemuFwCfgLib.h
@@ -4,13 +4,7 @@
   Copyright (c) 2011 - 2013, Intel Corporation. All rights reserved.<BR>

   Copyright (C) 2013, 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/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
index 432e3c906c..446b960249 100644
--- a/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
+++ b/OvmfPkg/Include/Library/QemuFwCfgS3Lib.h
@@ -7,13 +7,7 @@
 

   Copyright (C) 2017, 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

 **/

 

 #ifndef __FW_CFG_S3_LIB__

diff --git a/OvmfPkg/Include/Library/SerializeVariablesLib.h b/OvmfPkg/Include/Library/SerializeVariablesLib.h
index c9feeb0515..8e74b718f1 100644
--- a/OvmfPkg/Include/Library/SerializeVariablesLib.h
+++ b/OvmfPkg/Include/Library/SerializeVariablesLib.h
@@ -2,13 +2,7 @@
   Serialize & Deserialize UEFI Variables

 

   Copyright (c) 2011, 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/OvmfPkg/Include/Library/VirtioLib.h b/OvmfPkg/Include/Library/VirtioLib.h
index bca58cdeb2..e817a4206f 100644
--- a/OvmfPkg/Include/Library/VirtioLib.h
+++ b/OvmfPkg/Include/Library/VirtioLib.h
@@ -5,13 +5,7 @@
   Copyright (C) 2012-2016, Red Hat, Inc.

   Copyright (C) 2017, AMD Inc, 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/OvmfPkg/Include/Library/VirtioMmioDeviceLib.h b/OvmfPkg/Include/Library/VirtioMmioDeviceLib.h
index 3f63a650be..2ea2830dda 100644
--- a/OvmfPkg/Include/Library/VirtioMmioDeviceLib.h
+++ b/OvmfPkg/Include/Library/VirtioMmioDeviceLib.h
@@ -4,13 +4,7 @@
 

   Copyright (C) 2013, ARM Ltd

 

-  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/Include/Library/XenHypercallLib.h b/OvmfPkg/Include/Library/XenHypercallLib.h
index 36e3344e2f..c43822782b 100644
--- a/OvmfPkg/Include/Library/XenHypercallLib.h
+++ b/OvmfPkg/Include/Library/XenHypercallLib.h
@@ -3,13 +3,7 @@
 

   Copyright (C) 2014, Citrix Ltd.

 

-  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/Include/Library/XenIoMmioLib.h b/OvmfPkg/Include/Library/XenIoMmioLib.h
index 3986c72c57..3db54178bf 100644
--- a/OvmfPkg/Include/Library/XenIoMmioLib.h
+++ b/OvmfPkg/Include/Library/XenIoMmioLib.h
@@ -3,13 +3,7 @@
 *

 *  Copyright (c) 2015, Linaro Ltd. 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/OvmfPkg/Include/OvmfPlatforms.h b/OvmfPkg/Include/OvmfPlatforms.h
index cc67f40a88..59459231e8 100644
--- a/OvmfPkg/Include/OvmfPlatforms.h
+++ b/OvmfPkg/Include/OvmfPlatforms.h
@@ -4,13 +4,7 @@
   Copyright (C) 2015, Red Hat, Inc.

   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 __OVMF_PLATFORMS_H__

diff --git a/OvmfPkg/Include/Protocol/VirtioDevice.h b/OvmfPkg/Include/Protocol/VirtioDevice.h
index afc27e54a8..ea560719ac 100644
--- a/OvmfPkg/Include/Protocol/VirtioDevice.h
+++ b/OvmfPkg/Include/Protocol/VirtioDevice.h
@@ -7,13 +7,7 @@
   Copyright (c) 2013, ARM Ltd. All rights reserved.<BR>

   Copyright (c) 2017, AMD Inc, 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/OvmfPkg/Include/Protocol/XenBus.h b/OvmfPkg/Include/Protocol/XenBus.h
index f5b1cbc44b..8ff5ca3575 100644
--- a/OvmfPkg/Include/Protocol/XenBus.h
+++ b/OvmfPkg/Include/Protocol/XenBus.h
@@ -11,13 +11,7 @@
 

   Copyright (C) 2014, Citrix Ltd.

 

-  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/Include/Protocol/XenIo.h b/OvmfPkg/Include/Protocol/XenIo.h
index 510391f3b3..6bea0a02bb 100644
--- a/OvmfPkg/Include/Protocol/XenIo.h
+++ b/OvmfPkg/Include/Protocol/XenIo.h
@@ -10,13 +10,7 @@
 

   Copyright (C) 2014, Linaro Ltd.

 

-  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/Include/Register/QemuSmramSaveStateMap.h b/OvmfPkg/Include/Register/QemuSmramSaveStateMap.h
index 389428da11..45db759092 100644
--- a/OvmfPkg/Include/Register/QemuSmramSaveStateMap.h
+++ b/OvmfPkg/Include/Register/QemuSmramSaveStateMap.h
@@ -12,13 +12,7 @@ and the AMD64 Architecture Programmer's Manual
 

 Copyright (c) 2015, Intel Corporation. All rights reserved.<BR>

 Copyright (c) 2015, Red Hat, Inc.<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

 

 **/