1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [[edk2-platforms][PATCH V2] 15/30] Platform/RaspberryPi: Replace BSD License with BSD+Patent License

Michael D Kinney posted 1 patch 4 years, 11 months ago
Failed in applying to current master (apply log)
Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h        | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf      | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc           | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc           | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl            | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc           | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc           | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc           | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl             | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Pep.c               | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Pep.h               | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl            | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl            | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl            | 8 +-------
Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl            | 8 +-------
.../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c     | 8 +-------
.../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h     | 8 +-------
.../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf   | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c  | 8 +-------
.../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf     | 9 +--------
.../RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h        | 8 +-------
.../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni  | 8 +-------
.../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr  | 8 +-------
.../RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c  | 8 +-------
.../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c     | 8 +-------
.../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h     | 8 +-------
.../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf   | 8 +-------
.../RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c     | 8 +-------
.../RPi3/Drivers/DwUsbHostDxe/ComponentName.c            | 8 +-------
.../RPi3/Drivers/DwUsbHostDxe/DriverBinding.c            | 8 +-------
.../RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c | 8 +-------
.../RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h | 8 +-------
.../RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf           | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h   | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c        | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf      | 8 +-------
.../RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c      | 8 +-------
.../RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c    | 8 +-------
.../RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h    | 8 +-------
.../Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf    | 9 +--------
.../Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni    | 8 +-------
.../GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni       | 8 +-------
.../RPi3/Drivers/GraphicsConsoleDxe/NewFont.c            | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c   | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c           | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h           | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c    | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c      | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf      | 8 +-------
.../RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c  | 8 +-------
.../RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c   | 8 +-------
.../RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf | 8 +-------
.../RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c         | 8 +-------
.../RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf       | 8 +-------
Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c  | 8 +-------
.../RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf     | 8 +-------
.../RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c | 8 +-------
.../RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c            | 8 +-------
.../RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c    | 8 +-------
.../RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h    | 8 +-------
.../RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c | 8 +-------
.../Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf    | 9 +--------
Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h       | 8 +-------
.../RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h  | 8 +-------
Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h | 8 +-------
Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h  | 8 +-------
.../RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c     | 8 +-------
.../RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf   | 8 +-------
.../RPi3/Library/PlatformBootManagerLib/PlatformBm.c     | 8 +-------
.../RPi3/Library/PlatformBootManagerLib/PlatformBm.h     | 8 +-------
.../PlatformBootManagerLib/PlatformBootManagerLib.inf    | 9 +--------
.../RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S | 8 +-------
.../RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf | 8 +-------
.../RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c   | 8 +-------
.../RPi3/Library/PlatformLib/RaspberryPiMem.c            | 8 +-------
.../RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c     | 8 +-------
Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c    | 8 +-------
Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf  | 8 +-------
Platform/RaspberryPi/RPi3/RPi3.dec                       | 9 +--------
Platform/RaspberryPi/RPi3/RPi3.dsc                       | 9 +--------
Platform/RaspberryPi/RPi3/RPi3.fdf                       | 9 +--------
82 files changed, 82 insertions(+), 581 deletions(-)
[edk2-devel] [[edk2-platforms][PATCH V2] 15/30] Platform/RaspberryPi: Replace BSD License with BSD+Patent License
Posted by Michael D Kinney 4 years, 11 months ago 
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

Cc: Leif Lindholm <leif.lindholm@linaro.org>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h        | 8 +-------
 Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf      | 8 +-------
 Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc           | 8 +-------
 Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc           | 8 +-------
 Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl            | 8 +-------
 Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc           | 8 +-------
 Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc           | 8 +-------
 Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc           | 8 +-------
 Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl             | 8 +-------
 Platform/RaspberryPi/RPi3/AcpiTables/Pep.c               | 8 +-------
 Platform/RaspberryPi/RPi3/AcpiTables/Pep.h               | 8 +-------
 Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl            | 8 +-------
 Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl            | 8 +-------
 Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl            | 8 +-------
 Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl            | 8 +-------
 .../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c     | 8 +-------
 .../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h     | 8 +-------
 .../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf   | 8 +-------
 Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c  | 8 +-------
 .../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf     | 9 +--------
 .../RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h        | 8 +-------
 .../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni  | 8 +-------
 .../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr  | 8 +-------
 .../RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c  | 8 +-------
 .../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c     | 8 +-------
 .../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h     | 8 +-------
 .../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf   | 8 +-------
 .../RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c     | 8 +-------
 .../RPi3/Drivers/DwUsbHostDxe/ComponentName.c            | 8 +-------
 .../RPi3/Drivers/DwUsbHostDxe/DriverBinding.c            | 8 +-------
 .../RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c | 8 +-------
 .../RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h | 8 +-------
 .../RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf           | 8 +-------
 Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h   | 8 +-------
 Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c        | 8 +-------
 Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf      | 8 +-------
 .../RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c      | 8 +-------
 .../RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c    | 8 +-------
 .../RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h    | 8 +-------
 .../Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf    | 9 +--------
 .../Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni    | 8 +-------
 .../GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni       | 8 +-------
 .../RPi3/Drivers/GraphicsConsoleDxe/NewFont.c            | 8 +-------
 Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c | 8 +-------
 Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c   | 8 +-------
 Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c           | 8 +-------
 Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h           | 8 +-------
 Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c    | 8 +-------
 Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c      | 8 +-------
 Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf      | 8 +-------
 .../RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c  | 8 +-------
 .../RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c   | 8 +-------
 .../RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf | 8 +-------
 .../RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c         | 8 +-------
 .../RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf       | 8 +-------
 Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c  | 8 +-------
 .../RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf     | 8 +-------
 .../RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c | 8 +-------
 .../RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c            | 8 +-------
 .../RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c    | 8 +-------
 .../RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h    | 8 +-------
 .../RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c | 8 +-------
 .../Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf    | 9 +--------
 Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h       | 8 +-------
 .../RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h  | 8 +-------
 Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h | 8 +-------
 Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h  | 8 +-------
 .../RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c     | 8 +-------
 .../RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf   | 8 +-------
 .../RPi3/Library/PlatformBootManagerLib/PlatformBm.c     | 8 +-------
 .../RPi3/Library/PlatformBootManagerLib/PlatformBm.h     | 8 +-------
 .../PlatformBootManagerLib/PlatformBootManagerLib.inf    | 9 +--------
 .../RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S | 8 +-------
 .../RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf | 8 +-------
 .../RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c   | 8 +-------
 .../RPi3/Library/PlatformLib/RaspberryPiMem.c            | 8 +-------
 .../RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c     | 8 +-------
 Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c    | 8 +-------
 Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf  | 8 +-------
 Platform/RaspberryPi/RPi3/RPi3.dec                       | 9 +--------
 Platform/RaspberryPi/RPi3/RPi3.dsc                       | 9 +--------
 Platform/RaspberryPi/RPi3/RPi3.fdf                       | 9 +--------
 82 files changed, 82 insertions(+), 581 deletions(-)

diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
index be28b6dece..958af026c8 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
@@ -5,13 +5,7 @@
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
index 62de9c0720..7ef41e79ad 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
@@ -5,13 +5,7 @@
 #  Copyright (c) 2017, Andrey Warkentin <andrey.warkentin@gmail.com>
 #  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc
index 1b593bd29c..3b617c0a83 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc
@@ -4,13 +4,7 @@
  *
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc
index dc2d2dfb28..9315f23e0d 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc
@@ -4,13 +4,7 @@
  *
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
index be2c4db7cc..ab4d4bf485 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
@@ -5,13 +5,7 @@
  *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
index eb1873993c..3ef877fde5 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
@@ -5,13 +5,7 @@
  *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
index 611eed2881..6551315a55 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
@@ -5,13 +5,7 @@
  *
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
index 69c96273f5..39cd4c5cee 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
@@ -5,13 +5,7 @@
  *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl
index c0c5fca4c3..2ddb27bcdb 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl
@@ -5,13 +5,7 @@
  *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c
index bf96178a7c..51db779d79 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c
@@ -5,13 +5,7 @@
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h
index 08fee8ce57..f5f04518de 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h
@@ -5,13 +5,7 @@
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl
index b2127c02e9..0971e13ee0 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl
@@ -5,13 +5,7 @@
  *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
index e912b16c5f..0d42db30ae 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
@@ -5,13 +5,7 @@
  *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl
index c5a5f6e0af..2e6a373237 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl
@@ -4,13 +4,7 @@
  *
  *  Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
index 26fcef1317..a0067c82c6 100644
--- a/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
+++ b/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
@@ -5,13 +5,7 @@
  *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
index 828b40f82a..6d706af6f2 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
index d1a3f014b4..6cd600f738 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
@@ -2,13 +2,7 @@
  *
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
index 1e36221944..3da379b99b 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
@@ -3,13 +3,7 @@
 #  Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
 #  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c
index b78d7deae4..d64e70adce 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c
@@ -2,13 +2,7 @@
  *
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf
index 68eaec25ab..3fee190ac4 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf
@@ -2,14 +2,7 @@
 #
 #  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
index b29ae3a424..30f9b905c4 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
@@ -2,13 +2,7 @@
  *
  *  Copyright (c) 2018 Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni
index bf09261d5e..a9c1014330 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni
+++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni
@@ -2,13 +2,7 @@
  *
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr
index d3d98acc2e..7a18245258 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr
+++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr
@@ -2,13 +2,7 @@
  *
  *  Copyright (c) 2018 Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c
index 9a84aea511..092230cd7c 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  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/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c
index 0e99194e85..9475a5ad67 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h
index 48a049de31..bfbe9e8688 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h
@@ -3,13 +3,7 @@
  *  Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf
index 2e716ff779..652f6827f3 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf
@@ -5,13 +5,7 @@
 #  Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
 #  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c
index a5d32d59c3..5f31c64bbf 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c
index 056debb7c5..2f3c53323b 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c
@@ -2,13 +2,7 @@
  *
  *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c
index 05aa133fa0..7f78179d4c 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c
@@ -2,13 +2,7 @@
  *
  *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
index 8905a4d18f..59120b9d85 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) 2015-2016, Linaro Limited. 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/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
index 673d8d3406..106e542535 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
@@ -3,13 +3,7 @@
  *  Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) 2015-2016, Linaro Limited. 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/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
index 5ae730ccaa..6eaca35aef 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
@@ -3,13 +3,7 @@
 #  Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
 #  Copyright (c) 2015-2016, Linaro Limited. 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/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h
index d92bb2d3fd..88fd93934f 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h
@@ -3,13 +3,7 @@
  *  Copyright (c) 2017, Andrey Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) 2015-2016, Linaro Limited. 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/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
index eb5698cb50..83446e3e45 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2017, Andrey Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) 2016, Linaro, Ltd. 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
  *
  **/
 #include <PiDxe.h>
diff --git a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf
index d93a18019d..5b0b1a09f3 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf
@@ -3,13 +3,7 @@
 #  Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
 #  Copyright (c) 2016, Linaro, Ltd. 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/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c
index 3ae639ad3d..6a094bfeda 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  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/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
index 246f4ad52b..5e15b59e7c 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  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/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
index ba93cab86b..62980fd03d 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
@@ -3,13 +3,7 @@
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  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/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
index 11c1a3ae0e..51d1eed12e 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
@@ -3,14 +3,7 @@
 #  Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
 #  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
index 0957c5795f..a7d8b8431a 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
+++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
@@ -3,13 +3,7 @@
  *  Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
index 9aa9af4de6..b849a6b99d 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
+++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
@@ -3,13 +3,7 @@
  *  Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c
index c4840a6637..87a949b25c 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c
@@ -2,13 +2,7 @@
  *
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c
index 034da778ca..07d762c5ac 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c
@@ -4,13 +4,7 @@
  *
  *  Copyright (c) 2011, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c
index c019a85b48..58f1e25199 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c
@@ -4,13 +4,7 @@
  *
  *  Copyright (c) 2011-2014, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c
index 1d75276b80..c3c7279e47 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c
@@ -4,13 +4,7 @@
  *
  *  Copyright (c) 2011-2013, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h
index f6a5a99928..28a890b048 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h
@@ -4,13 +4,7 @@
  *
  *  Copyright (c) 2011-2015, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c
index ede814dfa2..29a9fd7df6 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c
@@ -2,13 +2,7 @@
  *
  *  Copyright (c) 2011-2015, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c
index c0af5f6e8d..22209fcaca 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c
@@ -2,13 +2,7 @@
  *
  *  Copyright (c) 2011-2013, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf
index c8e7fbf39c..2c71bb6243 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf
@@ -3,13 +3,7 @@
 #  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
 #  Copyright (c) 2011-2015, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c
index e9b8124d3a..4ee5c5ca6f 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c
@@ -2,13 +2,7 @@
  *
  *  Copyright (c) 2011-2015, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
index 7707763e43..bc35175279 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
@@ -21,13 +21,7 @@
  *  Copyright (c) 2012, Apple Inc. All rights reserved.<BR>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
index 4ae41c0382..f7c74f7f54 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
@@ -6,13 +6,7 @@
 #  Copyright (c) Microsoft Corporation. All rights reserved.
 #  Copyright (c) 2013 Linaro.org
 #
-#  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/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
index d330e45fdc..925f5a9212 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) 2016, Linaro, Ltd. 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/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
index 45af4d08b2..bba0007076 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
@@ -3,13 +3,7 @@
 #  Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
 #  Copyright (c) 2016, Linaro, Ltd. 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/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c
index 3bf789f96b..2f31c5eb8c 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf
index 49d25a8415..4a950dc05d 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf
@@ -3,13 +3,7 @@
 #  Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
 #  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c
index 0e8cd516f6..3bcd79428a 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) 2007-2009, 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/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c
index 14341def4c..0e0c108dba 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  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/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c
index 7ff5bd7a74..572309439a 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  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/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h
index 3596c4ac55..b65c26453d 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h
+++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h
@@ -3,13 +3,7 @@
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) 2007-2009, 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/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
index 3c6ede74c2..07f3f1c242 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
+++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
@@ -4,13 +4,7 @@
  *  Copyright (C) 2015, Red Hat, Inc.
  *  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/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
index f440e4eee8..8f99528f89 100644
--- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
+++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
@@ -6,14 +6,7 @@
 #  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
 #  Copyright (c) 2006-2013, 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/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h b/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h
index ac57960e04..4882aad6d9 100644
--- a/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h
+++ b/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h
@@ -3,13 +3,7 @@
  *  Copyright (c) 2015-2016, Linaro. All rights reserved.
  *  Copyright (c) 2015-2016, Hisilicon Limited. 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/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h b/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h
index f79cd8589f..0c57e438f1 100644
--- a/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h
+++ b/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h
@@ -2,13 +2,7 @@
  *
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h
index 7583d7e1fc..f3e3d1e99e 100644
--- a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h
+++ b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h
@@ -2,13 +2,7 @@
  *
  *  Copyright (c) 2016, Linaro Limited. 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/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h
index 2c0c7e0cdc..c558e00bf5 100644
--- a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h
+++ b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h
@@ -3,13 +3,7 @@
  *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) 2011-2014, ARM Limited. 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/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
index 903364e08b..60cf397f8b 100644
--- a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
+++ b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) 2011-2015, ARM Limited. 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/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
index 8e44f2e394..0084c01093 100644
--- a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
+++ b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
@@ -3,13 +3,7 @@
 #  Copyright (c) 2016, Linaro, Ltd. All rights reserved.
 #  Copyright (c) 2011-2014, ARM Ltd. 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/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
index 9bbe0db649..92f3b6146d 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
@@ -7,13 +7,7 @@
  *  Copyright (c) 2014, ARM Ltd. All rights reserved.
  *  Copyright (c) 2004-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/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h
index 3717ba6174..8408c7fb52 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h
@@ -6,13 +6,7 @@
  *  Copyright (c) 2014, ARM Ltd. All rights reserved.
  *  Copyright (c) 2004-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/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index b30772d5a1..7ce3e95c80 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -6,14 +6,7 @@
 #  Copyright (c) 2014, ARM Ltd. All rights reserved.
 #  Copyright (c) 2007-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/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S b/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S
index 9638259700..36af208d12 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S
@@ -3,13 +3,7 @@
  *  Copyright (c) 2016, Linaro Limited. All rights reserved.
  *  Copyright (c) 2011-2013, ARM Limited. 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/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf b/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf
index a4506888f1..5c1f55e2df 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf
@@ -4,13 +4,7 @@
 #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
 #  Copyright (c) 2011-2014, ARM Limited. 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/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c
index 758ebda844..f032f3c792 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c
@@ -5,13 +5,7 @@
  *  Copyright (c) 2011-2013, ARM Limited. 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/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c
index 6d7c044982..97d5af5260 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c
@@ -3,13 +3,7 @@
  *  Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
  *  Copyright (c) 2014, Linaro Limited. 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/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c b/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c
index 3f8521a351..1bd2b83f8e 100644
--- a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c
+++ b/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c
@@ -2,13 +2,7 @@
  *
  *  Copyright (c) 2019, Andrey Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c
index 465bb8babf..c62a92321e 100644
--- a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c
+++ b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c
@@ -8,13 +8,7 @@
  *  Copyright (c) 2013-2015, ARM Ltd. All rights reserved.
  *  Copyright (c) 2008-2009, Apple Inc. 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/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf
index 31ec5a3c17..f58020bf91 100644
--- a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf
+++ b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf
@@ -8,13 +8,7 @@
 #  Copyright (c) 2014, ARM Ltd. All rights reserved.
 #  Copyright (c) 2008, Apple Inc. 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/Platform/RaspberryPi/RPi3/RPi3.dec b/Platform/RaspberryPi/RPi3/RPi3.dec
index 2ca7e746a6..ab37882378 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dec
+++ b/Platform/RaspberryPi/RPi3/RPi3.dec
@@ -3,14 +3,7 @@
 #  Copyright (c) 2016, Linaro, Ltd. All rights reserved.
 #  Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
index dcdfa10290..53b87ba4e5 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.dsc
+++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
@@ -5,14 +5,7 @@
 #  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
 #  Copyright (c) 2017 - 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf
index 85f2187545..cf4b99a5e9 100644
--- a/Platform/RaspberryPi/RPi3/RPi3.fdf
+++ b/Platform/RaspberryPi/RPi3/RPi3.fdf
@@ -5,14 +5,7 @@
 #  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
 #  Copyright (c) 2017 - 2018, Andrei Warkentin <andrey.warkentin@gmail.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
 #
 ##
 
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40728): https://edk2.groups.io/g/devel/message/40728
Mute This Topic: https://groups.io/mt/31635486/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [[edk2-platforms][PATCH V2] 15/30] Platform/RaspberryPi: Replace BSD License with BSD+Patent License
Posted by Leif Lindholm 4 years, 11 months ago 
On Wed, May 15, 2019 at 04:09:56PM -0700, Michael D Kinney wrote:
> 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

This excludes the (presumably unintentionally, clarification being
sought with original author) unlicensed file:
Platform\RaspberryPi\RPi3\Library\PlatformUiAppLib\PlatformUiAppLib.inf

This would be wort mentioning in the commit message unless the
situation is resolved before the series is pushed.

It also excludes the 3-clause BSD licensed file
Platform\RaspberryPi\RPi3\Include\IndustryStandard\RpiMbox.h
based on work from Ard who suggests that was unintentional.

Ard: can you confirm for the list that this was always intended to be
2-clause?

Regards,

Leif

> Cc: Leif Lindholm <leif.lindholm@linaro.org>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h        | 8 +-------
>  Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf      | 8 +-------
>  Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc           | 8 +-------
>  Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc           | 8 +-------
>  Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl            | 8 +-------
>  Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc           | 8 +-------
>  Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc           | 8 +-------
>  Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc           | 8 +-------
>  Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl             | 8 +-------
>  Platform/RaspberryPi/RPi3/AcpiTables/Pep.c               | 8 +-------
>  Platform/RaspberryPi/RPi3/AcpiTables/Pep.h               | 8 +-------
>  Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl            | 8 +-------
>  Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl            | 8 +-------
>  Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl            | 8 +-------
>  Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl            | 8 +-------
>  .../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c     | 8 +-------
>  .../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h     | 8 +-------
>  .../RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf   | 8 +-------
>  Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c  | 8 +-------
>  .../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf     | 9 +--------
>  .../RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h        | 8 +-------
>  .../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni  | 8 +-------
>  .../RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr  | 8 +-------
>  .../RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c  | 8 +-------
>  .../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c     | 8 +-------
>  .../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h     | 8 +-------
>  .../RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf   | 8 +-------
>  .../RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c     | 8 +-------
>  .../RPi3/Drivers/DwUsbHostDxe/ComponentName.c            | 8 +-------
>  .../RPi3/Drivers/DwUsbHostDxe/DriverBinding.c            | 8 +-------
>  .../RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c | 8 +-------
>  .../RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h | 8 +-------
>  .../RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf           | 8 +-------
>  Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h   | 8 +-------
>  Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c        | 8 +-------
>  Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf      | 8 +-------
>  .../RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c      | 8 +-------
>  .../RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c    | 8 +-------
>  .../RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h    | 8 +-------
>  .../Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf    | 9 +--------
>  .../Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni    | 8 +-------
>  .../GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni       | 8 +-------
>  .../RPi3/Drivers/GraphicsConsoleDxe/NewFont.c            | 8 +-------
>  Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c | 8 +-------
>  Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c   | 8 +-------
>  Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c           | 8 +-------
>  Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h           | 8 +-------
>  Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c    | 8 +-------
>  Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c      | 8 +-------
>  Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf      | 8 +-------
>  .../RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c  | 8 +-------
>  .../RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c   | 8 +-------
>  .../RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf | 8 +-------
>  .../RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c         | 8 +-------
>  .../RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf       | 8 +-------
>  Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c  | 8 +-------
>  .../RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf     | 8 +-------
>  .../RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c | 8 +-------
>  .../RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c            | 8 +-------
>  .../RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c    | 8 +-------
>  .../RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h    | 8 +-------
>  .../RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c | 8 +-------
>  .../Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf    | 9 +--------
>  Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h       | 8 +-------
>  .../RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h  | 8 +-------
>  Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h | 8 +-------
>  Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h  | 8 +-------
>  .../RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c     | 8 +-------
>  .../RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf   | 8 +-------
>  .../RPi3/Library/PlatformBootManagerLib/PlatformBm.c     | 8 +-------
>  .../RPi3/Library/PlatformBootManagerLib/PlatformBm.h     | 8 +-------
>  .../PlatformBootManagerLib/PlatformBootManagerLib.inf    | 9 +--------
>  .../RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S | 8 +-------
>  .../RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf | 8 +-------
>  .../RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c   | 8 +-------
>  .../RPi3/Library/PlatformLib/RaspberryPiMem.c            | 8 +-------
>  .../RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c     | 8 +-------
>  Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c    | 8 +-------
>  Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf  | 8 +-------
>  Platform/RaspberryPi/RPi3/RPi3.dec                       | 9 +--------
>  Platform/RaspberryPi/RPi3/RPi3.dsc                       | 9 +--------
>  Platform/RaspberryPi/RPi3/RPi3.fdf                       | 9 +--------
>  82 files changed, 82 insertions(+), 581 deletions(-)
> 
> diff --git a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
> index be28b6dece..958af026c8 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.h
> @@ -5,13 +5,7 @@
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
> index 62de9c0720..7ef41e79ad 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/AcpiTables.inf
> @@ -5,13 +5,7 @@
>  #  Copyright (c) 2017, Andrey Warkentin <andrey.warkentin@gmail.com>
>  #  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc
> index 1b593bd29c..3b617c0a83 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Csrt.aslc
> @@ -4,13 +4,7 @@
>   *
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc
> index dc2d2dfb28..9315f23e0d 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Dbg2.aslc
> @@ -4,13 +4,7 @@
>   *
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
> index be2c4db7cc..ab4d4bf485 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Dsdt.asl
> @@ -5,13 +5,7 @@
>   *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
> index eb1873993c..3ef877fde5 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Fadt.aslc
> @@ -5,13 +5,7 @@
>   *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
> index 611eed2881..6551315a55 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Gtdt.aslc
> @@ -5,13 +5,7 @@
>   *
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc b/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
> index 69c96273f5..39cd4c5cee 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Madt.aslc
> @@ -5,13 +5,7 @@
>   *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl
> index c0c5fca4c3..2ddb27bcdb 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.asl
> @@ -5,13 +5,7 @@
>   *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c
> index bf96178a7c..51db779d79 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.c
> @@ -5,13 +5,7 @@
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h
> index 08fee8ce57..f5f04518de 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Pep.h
> @@ -5,13 +5,7 @@
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl
> index b2127c02e9..0971e13ee0 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Rhpx.asl
> @@ -5,13 +5,7 @@
>   *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
> index e912b16c5f..0d42db30ae 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Sdhc.asl
> @@ -5,13 +5,7 @@
>   *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl
> index c5a5f6e0af..2e6a373237 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Spcr.asl
> @@ -4,13 +4,7 @@
>   *
>   *  Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl b/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
> index 26fcef1317..a0067c82c6 100644
> --- a/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
> +++ b/Platform/RaspberryPi/RPi3/AcpiTables/Uart.asl
> @@ -5,13 +5,7 @@
>   *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
> index 828b40f82a..6d706af6f2 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
> index d1a3f014b4..6cd600f738 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.h
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
> index 1e36221944..3da379b99b 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ArasanMmcHostDxe/ArasanMmcHostDxe.inf
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
>  #  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c
> index b78d7deae4..d64e70adce 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.c
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf
> index 68eaec25ab..3fee190ac4 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxe.inf
> @@ -2,14 +2,7 @@
>  #
>  #  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
> index b29ae3a424..30f9b905c4 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeFormSetGuid.h
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) 2018 Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni
> index bf09261d5e..a9c1014330 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.uni
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr
> index d3d98acc2e..7a18245258 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr
> +++ b/Platform/RaspberryPi/RPi3/Drivers/ConfigDxe/ConfigDxeHii.vfr
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) 2018 Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c
> index 9a84aea511..092230cd7c 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/ComponentName.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  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/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c
> index 0e99194e85..9475a5ad67 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h
> index 48a049de31..bfbe9e8688 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.h
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf
> index 2e716ff779..652f6827f3 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/DisplayDxe.inf
> @@ -5,13 +5,7 @@
>  #  Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
>  #  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c
> index a5d32d59c3..5f31c64bbf 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DisplayDxe/Screenshot.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2006 - 2016, Intel Corporation. All rights reserved.
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c
> index 056debb7c5..2f3c53323b 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/ComponentName.c
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c
> index 05aa133fa0..7f78179d4c 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DriverBinding.c
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) 2018, Andrey Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
> index 8905a4d18f..59120b9d85 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) 2015-2016, Linaro Limited. 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/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
> index 673d8d3406..106e542535 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.h
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) 2015-2016, Linaro Limited. 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/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
> index 5ae730ccaa..6eaca35aef 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwUsbHostDxe.inf
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>  #  Copyright (c) 2015-2016, Linaro Limited. 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/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h
> index d92bb2d3fd..88fd93934f 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/DwUsbHostDxe/DwcHw.h
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2017, Andrey Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) 2015-2016, Linaro Limited. 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/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
> index eb5698cb50..83446e3e45 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2017, Andrey Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) 2016, Linaro, Ltd. 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
>   *
>   **/
>  #include <PiDxe.h>
> diff --git a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf
> index d93a18019d..5b0b1a09f3 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/FdtDxe/FdtDxe.inf
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
>  #  Copyright (c) 2016, Linaro, Ltd. 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/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c
> index 3ae639ad3d..6a094bfeda 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/ComponentName.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  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/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
> index 246f4ad52b..5e15b59e7c 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  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/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
> index ba93cab86b..62980fd03d 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsole.h
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  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/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
> index 11c1a3ae0e..51d1eed12e 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.inf
> @@ -3,14 +3,7 @@
>  #  Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
>  #  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
> index 0957c5795f..a7d8b8431a 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
> +++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxe.uni
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
> index 9aa9af4de6..b849a6b99d 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
> +++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/GraphicsConsoleDxeExtra.uni
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2006-2014, Intel Corporation. All rights reserved.
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c
> index c4840a6637..87a949b25c 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/GraphicsConsoleDxe/NewFont.c
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c
> index 034da778ca..07d762c5ac 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/ComponentName.c
> @@ -4,13 +4,7 @@
>   *
>   *  Copyright (c) 2011, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c
> index c019a85b48..58f1e25199 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Diagnostics.c
> @@ -4,13 +4,7 @@
>   *
>   *  Copyright (c) 2011-2014, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c
> index 1d75276b80..c3c7279e47 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.c
> @@ -4,13 +4,7 @@
>   *
>   *  Copyright (c) 2011-2013, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h
> index f6a5a99928..28a890b048 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/Mmc.h
> @@ -4,13 +4,7 @@
>   *
>   *  Copyright (c) 2011-2015, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c
> index ede814dfa2..29a9fd7df6 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcBlockIo.c
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) 2011-2015, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c
> index c0af5f6e8d..22209fcaca 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDebug.c
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) 2011-2013, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf
> index c8e7fbf39c..2c71bb6243 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcDxe.inf
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>  #  Copyright (c) 2011-2015, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c
> index e9b8124d3a..4ee5c5ca6f 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/MmcDxe/MmcIdentification.c
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) 2011-2015, ARM Limited. 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/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
> index 7707763e43..bc35175279 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
> @@ -21,13 +21,7 @@
>   *  Copyright (c) 2012, Apple Inc. All rights reserved.<BR>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
> index 4ae41c0382..f7c74f7f54 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.inf
> @@ -6,13 +6,7 @@
>  #  Copyright (c) Microsoft Corporation. All rights reserved.
>  #  Copyright (c) 2013 Linaro.org
>  #
> -#  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/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
> index d330e45fdc..925f5a9212 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) 2016, Linaro, Ltd. 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/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
> index 45af4d08b2..bba0007076 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/RpiFirmwareDxe/RpiFirmwareDxe.inf
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>  #  Copyright (c) 2016, Linaro, Ltd. 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/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c
> index 3bf789f96b..2f31c5eb8c 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf
> index 49d25a8415..4a950dc05d 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/SdHostDxe/SdHostDxe.inf
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2017, Andrei Warkentin <andrey.warkentin@gmail.com>
>  #  Copyright (c) Microsoft 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/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c
> index 0e8cd516f6..3bcd79428a 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FileIo.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) 2007-2009, 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/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c
> index 14341def4c..0e0c108dba 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/FvbInfo.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  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/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c
> index 7ff5bd7a74..572309439a 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  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/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h
> index 3596c4ac55..b65c26453d 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h
> +++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockService.h
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) 2007-2009, 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/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
> index 3c6ede74c2..07f3f1c242 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
> +++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.c
> @@ -4,13 +4,7 @@
>   *  Copyright (C) 2015, Red Hat, Inc.
>   *  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/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
> index f440e4eee8..8f99528f89 100644
> --- a/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
> +++ b/Platform/RaspberryPi/RPi3/Drivers/VarBlockServiceDxe/VarBlockServiceDxe.inf
> @@ -6,14 +6,7 @@
>  #  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>  #  Copyright (c) 2006-2013, 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/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h b/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h
> index ac57960e04..4882aad6d9 100644
> --- a/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h
> +++ b/Platform/RaspberryPi/RPi3/Include/Protocol/DwUsb.h
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2015-2016, Linaro. All rights reserved.
>   *  Copyright (c) 2015-2016, Hisilicon Limited. 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/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h b/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h
> index f79cd8589f..0c57e438f1 100644
> --- a/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h
> +++ b/Platform/RaspberryPi/RPi3/Include/Protocol/ExtendedTextOut.h
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h
> index 7583d7e1fc..f3e3d1e99e 100644
> --- a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h
> +++ b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiFirmware.h
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) 2016, Linaro Limited. 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/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h
> index 2c0c7e0cdc..c558e00bf5 100644
> --- a/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h
> +++ b/Platform/RaspberryPi/RPi3/Include/Protocol/RpiMmcHost.h
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2018, Andrei Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) 2011-2014, ARM Limited. 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/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
> index 903364e08b..60cf397f8b 100644
> --- a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
> +++ b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) 2011-2015, ARM Limited. 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/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
> index 8e44f2e394..0084c01093 100644
> --- a/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
> +++ b/Platform/RaspberryPi/RPi3/Library/MemoryInitPeiLib/MemoryInitPeiLib.inf
> @@ -3,13 +3,7 @@
>  #  Copyright (c) 2016, Linaro, Ltd. All rights reserved.
>  #  Copyright (c) 2011-2014, ARM Ltd. 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/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
> index 9bbe0db649..92f3b6146d 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.c
> @@ -7,13 +7,7 @@
>   *  Copyright (c) 2014, ARM Ltd. All rights reserved.
>   *  Copyright (c) 2004-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/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h
> index 3717ba6174..8408c7fb52 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBm.h
> @@ -6,13 +6,7 @@
>   *  Copyright (c) 2014, ARM Ltd. All rights reserved.
>   *  Copyright (c) 2004-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/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> index b30772d5a1..7ce3e95c80 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> @@ -6,14 +6,7 @@
>  #  Copyright (c) 2014, ARM Ltd. All rights reserved.
>  #  Copyright (c) 2007-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/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S b/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S
> index 9638259700..36af208d12 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/AArch64/RaspberryPiHelper.S
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2016, Linaro Limited. All rights reserved.
>   *  Copyright (c) 2011-2013, ARM Limited. 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/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf b/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf
> index a4506888f1..5c1f55e2df 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/PlatformLib.inf
> @@ -4,13 +4,7 @@
>  #  Copyright (c) 2014-2016, Linaro Limited. All rights reserved.
>  #  Copyright (c) 2011-2014, ARM Limited. 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/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c
> index 758ebda844..f032f3c792 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPi.c
> @@ -5,13 +5,7 @@
>   *  Copyright (c) 2011-2013, ARM Limited. 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/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c
> index 6d7c044982..97d5af5260 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformLib/RaspberryPiMem.c
> @@ -3,13 +3,7 @@
>   *  Copyright (c) 2017-2018, Andrey Warkentin <andrey.warkentin@gmail.com>
>   *  Copyright (c) 2014, Linaro Limited. 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/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c b/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c
> index 3f8521a351..1bd2b83f8e 100644
> --- a/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c
> +++ b/Platform/RaspberryPi/RPi3/Library/PlatformUiAppLib/PlatformUiAppLib.c
> @@ -2,13 +2,7 @@
>   *
>   *  Copyright (c) 2019, Andrey Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c
> index 465bb8babf..c62a92321e 100644
> --- a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c
> +++ b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.c
> @@ -8,13 +8,7 @@
>   *  Copyright (c) 2013-2015, ARM Ltd. All rights reserved.
>   *  Copyright (c) 2008-2009, Apple Inc. 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/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf
> index 31ec5a3c17..f58020bf91 100644
> --- a/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf
> +++ b/Platform/RaspberryPi/RPi3/Library/ResetLib/ResetLib.inf
> @@ -8,13 +8,7 @@
>  #  Copyright (c) 2014, ARM Ltd. All rights reserved.
>  #  Copyright (c) 2008, Apple Inc. 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/Platform/RaspberryPi/RPi3/RPi3.dec b/Platform/RaspberryPi/RPi3/RPi3.dec
> index 2ca7e746a6..ab37882378 100644
> --- a/Platform/RaspberryPi/RPi3/RPi3.dec
> +++ b/Platform/RaspberryPi/RPi3/RPi3.dec
> @@ -3,14 +3,7 @@
>  #  Copyright (c) 2016, Linaro, Ltd. All rights reserved.
>  #  Copyright (c) 2017-2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3/RPi3.dsc
> index dcdfa10290..53b87ba4e5 100644
> --- a/Platform/RaspberryPi/RPi3/RPi3.dsc
> +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc
> @@ -5,14 +5,7 @@
>  #  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
>  #  Copyright (c) 2017 - 2018, Andrei Warkentin <andrey.warkentin@gmail.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/Platform/RaspberryPi/RPi3/RPi3.fdf b/Platform/RaspberryPi/RPi3/RPi3.fdf
> index 85f2187545..cf4b99a5e9 100644
> --- a/Platform/RaspberryPi/RPi3/RPi3.fdf
> +++ b/Platform/RaspberryPi/RPi3/RPi3.fdf
> @@ -5,14 +5,7 @@
>  #  Copyright (c) 2015 - 2016, Intel Corporation. All rights reserved.
>  #  Copyright (c) 2017 - 2018, Andrei Warkentin <andrey.warkentin@gmail.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
>  #
>  ##
>  
> -- 
> 2.21.0.windows.1
> 
> 
> 
> 

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40907): https://edk2.groups.io/g/devel/message/40907
Mute This Topic: https://groups.io/mt/31635486/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [[edk2-platforms][PATCH V2] 15/30] Platform/RaspberryPi: Replace BSD License with BSD+Patent License
Posted by Ard Biesheuvel 4 years, 11 months ago 
On Fri, 17 May 2019 at 13:07, Leif Lindholm <leif.lindholm@linaro.org> wrote:
>
> On Wed, May 15, 2019 at 04:09:56PM -0700, Michael D Kinney wrote:
> > 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
>
> This excludes the (presumably unintentionally, clarification being
> sought with original author) unlicensed file:
> Platform\RaspberryPi\RPi3\Library\PlatformUiAppLib\PlatformUiAppLib.inf
>
> This would be wort mentioning in the commit message unless the
> situation is resolved before the series is pushed.
>
> It also excludes the 3-clause BSD licensed file
> Platform\RaspberryPi\RPi3\Include\IndustryStandard\RpiMbox.h
> based on work from Ard who suggests that was unintentional.
>
> Ard: can you confirm for the list that this was always intended to be
> 2-clause?
>

Indeed - I inadvertently copy/pasted a version of the license header
from another file that included the ARM non-endorsement clause, but
the intention was to use 2-clause BSD.

-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40909): https://edk2.groups.io/g/devel/message/40909
Mute This Topic: https://groups.io/mt/31635486/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.