From mboxrd@z Thu Jan  1 00:00:00 1970
Authentication-Results: mx.groups.io;
 dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: michael.a.kubacki@intel.com)
Received: from mga04.intel.com (mga04.intel.com [192.55.52.120])
 by groups.io with SMTP; Thu, 16 May 2019 23:52:52 -0700
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga005.jf.intel.com ([10.7.209.41])
  by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 May 2019 23:52:51 -0700
X-ExtLoop1: 1
Received: from orsmsx105.amr.corp.intel.com ([10.22.225.132])
  by orsmga005.jf.intel.com with ESMTP; 16 May 2019 23:52:51 -0700
Received: from orsmsx163.amr.corp.intel.com (10.22.240.88) by
 ORSMSX105.amr.corp.intel.com (10.22.225.132) with Microsoft SMTP Server (TLS)
 id 14.3.408.0; Thu, 16 May 2019 23:52:50 -0700
Received: from orsmsx121.amr.corp.intel.com ([169.254.10.47]) by
 ORSMSX163.amr.corp.intel.com ([169.254.9.150]) with mapi id 14.03.0415.000;
 Thu, 16 May 2019 23:52:50 -0700
From: "Kubacki, Michael A" <michael.a.kubacki@intel.com>
To: "Kinney, Michael D" <michael.d.kinney@intel.com>, "devel@edk2.groups.io"
	<devel@edk2.groups.io>
CC: "Chiu, Chasel" <chasel.chiu@intel.com>
Subject: Re: [[edk2-platforms][PATCH V2] 11/30] Platform/Intel/MinPlatformPkg: Replace BSD License with BSD+Patent License
Thread-Topic: [[edk2-platforms][PATCH V2] 11/30]
 Platform/Intel/MinPlatformPkg: Replace BSD License with BSD+Patent License
Thread-Index: AQHVC3NqXPUL32kFI0a9TuxCbT4kgKZu41UA
Date: Fri, 17 May 2019 06:52:49 +0000
Message-ID: <49AB4ACB9627B8468F29D589A27B74558894567C@ORSMSX121.amr.corp.intel.com>
References: <20190515231012.7488-1-michael.d.kinney@intel.com>
 <20190515231012.7488-12-michael.d.kinney@intel.com>
In-Reply-To: <20190515231012.7488-12-michael.d.kinney@intel.com>
Accept-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTk0MDg4YmUtYTY1NS00NDRjLTkxN2QtZDRiYTljMzE2YTU1IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiVWh2MGhsTnhNdzRlRm5lVjRhOU9BOE9JS0hHaFRERnNZR1hGbW5VUmROZGYybkJoMmJXRk91c1lXRzZWa1RNQSJ9
x-ctpclassification: CTP_NT
dlp-product: dlpe-windows
dlp-version: 11.0.600.7
dlp-reaction: no-action
x-originating-ip: [10.22.254.140]
MIME-Version: 1.0
Return-Path: michael.a.kubacki@intel.com
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable

Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>

> -----Original Message-----
> From: Kinney, Michael D
> Sent: Wednesday, May 15, 2019 4:10 PM
> To: devel@edk2.groups.io
> Cc: Kubacki, Michael A <michael.a.kubacki@intel.com>; Chiu, Chasel
> <chasel.chiu@intel.com>
> Subject: [[edk2-platforms][PATCH V2] 11/30]
> Platform/Intel/MinPlatformPkg: Replace BSD License with BSD+Patent
> License
>=20
> https://bugzilla.tianocore.org/show_bug.cgi?id=3D1373
>=20
> Replace BSD 2-Clause License with BSD+Patent License.  This change is
> based on the following emails:
>=20
>   https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
>   https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
>=20
> RFCs with detailed process for the license change:
>=20
>   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
>=20
> Cc: Michael Kubacki <michael.a.kubacki@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>  Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c     | 8 +-------
>  Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h     | 8 +-------
>  Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf   | 8 +-------
>  .../Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c  | 8 +-------
>  .../Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h  | 8 +-------
>  .../MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf      | 8 +-------
>  .../Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c     | 8 +-------
>  .../Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c     | 8 +-------
>  .../Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c     | 8 +-------
>  .../Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c     | 8 +-------
>  .../Acpi/Library/BoardAcpiLibNull/BoardAcpiEnableLib.c   | 8 +-------
>  .../Library/BoardAcpiLibNull/BoardAcpiEnableLibNull.inf  | 8 +-------
>  .../Acpi/Library/BoardAcpiLibNull/BoardAcpiTableLib.c    | 8 +-------
>  .../Library/BoardAcpiLibNull/BoardAcpiTableLibNull.inf   | 8 +-------
>  .../Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.c       | 8 +-------
>  .../Acpi/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf     | 8 +-------
>  .../MultiBoardAcpiSupportLib/DxeBoardAcpiTableLib.c      | 8 +-------
>  .../DxeMultiBoardAcpiSupportLib.c                        | 8 +-------
>  .../DxeMultiBoardAcpiSupportLib.inf                      | 8 +-------
>  .../MultiBoardAcpiSupportLib/SmmBoardAcpiEnableLib.c     | 8 +-------
>  .../SmmMultiBoardAcpiSupportLib.c                        | 8 +-------
>  .../SmmMultiBoardAcpiSupportLib.inf                      | 8 +-------
>  Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl   | 8 +-------
>  Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c     | 8 +-------
>  Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf   | 8 +-------
>  .../Bds/Library/DxePlatformBootManagerLib/BdsPlatform.c  | 8 +-------
>  .../Bds/Library/DxePlatformBootManagerLib/BdsPlatform.h  | 8 +-------
>  .../DxePlatformBootManagerLib.inf                        | 8 +-------
>  .../Bds/Library/DxePlatformBootManagerLib/MemoryTest.c   | 8 +-------
>  .../DxePlatformBootManagerLib/PlatformBootOption.c       | 8 +-------
>  .../SpiFlashCommonLibNull/SpiFlashCommonLibNull.c        | 8 +-------
>  .../SpiFlashCommonLibNull/SpiFlashCommonLibNull.inf      | 8 +-------
>  .../MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c  | 8 +-------
>  .../Flash/SpiFvbService/Common/SpiFvbServiceCommon.c     | 8 +-------
>  .../Flash/SpiFvbService/Common/SpiFvbServiceCommon.h     | 8 +-------
>  .../Flash/SpiFvbService/Smm/SpiFvbServiceSmm.c           | 8 +-------
>  .../Flash/SpiFvbService/SpiFvbServiceSmm.inf             | 8 +-------
>  .../DxeFspWrapperPlatformLib.inf                         | 8 +-------
>  .../DxeFspWrapperPlatformResetLib.c                      | 8 +-------
>  .../PeiFspWrapperHobProcessLib/FspWrapperHobProcessLib.c | 8 +-------
>  .../PeiFspWrapperHobProcessLib.inf                       | 8 +-------
>  .../PeiFspWrapperPlatformLib/PeiFspWrapperPlatformLib.c  | 8 +-------
>  .../PeiFspWrapperPlatformLib.inf                         | 8 +-------
>  .../PeiFspWrapperPlatformResetLib.c                      | 8 +-------
>  .../FspWrapperPlatformSecLib.c                           | 8 +-------
>  .../Library/SecFspWrapperPlatformSecLib/FsptCoreUpd.h    | 8 +-------
>  .../Library/SecFspWrapperPlatformSecLib/Ia32/Fsp.h       | 8 +-------
>  .../SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.S      | 8 +-------
>  .../SecFspWrapperPlatformSecLib/Ia32/PeiCoreEntry.asm    | 8 +-------
>  .../Library/SecFspWrapperPlatformSecLib/Ia32/SecEntry.S  | 8 +-------
>  .../SecFspWrapperPlatformSecLib/Ia32/SecEntry.asm        | 8 +-------
>  .../Library/SecFspWrapperPlatformSecLib/Ia32/Stack.S     | 8 +-------
>  .../Library/SecFspWrapperPlatformSecLib/Ia32/Stack.asm   | 8 +-------
>  .../Library/SecFspWrapperPlatformSecLib/PlatformInit.c   | 8 +-------
>  .../SecFspWrapperPlatformSecLib.inf                      | 8 +-------
>  .../SecFspWrapperPlatformSecLib/SecGetPerformance.c      | 8 +-------
>  .../SecFspWrapperPlatformSecLib/SecPlatformInformation.c | 8 +-------
>  .../Library/SecFspWrapperPlatformSecLib/SecRamInitData.c | 8 +-------
>  .../Library/SecFspWrapperPlatformSecLib/SecTempRamDone.c | 8 +-------
>  .../FspWrapper/SaveMemoryConfig/SaveMemoryConfig.c       | 8 +-------
>  .../FspWrapper/SaveMemoryConfig/SaveMemoryConfig.inf     | 8 +-------
>  .../HstiIbvPlatformDxe/ExternalDeviceDmaProtection.c     | 8 +-------
>  .../FirmwareTrustConfigurationCryptoStrength.c           | 8 +-------
>  .../FirmwareVersionRollbackProtection.c                  | 8 +-------
>  .../Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.c         | 8 +-------
>  .../Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.h         | 8 +-------
>  .../Hsti/HstiIbvPlatformDxe/HstiIbvPlatformDxe.inf       | 8 +-------
>  .../MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c  | 8 +-------
>  .../Hsti/HstiIbvPlatformDxe/NoTestKeyVerification.c      | 8 +-------
>  .../Hsti/HstiIbvPlatformDxe/SecureBootBypass.c           | 8 +-------
>  .../Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc   | 8 +-------
>  .../Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc  | 8 +-------
>  Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc | 8 +-------
>  .../Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc  | 8 +-------
>  Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc | 8 +-------
>  .../MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf     | 8 +-------
>  .../MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf | 8 +-------
>  .../MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf  | 8 +-------
>  .../Include/Fdf/CoreSecurityLateInclude.fdf              | 8 +-------
>  .../Include/Fdf/CoreSecurityPostMemoryInclude.fdf        | 8 +-------
>  .../Include/Fdf/CoreSecurityPreMemoryInclude.fdf         | 8 +-------
>  .../MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf   | 8 +-------
>  .../Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf     | 8 +-------
>  .../MinPlatformPkg/Include/Guid/SmramMemoryReserve.h     | 8 +-------
>  .../Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h     | 8 +-------
>  .../Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h  | 8 +-------
>  .../MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h  | 8 +-------
>  .../MinPlatformPkg/Include/Library/BoardAcpiTableLib.h   | 8 +-------
>  .../Intel/MinPlatformPkg/Include/Library/BoardInitLib.h  | 8 +-------
>  .../Intel/MinPlatformPkg/Include/Library/CompressLib.h   | 8 +-------
>  .../MinPlatformPkg/Include/Library/HobVariableLib.h      | 8 +-------
>  .../Include/Library/MultiBoardAcpiSupportLib.h           | 8 +-------
>  .../Include/Library/MultiBoardInitSupportLib.h           | 8 +-------
>  Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h   | 8 +-------
>  .../Intel/MinPlatformPkg/Include/Library/ReportFvLib.h   | 8 +-------
>  .../MinPlatformPkg/Include/Library/SecBoardInitLib.h     | 8 +-------
>  .../Include/Library/SiliconPolicyInitLib.h               | 8 +-------
>  .../Include/Library/SiliconPolicyUpdateLib.h             | 8 +-------
>  .../MinPlatformPkg/Include/Library/SpiFlashCommonLib.h   | 8 +-------
>  .../MinPlatformPkg/Include/Library/TestPointCheckLib.h   | 8 +-------
>  .../Intel/MinPlatformPkg/Include/Library/TestPointLib.h  | 8 +-------
>  .../Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h    | 8 +-------
>  .../MinPlatformPkg/Include/Ppi/PlatformMemorySize.h      | 8 +-------
>  .../MinPlatformPkg/Library/CompressLib/CompressLib.c     | 8 +-------
>  .../MinPlatformPkg/Library/CompressLib/CompressLib.inf   | 7 +------
>  .../MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h    | 8 +-------
>  .../Library/PeiHobVariableLibFce/InternalCommonLib.c     | 8 +-------
>  .../Library/PeiHobVariableLibFce/PeiHobVariableLibFce.c  | 8 +-------
>  .../PeiHobVariableLibFce/PeiHobVariableLibFce.inf        | 8 +-------
>  .../PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.c   | 8 +-------
>  .../PeiHobVariableLibFce/PeiHobVariableLibFceOptSize.inf | 8 +-------
>  .../Library/PeiHobVariableLibFce/Variable.h              | 8 +-------
>  Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c    | 8 +-------
>  Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf  | 8 +-------
>  Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec         | 8 +-------
>  Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc         | 8 +-------
>  .../PciHostBridgeLibSimple/PciHostBridgeLibSimple.c      | 8 +-------
>  .../PciHostBridgeLibSimple/PciHostBridgeLibSimple.inf    | 8 +-------
>  .../PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.c    | 9 +--------
>  .../PciSegmentInfoLibSimple/PciSegmentInfoLibSimple.inf  | 7 +------
>  .../PlatformInit/Library/BoardInitLibNull/BoardInitLib.c | 8 +-------
>  .../Library/BoardInitLibNull/BoardInitLibNull.inf        | 8 +-------
>  .../Library/MultiBoardInitSupportLib/DxeBoardInitLib.c   | 8 +-------
>  .../DxeMultiBoardInitSupportLib.c                        | 8 +-------
>  .../DxeMultiBoardInitSupportLib.inf                      | 8 +-------
>  .../Library/MultiBoardInitSupportLib/PeiBoardInitLib.c   | 8 +-------
>  .../PeiMultiBoardInitSupportLib.c                        | 8 +-------
>  .../PeiMultiBoardInitSupportLib.inf                      | 8 +-------
>  .../PlatformInit/Library/PeiReportFvLib/PeiReportFvLib.c | 8 +-------
>  .../Library/PeiReportFvLib/PeiReportFvLib.inf            | 8 +-------
>  .../Library/SecBoardInitLibNull/Ia32/SecBoardInit.nasm   | 8 +-------
>  .../Library/SecBoardInitLibNull/SecBoardInitLib.c        | 8 +-------
>  .../Library/SecBoardInitLibNull/SecBoardInitLibNull.inf  | 8 +-------
>  .../SiliconPolicyInitLibNull/SiliconPolicyInitLibNull.c  | 8 +-------
>  .../SiliconPolicyInitLibNull.inf                         | 8 +-------
>  .../SiliconPolicyUpdateLibNull.c                         | 8 +-------
>  .../SiliconPolicyUpdateLibNull.inf                       | 8 +-------
>  .../PlatformInit/PlatformInitDxe/PlatformInitDxe.c       | 8 +-------
>  .../PlatformInit/PlatformInitDxe/PlatformInitDxe.inf     | 8 +-------
>  .../PlatformInit/PlatformInitPei/PlatformInitPostMem.c   | 8 +-------
>  .../PlatformInit/PlatformInitPei/PlatformInitPostMem.inf | 8 +-------
>  .../PlatformInit/PlatformInitPei/PlatformInitPreMem.c    | 8 +-------
>  .../PlatformInit/PlatformInitPei/PlatformInitPreMem.inf  | 8 +-------
>  .../PlatformInit/PlatformInitSmm/PlatformInitSmm.c       | 8 +-------
>  .../PlatformInit/PlatformInitSmm/PlatformInitSmm.inf     | 8 +-------
>  .../MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c   | 8 +-------
>  .../MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf | 8 +-------
>  .../PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.c     | 8 +-------
>  .../PlatformInit/SiliconPolicyDxe/SiliconPolicyDxe.inf   | 8 +-------
>  .../SiliconPolicyPei/SiliconPolicyPeiPostMem.c           | 8 +-------
>  .../SiliconPolicyPei/SiliconPolicyPeiPostMem.inf         | 8 +-------
>  .../SiliconPolicyPei/SiliconPolicyPeiPreMem.c            | 8 +-------
>  .../SiliconPolicyPei/SiliconPolicyPeiPreMem.inf          | 8 +-------
>  .../Services/StallServicePei/StallServicePei.c           | 8 +-------
>  .../Services/StallServicePei/StallServicePei.inf         | 8 +-------
>  .../MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c | 8 +-------
>  .../Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.inf              | 8 +-------
>  .../MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c | 8 +-------
>  .../Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf              | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckAcpi.c        | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckAcpiDmar.c    | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckAcpiHpet.c    | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckAcpiMadt.c    | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckAcpiMcfg.c    | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckAcpiTpm.c     | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckAcpiWsmt.c    | 8 +-------
>  .../Library/TestPointCheckLib/DxeCheckBootVariable.c     | 8 +-------
>  .../Library/TestPointCheckLib/DxeCheckConsoleVariable.c  | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckDevicePath.c  | 8 +-------
>  .../Library/TestPointCheckLib/DxeCheckDmaProtection.c    | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckEsrt.c        | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckGcd.c         | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckHsti.c        | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckLoadedImage.c | 8 +-------
>  .../Library/TestPointCheckLib/DxeCheckMemoryAttribute.c  | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckMemoryMap.c   | 8 +-------
>  .../TestPointCheckLib/DxeCheckMemoryTypeInformation.c    | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckPci.c         | 8 +-------
>  .../Library/TestPointCheckLib/DxeCheckPiSignedFvBoot.c   | 8 +-------
>  .../TestPointCheckLib/DxeCheckSmiHandlerInstrument.c     | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckSmmInfo.c     | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckTcgMor.c      | 8 +-------
>  .../Library/TestPointCheckLib/DxeCheckTcgTrustedBoot.c   | 8 +-------
>  .../Library/TestPointCheckLib/DxeCheckUefiSecureBoot.c   | 8 +-------
>  .../Test/Library/TestPointCheckLib/DxeCheckVariable.c    | 8 +-------
>  .../Library/TestPointCheckLib/DxeTestPointCheckLib.c     | 8 +-------
>  .../Library/TestPointCheckLib/DxeTestPointCheckLib.inf   | 8 +-------
>  .../Library/TestPointCheckLib/PeiCheckDmaProtection.c    | 8 +-------
>  .../Test/Library/TestPointCheckLib/PeiCheckFvInfo.c      | 8 +-------
>  .../Test/Library/TestPointCheckLib/PeiCheckHob.c         | 8 +-------
>  .../Test/Library/TestPointCheckLib/PeiCheckMtrr.c        | 8 +-------
>  .../Test/Library/TestPointCheckLib/PeiCheckPci.c         | 8 +-------
>  .../Test/Library/TestPointCheckLib/PeiCheckSmmInfo.c     | 8 +-------
>  .../Library/TestPointCheckLib/PeiTestPointCheckLib.c     | 8 +-------
>  .../Library/TestPointCheckLib/PeiTestPointCheckLib.inf   | 8 +-------
>  .../Test/Library/TestPointCheckLib/SecCheckCpuInfo.c     | 8 +-------
>  .../Library/TestPointCheckLib/SecTestPointCheckLib.c     | 8 +-------
>  .../Library/TestPointCheckLib/SecTestPointCheckLib.inf   | 8 +-------
>  .../TestPointCheckLib/SmmCheckCommunicationBuffer.c      | 8 +-------
>  .../Test/Library/TestPointCheckLib/SmmCheckLoadedImage.c | 8 +-------
>  .../Library/TestPointCheckLib/SmmCheckMemoryAttribute.c  | 8 +-------
>  .../Test/Library/TestPointCheckLib/SmmCheckPaging.c      | 8 +-------
>  .../Test/Library/TestPointCheckLib/SmmCheckSmrr.c        | 8 +-------
>  .../Library/TestPointCheckLib/SmmTestPointCheckLib.c     | 8 +-------
>  .../Library/TestPointCheckLib/SmmTestPointCheckLib.inf   | 8 +-------
>  .../Test/Library/TestPointCheckLib/TestPointHelp.c       | 8 +-------
>  .../Test/Library/TestPointCheckLib/TestPointInternal.h   | 8 +-------
>  .../TestPointCheckLibNull/TestPointCheckLibNull.c        | 8 +-------
>  .../TestPointCheckLibNull/TestPointCheckLibNull.inf      | 8 +-------
>  .../Test/Library/TestPointLib/DxeTestPoint.c             | 8 +-------
>  .../Test/Library/TestPointLib/DxeTestPoint.h             | 8 +-------
>  .../Test/Library/TestPointLib/DxeTestPointAip.c          | 8 +-------
>  .../Test/Library/TestPointLib/DxeTestPointLib.inf        | 7 +------
>  .../Test/Library/TestPointLib/PeiTestPoint.c             | 8 +-------
>  .../Test/Library/TestPointLib/PeiTestPoint.h             | 8 +-------
>  .../Test/Library/TestPointLib/PeiTestPointLib.inf        | 7 +------
>  .../Test/Library/TestPointLib/SmmTestPoint.c             | 8 +-------
>  .../Test/Library/TestPointLib/SmmTestPoint.h             | 8 +-------
>  .../Test/Library/TestPointLib/SmmTestPointAip.c          | 8 +-------
>  .../Library/TestPointLib/SmmTestPointCommunication.c     | 8 +-------
>  .../Test/Library/TestPointLib/SmmTestPointLib.inf        | 7 +------
>  .../MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c | 8 +-------
>  .../Test/TestPointDumpApp/TestPointDumpApp.inf           | 8 +-------
>  .../Test/TestPointStubDxe/TestPointStubDxe.c             | 8 +-------
>  .../Test/TestPointStubDxe/TestPointStubDxe.inf           | 8 +-------
>  .../MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py    | 8 +-------
>  .../Tools/Fsp/PatchFspBinFvsBaseAddress.py               | 8 +-------
>  .../Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py     | 8 +-------
>  Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py | 8 +-------
>  Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py  | 8 +-------
>  .../Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py     | 8 +-------
>  .../Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py    | 8 +-------
>  .../Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py   | 8 +-------
>  233 files changed, 233 insertions(+), 1627 deletions(-)
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
> index 74c1678bc8..809f75d3c5 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.c
> @@ -2,13 +2,7 @@
>    Acpi Smm driver.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
> index a34d87250f..e34ffb1b75 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.h
> @@ -2,13 +2,7 @@
>    Header file for the Smm platform driver.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
> index 8675a45b7a..fbaf467525 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiSmm/AcpiSmm.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> index ade65d8ab7..5eb727929b 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.c
> @@ -2,13 +2,7 @@
>    ACPI Platform Driver
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
> index 6a314f5733..bd11f9e988 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.h
> @@ -2,13 +2,7 @@
>    This is an implementation of the ACPI platform driver.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.i=
nf
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
> index 6a5b94ef28..5d9c8cab50 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/AcpiPlatform.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
> index b454a8ddc1..cde6e478c6 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Facs/Facs.c
> @@ -4,13 +4,7 @@
>    for bug fixes, no porting is required.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
> index 0def9f6c2b..6efb38cda4 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Fadt/Fadt.c
> @@ -4,13 +4,7 @@
>    for bug fixes, no porting is required.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
> index 2512793158..8721beb03f 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Hpet/Hpet.c
> @@ -4,13 +4,7 @@
>    for bug fixes, no porting is required.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
> b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
> index 6d25de2ae7..6880f47fa6 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/AcpiTables/Wsmt/Wsmt.c
> @@ -2,13 +2,7 @@
>    ACPI WSMT table
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLib.c
> index ff284fc404..334cb21714 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLibNull.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLibNull.inf
> index 10cc8fffff..54985ee50d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiE
> nableLibNull.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLib.c
> index 59a27c29a9..e49e6ad441 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLibNull.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLibNull.inf
> index 1564c8546f..04f55b49d5 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/BoardAcpiLibNull/BoardAcpiT
> ableLibNull.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.c
> index ea85be4a11..e6ab43db6d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.c
> @@ -7,13 +7,7 @@
>    This library uses the ACPI Support protocol.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>  #include <Base.h>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.inf
> index 20fcc4e63c..1ddca75e97 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/DxeAslUpdateLib/DxeAslUpd
> ateLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeBoardAcpiTableLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeBoardAcpiTableLib.c
> index 700d5e0773..dff47aad79 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeBoardAcpiTableLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeBoardAcpiTableLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.c
> index d054d724d6..43318236e0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.inf
> index 8422faf62a..826c7f4008 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/D
> xeMultiBoardAcpiSupportLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmBoardAcpiEnableLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmBoardAcpiEnableLib.c
> index a0c6b20e13..54af6a8c3c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmBoardAcpiEnableLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmBoardAcpiEnableLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.c
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.c
> index d858e8ae27..ac253eec84 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.inf
> index 0ce45b25cb..5415446b57 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Acpi/Library/MultiBoardAcpiSupportLib/S
> mmMultiBoardAcpiSupportLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
> b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
> index aed770a39d..0d94472450 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.asl
> @@ -2,13 +2,7 @@
>    ACPI minimum DSDT table
>=20
>  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
> b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
> index ef40e97b7c..9bc2224538 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.c
> @@ -2,13 +2,7 @@
>    Min DSDT Driver
>=20
>  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
> b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
> index 3ffa79c966..1066f13cfe 100644
> --- a/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
> +++ b/Platform/Intel/MinPlatformPkg/Acpi/MinDsdt/MinDsdt.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.c
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.c
> index 41fe3f2cca..491fb0f26f 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.c
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.c
> @@ -2,13 +2,7 @@
>    This file include all platform action which can be customized by IBV/O=
EM.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.h
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.h
> index 779ba9a98d..360a00d7d7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.h
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /BdsPlatform.h
> @@ -2,13 +2,7 @@
>    Header file for BDS Platform specific code
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /DxePlatformBootManagerLib.inf
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /DxePlatformBootManagerLib.inf
> index bd9c0467b9..388ffd808b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /DxePlatformBootManagerLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /DxePlatformBootManagerLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /MemoryTest.c
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /MemoryTest.c
> index 0a47f9252d..654845349a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /MemoryTest.c
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /MemoryTest.c
> @@ -2,13 +2,7 @@
>    Perform the platform memory test
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /PlatformBootOption.c
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /PlatformBootOption.c
> index ea30de0540..84aa097d58 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /PlatformBootOption.c
> +++
> b/Platform/Intel/MinPlatformPkg/Bds/Library/DxePlatformBootManagerLib
> /PlatformBootOption.c
> @@ -2,13 +2,7 @@
>    Driver for Platform Boot Options support.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.c
> b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.c
> index bacc440630..403b16a1b4 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.c
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.c
> @@ -2,13 +2,7 @@
>    Null Library instance of SPI Flash Common Library Class
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.inf
> b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.inf
> index 73853c0d1c..d4964681de 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/Library/SpiFlashCommonLibNull/Spi
> FlashCommonLibNull.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
> index bd4366ea7c..7f2678fa9e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/FvbInfo.c
> @@ -3,13 +3,7 @@
>    These data is intent to decouple FVB driver with FV header.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.c
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.c
> index 20ad9a3a38..113c749d04 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.c
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.c
> @@ -3,13 +3,7 @@
>    which are compliant with the Intel(R) Serial Flash Interface Compatibi=
lity
> Specification.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.h
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.h
> index 876f14dc8c..6379fc86d5 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.h
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Common/SpiFvbServi
> ceCommon.h
> @@ -2,13 +2,7 @@
>    Common source definitions used in serial flash drivers
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceS
> mm.c
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceS
> mm.c
> index f0c2a1df8b..251fcae30b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceS
> mm.c
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/Smm/SpiFvbServiceS
> mm.c
> @@ -3,13 +3,7 @@
>    which are compliant with the Intel(R) Serial Flash Interface Compatibi=
lity
> Specification.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> index eb3519fb6a..cca7de94a0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Flash/SpiFvbService/SpiFvbServiceSmm.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformLib.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformLib.inf
> index 48c4433b01..a1226dbcfe 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformResetLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformResetLib.c
> index 395f189ee9..b4d509db85 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformResetLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/DxeFspWrapperPlatf
> ormLib/DxeFspWrapperPlatformResetLib.c
> @@ -2,13 +2,7 @@
>    Dxe library function to reset the system from FSP wrapper.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>  #include <PiDxe.h>
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/FspWrapperHobProcessLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/FspWrapperHobProcessLib.c
> index 7323a46da4..e8df06dfb7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/FspWrapperHobProcessLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/FspWrapperHobProcessLib.c
> @@ -2,13 +2,7 @@
>    Provide FSP wrapper hob process related function.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/PeiFspWrapperHobProcessLib.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/PeiFspWrapperHobProcessLib.inf
> index 362851e128..a76e3195d6 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/PeiFspWrapperHobProcessLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperHobPr
> ocessLib/PeiFspWrapperHobProcessLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.c
> index 2c6c026ee5..0def288805 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.c
> @@ -2,13 +2,7 @@
>    Provide FSP wrapper platform related function.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.inf
> index f7e82d81d7..dafd17dc11 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformResetLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformResetLib.c
> index 501197c709..191bcb2fbb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformResetLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/PeiFspWrapperPlatfo
> rmLib/PeiFspWrapperPlatformResetLib.c
> @@ -2,13 +2,7 @@
>    Pei library function to reset the system from FSP wrapper.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FspWrapperPlatformSecLib.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FspWrapperPlatformSecLib.c
> index 27096fec32..303f3aac40 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FspWrapperPlatformSecLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FspWrapperPlatformSecLib.c
> @@ -2,13 +2,7 @@
>    Provide FSP wrapper platform sec related function.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FsptCoreUpd.h
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FsptCoreUpd.h
> index bfdc279c4a..7c0f605b92 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FsptCoreUpd.h
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/FsptCoreUpd.h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Fsp.h
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Fsp.h
> index ba5219198c..9f6cdcf476 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Fsp.h
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Fsp.h
> @@ -2,13 +2,7 @@
>    Fsp related definitions
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.S
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.S
> index 8923577263..8c8356f3a0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.S
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.S
> @@ -2,13 +2,7 @@
>  # Find and call SecStartup
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.asm
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.asm
> index d4703dc8ba..c854067db1 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.asm
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/PeiCoreEntry.asm
> @@ -2,13 +2,7 @@
>  ; Find and call SecStartup
>  ;
>  ; Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -; This program and the accompanying materials are licensed and made
> available under
> -; the terms and conditions of the BSD License that accompanies this
> distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
>  ;
>  ;;
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.S
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.S
> index 396e7a4c16..63c420a8dc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.S
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.S
> @@ -3,13 +3,7 @@
>  # It consumes the reset vector, calls TempRamInit API from FSP binary.
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.asm
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.asm
> index 7b82cbaa0e..2886a37d73 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.asm
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/SecEntry.asm
> @@ -3,13 +3,7 @@
>  ; It consumes the reset vector, calls TempRamInit API from FSP binary.
>  ;
>  ; Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -; This program and the accompanying materials are licensed and made
> available under
> -; the terms and conditions of the BSD License that accompanies this
> distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
>  ;
>  ;;
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.S
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.S
> index e0eb80ad9a..9953daa195 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.S
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.S
> @@ -2,13 +2,7 @@
>  # Switch the stack from temporary memory to permenent memory.
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.asm
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.asm
> index 27ae218e63..183024066a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.asm
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/Ia32/Stack.asm
> @@ -2,13 +2,7 @@
>  ; Switch the stack from temporary memory to permenent memory.
>  ;
>  ; Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -; This program and the accompanying materials are licensed and made
> available under
> -; the terms and conditions of the BSD License that accompanies this
> distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
>  ;
>  ;;
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/PlatformInit.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/PlatformInit.c
> index 6d810686f3..ef89e3f310 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/PlatformInit.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/PlatformInit.c
> @@ -2,13 +2,7 @@
>    Provide platform init function.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecFspWrapperPlatformSecLib.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecFspWrapperPlatformSecLib.inf
> index 9c133577cd..6f2c95adb7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecFspWrapperPlatformSecLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecFspWrapperPlatformSecLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecGetPerformance.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecGetPerformance.c
> index 7d06b4e985..c4eeb2b188 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecGetPerformance.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecGetPerformance.c
> @@ -2,13 +2,7 @@
>    Sample to provide SecGetPerformance function.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecPlatformInformation.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecPlatformInformation.c
> index 3b8189fadd..5b94ed2bef 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecPlatformInformation.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecPlatformInformation.c
> @@ -2,13 +2,7 @@
>    Provide SecPlatformInformation function.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecRamInitData.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecRamInitData.c
> index 485f198db4..b356327b4c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecRamInitData.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecRamInitData.c
> @@ -2,13 +2,7 @@
>    Provide TempRamInitParams data.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecTempRamDone.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecTempRamDone.c
> index 98bec31013..cde8a80a4e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecTempRamDone.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/Library/SecFspWrapperPlatfo
> rmSecLib/SecTempRamDone.c
> @@ -2,13 +2,7 @@
>    Provide SecTemporaryRamDone function.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.c
> b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.c
> index b01c610bf5..41ed2550bd 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.c
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.c
> @@ -3,13 +3,7 @@
>    exists, and saves the data to nvRAM.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.inf
> b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.inf
> index 0b6eda9d25..0c8689a6f6 100644
> ---
> a/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.inf
> +++
> b/Platform/Intel/MinPlatformPkg/FspWrapper/SaveMemoryConfig/SaveMe
> moryConfig.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceD
> maProtection.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceD
> maProtection.c
> index 197813fe66..f96c2f07ec 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceD
> maProtection.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/ExternalDeviceD
> maProtection.c
> @@ -4,13 +4,7 @@
>    in this sample driver.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustCo
> nfigurationCryptoStrength.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustCo
> nfigurationCryptoStrength.c
> index 6e2f5f4c10..dd0a53ff48 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustCo
> nfigurationCryptoStrength.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareTrustCo
> nfigurationCryptoStrength.c
> @@ -4,13 +4,7 @@
>    in this sample driver.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersion
> RollbackProtection.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersion
> RollbackProtection.c
> index a22836c8a5..3f66e67054 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersion
> RollbackProtection.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/FirmwareVersion
> RollbackProtection.c
> @@ -4,13 +4,7 @@
>    in this sample driver.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.c
> index 02af6dbbe7..8be9e98eae 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.c
> @@ -4,13 +4,7 @@
>    publishes the IBV role HSTI structure indicating all tests pass
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.h
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.h
> index 1e32229895..1dff22363d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.h
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.h
> @@ -3,13 +3,7 @@
>    and publishing IBV HSTI
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.inf
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.inf
> index 97356620f5..6481452860 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/HstiIbvPlatformD
> xe.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
> index 9a1e8a0385..0358b546ee 100644
> --- a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/MorSupport.c
> @@ -4,13 +4,7 @@
>    in this sample driver.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerific
> ation.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerific
> ation.c
> index 6f03495572..55beb7860a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerific
> ation.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/NoTestKeyVerific
> ation.c
> @@ -4,13 +4,7 @@
>    in this sample driver.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypa
> ss.c
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypa
> ss.c
> index 472ec42673..4936b305ab 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypa
> ss.c
> +++
> b/Platform/Intel/MinPlatformPkg/Hsti/HstiIbvPlatformDxe/SecureBootBypa
> ss.c
> @@ -4,13 +4,7 @@
>    in this sample driver.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> index dd0173a1af..efe02c99f3 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
> index 6bd526a27b..f0e578f8cc 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
> index 1ed3591f36..5b3679bb4e 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
> index 231eb60e41..08e50cac07 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiInclude.dsc
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
> b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
> index 6855d1e5b7..3f784d58c9 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
> +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
> index 0f975a8923..24f1a0c508 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
> +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
> index 013c10146b..3c2716d672 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePostMemoryInclude.fdf
> @@ -3,12 +3,6 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
> index e1b195d4d7..c0828997cf 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CorePreMemoryInclude.fdf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
> index 2171fe12e5..45dda7ea0a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryIncl
> ude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryIncl
> ude.fdf
> index 013c10146b..3c2716d672 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryIncl
> ude.fdf
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPostMemoryIncl
> ude.fdf
> @@ -3,12 +3,6 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclu
> de.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclu
> de.fdf
> index d0a4d39d57..af5d032fce 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclu
> de.fdf
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityPreMemoryInclu
> de.fdf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
> index be3caad402..7859c0b1a5 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
> +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/CoreUefiBootInclude.fdf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
> b/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
> index 1b20442fa6..c4c4315ad8 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
> +++ b/Platform/Intel/MinPlatformPkg/Include/Fdf/RuleInclude.fdf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
> b/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
> index 04589cf040..9918c768ba 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Guid/SmramMemoryReserve.h
> @@ -9,13 +9,7 @@
>    This GUIDed HOB can be used to convey the existence of the T-SEG
> reservation and H-SEG usage
>=20
>  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>    @par Revision Reference:
>    GUIDs defined in SmmCis spec version 0.9.
> diff --git a/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
> b/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
> index 3a17c494b2..fa0cf30370 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/HstiIbvFeatureBit.h
> @@ -3,13 +3,7 @@
>    including error string definitions
>=20
>  Copyright (c) 2017 -2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
> index dc76e33557..d58b6d6458 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/AslUpdateLib.h
> @@ -6,13 +6,7 @@
>    restrictions, etc).
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
> index 48de84cfed..edd8dbbd9d 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiEnableLib.h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
> index d001393654..119661a42e 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/BoardAcpiTableLib.h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
> index 914bef1382..32dce7fb17 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/BoardInitLib.h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
> index e7db7bc8c5..95ead25679 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/CompressLib.h
> @@ -2,13 +2,7 @@
>    Header file for compression routine.
>=20
>    Copyright (c) 2005 - 2014, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the =
BSD
> License
> -  which accompanies this distribution.  The full text of the license may=
 be
> found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib=
.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h
> index 8b5e1dc858..d5d84e6deb 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/HobVariableLib.h
> @@ -1,13 +1,7 @@
>  /**@file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib
> .h
> b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib
> .h
> index 15087428e8..a8bb99250c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib
> .h
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardAcpiSupportLib
> .h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.
> h
> b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.
> h
> index c4c36216fe..6c14b5677d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.
> h
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Library/MultiBoardInitSupportLib.
> h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
> index 8889f97d59..d8b1a47c58 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/PeiLib.h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
> index 08b3e85bc3..5c40bd0e6e 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/ReportFvLib.h
> @@ -5,13 +5,7 @@
>    This library installs pre-memory and post-memory firmware volumes.
>=20
>  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLi=
b.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h
> index 9142b14335..f90d6f2ff2 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/SecBoardInitLib.h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.h
> index cc9a825f40..506fb4faf1 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.=
h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyInitLib.=
h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
> index 0e166f1dc9..80be3e6056 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
> +++
> b/Platform/Intel/MinPlatformPkg/Include/Library/SiliconPolicyUpdateLib.h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
> index 12dfaeb440..0c5e72258c 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/SpiFlashCommonLib.h
> @@ -3,13 +3,7 @@
>    internal structure and functions used by SpiFlashCommonLib.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
> index 6c7c9f4798..7265e22689 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointCheckLib.h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
> b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
> index a8b21ca001..36a8757260 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Library/TestPointLib.h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
> b/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
> index 2e0dfbaab7..1e3c8632a6 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Ppi/BaseMemoryTest.h
> @@ -3,13 +3,7 @@
>    of the PEIM being initialized by the PEI Dispatcher.
>=20
>  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
> b/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
> index e778d27743..d4599cc811 100644
> --- a/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
> +++ b/Platform/Intel/MinPlatformPkg/Include/Ppi/PlatformMemorySize.h
> @@ -3,13 +3,7 @@
>    pass control into DXE
>=20
>  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
> b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
> index 52ce2cde15..9f93e1ee2d 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
> +++ b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.c
> @@ -8,13 +8,7 @@
>    are applied to each Block.
>=20
>    Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the =
BSD
> License
> -  which accompanies this distribution.  The full text of the license may=
 be
> found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
> b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
> index 86f41f1651..6a8ac3c588 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
> +++ b/Platform/Intel/MinPlatformPkg/Library/CompressLib/CompressLib.inf
> @@ -3,12 +3,7 @@
>  #
>  #  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR=
>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the
> BSD License
> -#  which accompanies this distribution. The full text of the license may=
 be
> found at
> -#  http://opensource.org/licenses/bsd-license.php.
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  #
>  ##
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
> index a9010a2763..92c63f8920 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
> +++ b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Fce.h
> @@ -1,13 +1,7 @@
>  /**@file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCo
> mmonLib.c
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCo
> mmonLib.c
> index cb7f928426..9acc2141d1 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCo
> mmonLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/InternalCo
> mmonLib.c
> @@ -1,13 +1,7 @@
>  /**@file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.c
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.c
> index 7ae65c08d6..6e19ee0be2 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.c
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.inf
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.inf
> index 66526b3fbd..fd80c6112f 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFce.inf
> @@ -4,13 +4,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.c
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.c
> index cd93898d25..3502bbe12d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.c
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.inf
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.inf
> index 9f6d60622d..82d81c989d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/PeiHobVari
> ableLibFceOptSize.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
> index fa9fb0292c..84e55e8835 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
> +++
> b/Platform/Intel/MinPlatformPkg/Library/PeiHobVariableLibFce/Variable.h
> @@ -1,13 +1,7 @@
>  /**@file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
> b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
> index 22b19df832..96dfd588dc 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
> +++ b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
> b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
> index 2ad74bf058..86b1628c9f 100644
> --- a/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
> +++ b/Platform/Intel/MinPlatformPkg/Library/PeiLib/PeiLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> index 3185776ac3..8efbf322f2 100644
> --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dec
> @@ -8,13 +8,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
> b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
> index 0875f6589e..8a3638b7e6 100644
> --- a/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
> +++ b/Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.c
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.c
> index 557ac2a5b3..f7df32da1c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.c
> +++
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.c
> @@ -2,13 +2,7 @@
>    SA PciHostBridge Library
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>  #include <PiDxe.h>
> diff --git
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.inf
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.inf
> index f9a769155b..d8894a069e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciHostBridgeLibSimple/PciHo
> stBridgeLibSimple.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.c
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.c
> index f216f224cd..6a6218d906 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.c
> +++
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.c
> @@ -3,14 +3,7 @@
>    segment base address equals to PcdPciExpressBaseAddress.
>=20
>    Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials are
> -  licensed and made available under the terms and conditions of
> -  the BSD License which accompanies this distribution.  The full
> -  text of the license may be found at
> -  http://opensource.org/licenses/bsd-license.php.
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.inf
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.inf
> index f41523efa2..da63105450 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Pci/Library/PciSegmentInfoLibSimple/PciS
> egmentInfoLibSimple.inf
> @@ -3,12 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the
> BSD License
> -#  which accompanies this distribution. The full text of the license may=
 be
> found at
> -#  http://opensource.org/licenses/bsd-license.php.
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  #
>  ##
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLib.c
> index 61dc830579..5da5d1f677 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLibNull.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLibNull.inf
> index 65a445b0f7..54b30026c7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/BoardInitLibNull/Boa
> rdInitLibNull.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeBoardInitLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeBoardInitLib.c
> index 25ecb37e46..a1c7e51dc8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeBoardInitLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeBoardInitLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.c
> index f7a4c5b5a1..90aabdbbc7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.inf
> index 188c98db0a..602cfb4e95 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/DxeMultiBoardInitSupportLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiBoardInitLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiBoardInitLib.c
> index b83f8076af..a6768f2b53 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiBoardInitLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiBoardInitLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.c
> index 2056782181..f1cd735e41 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.inf
> index de769bf504..f2ee4c818c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/MultiBoardInitSuppor
> tLib/PeiMultiBoardInitSupportLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.c
> index 4860d72110..6e49b1239d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.c
> @@ -2,13 +2,7 @@
>    Source code file for Report Firmware Volume (FV) library
>=20
>  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.inf
> index a497132173..4d96c9cf31 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/PeiReportFvLib/PeiRe
> portFvLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/=
I
> a32/SecBoardInit.nasm
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/=
I
> a32/SecBoardInit.nasm
> index 71bf82933b..404c03fe06 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/=
I
> a32/SecBoardInit.nasm
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/=
I
> a32/SecBoardInit.nasm
> @@ -9,13 +9,7 @@
>  ; It consumes the reset vector, calls TempRamInit API from FSP binary.
>  ;
>  ; Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -; This program and the accompanying materials are licensed and made
> available under
> -; the terms and conditions of the BSD License that accompanies this
> distribution.
> -; The full text of the license may be found at
> -; http://opensource.org/licenses/bsd-license.php.
> -;
> -; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +; SPDX-License-Identifier: BSD-2-Clause-Patent
>  ;
>  ;;
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/=
S
> ecBoardInitLib.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/=
S
> ecBoardInitLib.c
> index 990e9c9b3a..a8fc76a8fa 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/=
S
> ecBoardInitLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/=
S
> ecBoardInitLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/=
S
> ecBoardInitLibNull.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/=
S
> ecBoardInitLibNull.inf
> index 186814925a..5ba6db5c75 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/=
S
> ecBoardInitLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SecBoardInitLibNull/=
S
> ecBoardInitLibNull.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLib=
Nu
> ll/SiliconPolicyInitLibNull.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLib=
Nu
> ll/SiliconPolicyInitLibNull.c
> index 41025a5b7b..755cc036b8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLib=
Nu
> ll/SiliconPolicyInitLibNull.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLib=
Nu
> ll/SiliconPolicyInitLibNull.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLib=
Nu
> ll/SiliconPolicyInitLibNull.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLib=
Nu
> ll/SiliconPolicyInitLibNull.inf
> index ae696ccc90..73f602619c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLib=
Nu
> ll/SiliconPolicyInitLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyInitLib=
Nu
> ll/SiliconPolicyInitLibNull.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateL=
i
> bNull/SiliconPolicyUpdateLibNull.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateL=
i
> bNull/SiliconPolicyUpdateLibNull.c
> index 3c73d02018..8516434f93 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateL=
i
> bNull/SiliconPolicyUpdateLibNull.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateL=
i
> bNull/SiliconPolicyUpdateLibNull.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateL=
i
> bNull/SiliconPolicyUpdateLibNull.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateL=
i
> bNull/SiliconPolicyUpdateLibNull.inf
> index d2018881bb..79f39cd884 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateL=
i
> bNull/SiliconPolicyUpdateLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/Library/SiliconPolicyUpdateL=
i
> bNull/SiliconPolicyUpdateLibNull.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.c
> index ed3ef951c0..e9ae055f47 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.c
> @@ -2,13 +2,7 @@
>    This driver will register two callbacks to call fsp's notifies.
>=20
>    Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the =
BSD
> License
> -  which accompanies this distribution.  The full text of the license may=
 be
> found at
> -  http://opensource.org/licenses/bsd-license.php.
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.inf
> index 18546d0da0..e3d93bb7eb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInit
> Dxe.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> ostMem.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> ostMem.c
> index f27bd09351..00877593bc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> ostMem.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> ostMem.c
> @@ -2,13 +2,7 @@
>    Source code file for Platform Init PEI module
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> ostMem.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> ostMem.inf
> index 9fc4d1a612..32d67a0a34 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> ostMem.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> ostMem.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> reMem.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> reMem.c
> index bbb138f2d2..2690511abe 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> reMem.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> reMem.c
> @@ -2,13 +2,7 @@
>    Source code file for Platform Init Pre-Memory PEI module
>=20
>  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> reMem.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> reMem.inf
> index 8a41a4dd72..2c3a13106e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> reMem.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitPei/PlatformInit=
P
> reMem.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.c
> index 685e2b5386..224e183f81 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.c
> @@ -2,13 +2,7 @@
>    This driver will register two callbacks to call fsp's notifies.
>=20
>    Copyright (c) 2014 - 2016, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the =
BSD
> License
> -  which accompanies this distribution.  The full text of the license may=
 be
> found at
> -  http://opensource.org/licenses/bsd-license.php.
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.inf
> index d845a63467..90d205ceaa 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformIni
> tSmm.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
> index 95548f3278..c144a38c8a 100644
> --- a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
> +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.c
> @@ -2,13 +2,7 @@
>    Source code file for Report Firmware Volume (FV) PEI module
>=20
>  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
> index 664514f9f9..d6655e05b9 100644
> --- a/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
> +++ b/Platform/Intel/MinPlatformPkg/PlatformInit/ReportFv/ReportFvPei.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPoli=
cy
> Dxe.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPoli=
cy
> Dxe.c
> index 01cc22a973..b436aa35e8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPoli=
cy
> Dxe.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPoli=
cy
> Dxe.c
> @@ -2,13 +2,7 @@
>    Silicon DXE policy.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPoli=
cy
> Dxe.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPoli=
cy
> Dxe.inf
> index 4081a10dfb..9faf72d460 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPoli=
cy
> Dxe.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyDxe/SiliconPoli=
cy
> Dxe.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPostMem.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPostMem.c
> index d5cf7bf05a..535fcfe799 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPostMem.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPostMem.c
> @@ -2,13 +2,7 @@
>    Silicon post-mem policy PEIM.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPostMem.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPostMem.inf
> index 41433274c9..076a17d911 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPostMem.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPostMem.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPreMem.c
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPreMem.c
> index 3bc260e999..d565c08f68 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPreMem.c
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPreMem.c
> @@ -2,13 +2,7 @@
>    Silicon pre-mem policy PEIM.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPreMem.inf
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPreMem.inf
> index 08192cdac3..745691e0a7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPreMem.inf
> +++
> b/Platform/Intel/MinPlatformPkg/PlatformInit/SiliconPolicyPei/SiliconPoli=
cy
> PeiPreMem.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.=
c
> b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.=
c
> index 8b0f5027b4..10dc2caab8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.=
c
> +++
> b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.=
c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.=
inf
> b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.=
inf
> index 522902e8f7..e9b4137b47 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.=
inf
> +++
> b/Platform/Intel/MinPlatformPkg/Services/StallServicePei/StallServicePei.=
inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
> index d33c651a91..d0d88b2e91 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
> +++
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.c
> @@ -2,13 +2,7 @@
>    Platform specific TPM2 component.
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.i
> nf
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.i
> nf
> index f5b083b1fb..e8ab5f35a0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.i
> nf
> +++
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformDxe/Tcg2PlatformDxe.i
> nf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
> index b05da87ab6..3a2d7d31e9 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
> +++
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> index 43b8e835f0..1aabfe7ba8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Tcg/Tcg2PlatformPei/Tcg2PlatformPei.inf
> @@ -2,13 +2,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Acpi.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Acpi.c
> index c2fe38df54..263781a29a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Acpi.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Acpi.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiDmar.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiDmar.c
> index 394eeb3613..b2279966d8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiDmar.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiDmar.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiHpet.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiHpet.c
> index 5747f51edb..c72b23b82f 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiHpet.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiHpet.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMadt.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMadt.c
> index 92032d5712..b743bad6dd 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMadt.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMadt.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMcfg.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMcfg.c
> index c4d3472af9..b38e8214db 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMcfg.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiMcfg.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiTpm.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiTpm.c
> index 31aef8f4bf..f1446c9ba3 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiTpm.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiTpm.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiWsmt.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiWsmt.c
> index 525150dc01..ee63e94fcc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiWsmt.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> AcpiWsmt.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> BootVariable.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> BootVariable.c
> index c50b2a5752..85bd5b3de4 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> BootVariable.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> BootVariable.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> ConsoleVariable.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> ConsoleVariable.c
> index 312dc643f4..ce76b33505 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> ConsoleVariable.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> ConsoleVariable.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DevicePath.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DevicePath.c
> index aee43aa051..5c36c352a0 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DevicePath.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DevicePath.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DmaProtection.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DmaProtection.c
> index 17d58bf3f5..10b44fe8b9 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DmaProtection.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> DmaProtection.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Esrt.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Esrt.c
> index 6b53ab7a37..d31a06b9ab 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Esrt.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Esrt.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Gcd.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Gcd.c
> index c6dceaed46..82709d44eb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Gcd.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Gcd.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Hsti.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Hsti.c
> index 34b2083d4e..7756369ae1 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Hsti.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Hsti.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> LoadedImage.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> LoadedImage.c
> index 7e9393245f..9e3ebc1324 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> LoadedImage.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> LoadedImage.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryAttribute.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryAttribute.c
> index f222019e72..453210fbdc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryAttribute.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryAttribute.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryMap.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryMap.c
> index 32be9db013..fce44bf73e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryMap.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryMap.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryTypeInformation.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryTypeInformation.c
> index 3c9342c893..9ee9dd252c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryTypeInformation.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> MemoryTypeInformation.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Pci.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Pci.c
> index cfa8c425f2..5140039447 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Pci.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Pci.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> PiSignedFvBoot.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> PiSignedFvBoot.c
> index 377ca8f853..17302a6496 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> PiSignedFvBoot.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> PiSignedFvBoot.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmiHandlerInstrument.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmiHandlerInstrument.c
> index 427d502633..3ceeb821fb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmiHandlerInstrument.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmiHandlerInstrument.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmmInfo.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmmInfo.c
> index 3300a33f45..c493750a27 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmmInfo.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> SmmInfo.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgMor.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgMor.c
> index b612f9c7b9..776f7bb09e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgMor.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgMor.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgTrustedBoot.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgTrustedBoot.c
> index 3fbaa22686..2a04f86fed 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgTrustedBoot.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> TcgTrustedBoot.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> UefiSecureBoot.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> UefiSecureBoot.c
> index 8915adfc3e..b53a09abca 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> UefiSecureBoot.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> UefiSecureBoot.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Variable.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Variable.c
> index 68c25efc22..67e6a1916d 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Variable.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeCheck
> Variable.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.c
> index 22026cd430..c012e0afcb 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.inf
> index 015aa579d8..62fceffbec 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/DxeTestP
> ointCheckLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> DmaProtection.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> DmaProtection.c
> index 4639e9ffaa..cb764b3633 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> DmaProtection.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> DmaProtection.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckF
> vInfo.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckF
> vInfo.c
> index 9adbe40fd6..571743448e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckF
> vInfo.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckF
> vInfo.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Hob.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Hob.c
> index 4ce0137a1e..b05f7ebab6 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Hob.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Hob.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Mtrr.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Mtrr.c
> index ea176511f8..536f5c2d83 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Mtrr.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheck
> Mtrr.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckP
> ci.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckP
> ci.c
> index 5ea13a407d..1061f8ac1c 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckP
> ci.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckP
> ci.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckS
> mmInfo.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckS
> mmInfo.c
> index e93e4123a3..d04baf7663 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckS
> mmInfo.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiCheckS
> mmInfo.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.c
> index e2cd7a999a..752230f4db 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.inf
> index d218adb2c5..51369fcedc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPo
> intCheckLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheck
> CpuInfo.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheck
> CpuInfo.c
> index a57ca2c05e..8696153a11 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheck
> CpuInfo.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecCheck
> CpuInfo.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.c
> index 7b4130d1d2..23a5c462ce 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.inf
> index f1cae85cb1..ed37faf960 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SecTestPo
> intCheckLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kCommunicationBuffer.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kCommunicationBuffer.c
> index acc61ceaf7..17e792e947 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kCommunicationBuffer.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kCommunicationBuffer.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kLoadedImage.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kLoadedImage.c
> index a9f8c6b939..479e3e72e2 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kLoadedImage.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kLoadedImage.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kMemoryAttribute.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kMemoryAttribute.c
> index 7011d77c7b..f2b6908955 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kMemoryAttribute.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kMemoryAttribute.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kPaging.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kPaging.c
> index c978d2694c..67a73c5456 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kPaging.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kPaging.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kSmrr.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kSmrr.c
> index b954e32c4c..4ea279ad8a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kSmrr.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmChec
> kSmrr.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.c
> index 2d051bb6bb..4b4f874c7b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.inf
> index ac79431649..6007fbc9d2 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/SmmTest
> PointCheckLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPoint
> Help.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPoint
> Help.c
> index d631eaf193..06c00b9d2a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPoint
> Help.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPoint
> Help.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointI
> nternal.h
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointI
> nternal.h
> index 0a5d5113aa..b1c2fae8d7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointI
> nternal.h
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLib/TestPointI
> nternal.h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.c
> index 82fd08ab02..a52fac9fb2 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017 - 2018, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.inf
> index 9801c2d68f..bead6ba35b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointCheckLibNull/TestP
> ointCheckLibNull.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
> index 812eb54af3..289d052af8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>    Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the =
BSD
> License
> -  which accompanies this distribution.  The full text of the license may=
 be
> found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
> index 2629e698b5..6bde9883c8 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPoint.h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>    Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the =
BSD
> License
> -  which accompanies this distribution.  The full text of the license may=
 be
> found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAi
> p.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAi
> p.c
> index 4f59727911..a7fe9530cf 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAi
> p.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointAi
> p.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>    Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the =
BSD
> License
> -  which accompanies this distribution.  The full text of the license may=
 be
> found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib
> .inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib
> .inf
> index 5c394645d7..17e5b75626 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib
> .inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/DxeTestPointLib
> .inf
> @@ -3,12 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the
> BSD License
> -#  which accompanies this distribution. The full text of the license may=
 be
> found at
> -#  http://opensource.org/licenses/bsd-license.php.
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
> index fac07c52f5..6d6e9caa55 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>    Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the =
BSD
> License
> -  which accompanies this distribution.  The full text of the license may=
 be
> found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
> index c2aa72e0ee..63d7e53b3e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPoint.h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>    Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the =
BSD
> License
> -  which accompanies this distribution.  The full text of the license may=
 be
> found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib=
.
> inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib=
.
> inf
> index 7fa2a471b4..75be715637 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib=
.
> inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib=
.
> inf
> @@ -3,12 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the
> BSD License
> -#  which accompanies this distribution. The full text of the license may=
 be
> found at
> -#  http://opensource.org/licenses/bsd-license.php.
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
> index 8603ea1608..c7bf9d73cc 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>    Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the =
BSD
> License
> -  which accompanies this distribution.  The full text of the license may=
 be
> found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
> index 6dc3077981..9c0a582b79 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPoint.h
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>    Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the =
BSD
> License
> -  which accompanies this distribution.  The full text of the license may=
 be
> found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAi
> p.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAi
> p.c
> index 075d67cb76..84c3f8292e 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAi
> p.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointAi
> p.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>    Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the =
BSD
> License
> -  which accompanies this distribution.  The full text of the license may=
 be
> found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointC
> ommunication.c
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointC
> ommunication.c
> index d2387f6244..5b14b49046 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointC
> ommunication.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointC
> ommunication.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>    Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the =
BSD
> License
> -  which accompanies this distribution.  The full text of the license may=
 be
> found at
> -  http://opensource.org/licenses/bsd-license.php
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLi
> b.inf
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLi
> b.inf
> index 4a03657d4f..3a4adeb2e3 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLi
> b.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/Library/TestPointLib/SmmTestPointLi
> b.inf
> @@ -3,12 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -#  This program and the accompanying materials
> -#  are licensed and made available under the terms and conditions of the
> BSD License
> -#  which accompanies this distribution. The full text of the license may=
 be
> found at
> -#  http://opensource.org/licenses/bsd-license.php.
> -#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +#  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
> b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
> index 2dc03429e3..b2432e919b 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDump.c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials
> -are licensed and made available under the terms and conditions of the BS=
D
> License
> -which accompanies this distribution.  The full text of the license may b=
e
> 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
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpA
> pp.inf
> b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpA
> pp.inf
> index c1e7cc8b22..fef9761e57 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpA
> pp.inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/TestPointDumpApp/TestPointDumpA
> pp.inf
> @@ -1,13 +1,7 @@
>  ## @file
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> c
> b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> c
> index d6878f45de..3cc5ccfef6 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> c
> +++
> b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> c
> @@ -1,13 +1,7 @@
>  /** @file
>=20
>    Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -  This program and the accompanying materials
> -  are licensed and made available under the terms and conditions of the =
BSD
> License
> -  which accompanies this distribution.  The full text of the license may=
 be
> found at
> -  http://opensource.org/licenses/bsd-license.php.
> -
> -  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +  SPDX-License-Identifier: BSD-2-Clause-Patent
>=20
>  **/
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> inf
> b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> inf
> index de7aa8a10f..a6c1888ec7 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> inf
> +++
> b/Platform/Intel/MinPlatformPkg/Test/TestPointStubDxe/TestPointStubDxe.
> inf
> @@ -2,13 +2,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
>=20
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> b/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> index 312c1abb75..e13ca06471 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> +++
> b/Platform/Intel/MinPlatformPkg/Tools/AmlGenOffset/AmlGenOffset.py
> @@ -1,13 +1,7 @@
>  ## @file
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the =
BSD
> License
> -# which accompanies this distribution.  The full text of the license may=
 be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>=20
>  '''
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
> b/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
> index 63d2f88946..b559915e93 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
> +++
> b/Platform/Intel/MinPlatformPkg/Tools/Fsp/PatchFspBinFvsBaseAddress.py
> @@ -1,13 +1,7 @@
>  ## @ PatchFspBinBaseAddress.py
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
> b/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
> index f97de4f522..1d78eb78e4 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/Help/CheckCodeBase.py
> @@ -1,13 +1,7 @@
>  ## @ CheckCodeBase.py
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
> b/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
> index b70b01fd14..2c8be416a8 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/ParseVar/ParseVar.py
> @@ -1,13 +1,7 @@
>  ## @file
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials
> -# are licensed and made available under the terms and conditions of the =
BSD
> License
> -# which accompanies this distribution.  The full text of the license may=
 be
> found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>=20
>  '''
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> index bb9d280863..1312bfc328 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBfv.py
> @@ -1,13 +1,7 @@
>  ## @ PatchBfv.py
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> index e1facd1117..5b49b6b968 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/PatchBinFv.py
> @@ -1,13 +1,7 @@
>  ## @ PatchBinFv.py
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> index 4d194b3c7b..321f7c5746 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/RebaseBinFv.py
> @@ -1,13 +1,7 @@
>  ## @ PatchBinFv.py
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> diff --git a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> index 19c6e04c50..af70fb664c 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/PatchFv/SyncBinFvInf.py
> @@ -1,13 +1,7 @@
>  ## @ SyncBinFvInf.py
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License that accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php.
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
>=20
> --
> 2.21.0.windows.1