From nobody Tue Apr 23 07:20:16 2024
Delivered-To: importer@patchew.org
Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as
 permitted sender) client-ip=66.175.222.12;
 envelope-from=bounce+27952+40736+1787277+3901457@groups.io;
 helo=web01.groups.io;
Authentication-Results: mx.zohomail.com;
	dkim=pass;
	spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted
 sender)  smtp.mailfrom=bounce+27952+40736+1787277+3901457@groups.io;
	dmarc=fail(p=none dis=none)  header.from=intel.com
ARC-Seal: i=1; a=rsa-sha256; t=1557961832; cv=none;
	d=zoho.com; s=zohoarc;
	b=jO27H/BDplKA5kwsDOfKlryQ6kpFKGuXPB75C8P+97jq8yNFky9Vq5cPCw1WfiT4YBm2npAwwO0zKpnT2Jc7D1/xTz/KaNEmhhZ0Ek583eaImVz+w2DjJiImylI59SZHk1PMcLydcEbxXGJm/Q4BQFMsmz3m7LNyagRKZF3xvjc=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com;
 s=zohoarc;
	t=1557961832;
 h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results;
	bh=6zA1lyPloLjN0zSrGCwJQ4no3j5ew669qJqvX9HwUsE=;
	b=R9aXivtp+DyviepCyvitimh52NAZOCnWoIxQknO4IG6PGDwtagvevw0T2PqvOx3sGJ87QJoes+P84GLovMvvGF2q8dsgGe/BBx708jkJad0tcaPeETXIyc0a3zWSf8SspoAjUYLgRDBp7JPEL8N2GXGqhUKgzbCb5H6pGzeHV7g=
ARC-Authentication-Results: i=1; mx.zoho.com;
	dkim=pass;
	spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted
 sender)  smtp.mailfrom=bounce+27952+40736+1787277+3901457@groups.io;
	dmarc=fail header.from=<michael.d.kinney@intel.com> (p=none dis=none)
 header.from=<michael.d.kinney@intel.com>
Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by
 mx.zohomail.com
	with SMTPS id 1557961832237763.4346889454062;
 Wed, 15 May 2019 16:10:32 -0700 (PDT)
Return-Path: <bounce+27952+40736+1787277+3901457@groups.io>
X-Received: from mga06.intel.com (mga06.intel.com [])
 by groups.io with SMTP; Wed, 15 May 2019 16:10:30 -0700
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
X-Received: from fmsmga008.fm.intel.com ([10.253.24.58])
  by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
 15 May 2019 16:10:29 -0700
X-ExtLoop1: 1
X-Received: from unknown (HELO mdkinney-MOBL2.amr.corp.intel.com)
 ([10.241.98.74])
  by fmsmga008.fm.intel.com with ESMTP; 15 May 2019 16:10:27 -0700
From: "Michael D Kinney" <michael.d.kinney@intel.com>
To: devel@edk2.groups.io
Cc: Chasel Chiu <chasel.chiu@intel.com>,
	Michael Kubacki <michael.a.kubacki@intel.com>
Subject: [edk2-devel] [[edk2-platforms][PATCH V2] 23/30]
 Silicon/Intel/KabylakeSiliconPkg: Replace BSD License with BSD+Patent License
Date: Wed, 15 May 2019 16:10:04 -0700
Message-Id: <20190515231012.7488-24-michael.d.kinney@intel.com>
In-Reply-To: <20190515231012.7488-1-michael.d.kinney@intel.com>
References: <20190515231012.7488-1-michael.d.kinney@intel.com>
MIME-Version: 1.0
Precedence: Bulk
List-Unsubscribe: <https://edk2.groups.io/g/devel/unsub>
Sender: devel@edk2.groups.io
List-Id: <devel.edk2.groups.io>
Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io
Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com
Content-Transfer-Encoding: quoted-printable
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io;
 q=dns/txt; s=20140610; t=1557961831;
 bh=HOBS1QdvHIl1F4M1K6N0LC9xVViDzK4d4qDLm4T9a4M=;
 h=Cc:Date:From:Reply-To:Subject:To;
 b=rJWrTCICcJgqei9fz5VWOVV1t23khWDoXSE38sJdZwE9VgnggY/qiXJAsSXZ2qFl0q/
 FxYWo74eng07DvMoZbTgMAblwj94HP22NOd7J/6CamkqtDFLPyiFlxiWx562nGDtV6Cvk
 S3843BXtjdVI7QOeV3M1uburAPMVHteVHTo=
X-ZohoMail-DKIM: pass (identity @groups.io)
Content-Type: text/plain; charset="utf-8"

https://bugzilla.tianocore.org/show_bug.cgi?id=3D1373

Replace BSD 2-Clause License with BSD+Patent License.  This change is
based on the following emails:

  https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
  https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html

RFCs with detailed process for the license change:

  V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
  V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
  V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Michael Kubacki <michael.a.kubacki@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 .../Cpu/Include/ConfigBlock/CpuConfig.h                  | 8 +-------
 .../Cpu/Include/ConfigBlock/CpuConfigFspData.h           | 8 +-------
 .../Cpu/Include/ConfigBlock/CpuConfigLibPreMemConfig.h   | 8 +-------
 .../Cpu/Include/ConfigBlock/CpuOverclockingConfig.h      | 8 +-------
 .../Cpu/Include/ConfigBlock/CpuPidTestConfig.h           | 8 +-------
 .../Cpu/Include/ConfigBlock/CpuPowerMgmtBasicConfig.h    | 8 +-------
 .../Cpu/Include/ConfigBlock/CpuPowerMgmtCustomConfig.h   | 8 +-------
 .../Cpu/Include/ConfigBlock/CpuPowerMgmtPsysConfig.h     | 8 +-------
 .../Cpu/Include/ConfigBlock/CpuPowerMgmtTestConfig.h     | 8 +-------
 .../Cpu/Include/ConfigBlock/CpuPowerMgmtVrConfig.h       | 8 +-------
 .../Cpu/Include/ConfigBlock/CpuTestConfig.h              | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h | 8 +-------
 .../Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h | 8 +-------
 .../KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h     | 8 +-------
 .../Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h  | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h   | 8 +-------
 .../Cpu/Include/Library/CpuMailboxLib.h                  | 8 +-------
 .../Cpu/Include/Library/CpuPlatformLib.h                 | 8 +-------
 .../Cpu/Include/Library/CpuPolicyLib.h                   | 8 +-------
 .../Cpu/Include/Library/CpuPolicyLibPreMem.h             | 8 +-------
 .../Cpu/Include/Protocol/CpuGlobalNvsArea.h              | 8 +-------
 .../KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h    | 8 +-------
 .../Cpu/IncludePrivate/CpuInitDataHob.h                  | 8 +-------
 .../Cpu/IncludePrivate/CpuPrivateData.h                  | 8 +-------
 .../Cpu/IncludePrivate/Library/CpuCommonLib.h            | 8 +-------
 .../Cpu/IncludePrivate/PowerMgmtNvsStruct.h              | 8 +-------
 .../BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.c        | 8 +-------
 .../BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.inf      | 8 +-------
 .../Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c         | 8 +-------
 .../Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.c        | 8 +-------
 .../Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf      | 8 +-------
 .../Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibrary.h    | 8 +-------
 .../Cpu/Library/PeiCpuPolicyLibPreMem/CpuPrintPolicy.c   | 8 +-------
 .../Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c  | 8 +-------
 .../PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf      | 8 +-------
 .../Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibrary.h  | 8 +-------
 .../Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.c | 8 +-------
 .../Library/PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.h | 8 +-------
 .../PeiDxeSmmCpuPlatformLib/PeiDxeSmmCpuPlatformLib.inf  | 8 +-------
 .../LibraryPrivate/PeiDxeSmmCpuCommonLib/CpuCommonLib.c  | 8 +-------
 .../PeiDxeSmmCpuCommonLib/PeiDxeSmmCpuCommonLib.inf      | 8 +-------
 .../Hsti/Dxe/BootFirmwareMediaProtection.c               | 8 +-------
 .../KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c      | 8 +-------
 .../Hsti/Dxe/HardwareRootedBootIntegrity.c               | 8 +-------
 .../Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c   | 8 +-------
 .../Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h   | 8 +-------
 .../Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf | 8 +-------
 .../Hsti/Dxe/IntegratedDeviceDmaProtection.c             | 8 +-------
 .../Hsti/Dxe/MeasuredBootEnforcement.c                   | 8 +-------
 .../Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c    | 8 +-------
 .../KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c | 8 +-------
 .../Hsti/Dxe/SecureIntegratedGraphicsConfiguration.c     | 8 +-------
 .../Hsti/Dxe/SecureMemoryMapConfiguration.c              | 8 +-------
 .../KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c | 8 +-------
 .../Hsti/Dxe/SecureSystemAgentConfiguration.c            | 8 +-------
 .../KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c   | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h   | 8 +-------
 .../Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h    | 8 +-------
 .../KabylakeSiliconPkg/Include/Library/AslUpdateLib.h    | 8 +-------
 .../KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h  | 8 +-------
 .../Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h  | 8 +-------
 .../Include/Library/PeiSiPolicyUpdateLib.h               | 8 +-------
 .../Include/Library/SiConfigBlockLib.h                   | 8 +-------
 .../KabylakeSiliconPkg/Include/Library/SiPolicyLib.h     | 8 +-------
 .../KabylakeSiliconPkg/Include/Library/SiliconInitLib.h  | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h      | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h  | 8 +-------
 .../Include/Protocol/SiPolicyProtocol.h                  | 8 +-------
 .../Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h    | 8 +-------
 .../IncludePrivate/Library/PcieInitLib.h                 | 8 +-------
 .../KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h      | 8 +-------
 .../Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat    | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc  | 8 +-------
 .../Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec  | 8 +-------
 .../Library/BaseConfigBlockLib/BaseConfigBlockLib.c      | 8 +-------
 .../Library/BaseConfigBlockLib/BaseConfigBlockLib.inf    | 8 +-------
 .../Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.c  | 8 +-------
 .../BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf        | 8 +-------
 .../Library/DxeAslUpdateLib/DxeAslUpdateLib.c            | 8 +-------
 .../Library/DxeAslUpdateLib/DxeAslUpdateLib.inf          | 8 +-------
 .../Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.c    | 8 +-------
 .../Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.inf  | 8 +-------
 .../Library/DxeSiliconPolicyInitLib/DxePolicyInit.c      | 8 +-------
 .../Library/DxeSiliconPolicyInitLib/DxeSaPolicyInit.h    | 8 +-------
 .../DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf  | 8 +-------
 .../Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.c        | 8 +-------
 .../Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.inf      | 8 +-------
 .../Library/PeiSiPolicyLib/PeiSiPolicyLib.c              | 8 +-------
 .../Library/PeiSiPolicyLib/PeiSiPolicyLib.inf            | 8 +-------
 .../Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c        | 8 +-------
 .../Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h          | 8 +-------
 .../Library/PeiSiPolicyLib/SiPrintPolicy.c               | 8 +-------
 .../Library/PeiSiliconPolicyInitLib/PeiPolicyInit.c      | 8 +-------
 .../Library/PeiSiliconPolicyInitLib/PeiPolicyInit.h      | 8 +-------
 .../PeiSiliconPolicyInitLib/PeiPolicyInitPreMem.c        | 8 +-------
 .../Library/PeiSiliconPolicyInitLib/PeiSiPolicyInit.h    | 8 +-------
 .../PeiSiliconPolicyInitLib/PeiSiliconPolicyInitLib.inf  | 8 +-------
 .../PeiPostMemSiliconPolicyInitLibDependency.inf         | 8 +-------
 .../PeiPreMemSiliconPolicyInitLibDependency.inf          | 8 +-------
 .../PeiSiliconPolicyInitLibDependency.c                  | 8 +-------
 .../PeiSiliconPolicyInitLibFsp/PeiFspCpuPolicyInitLib.c  | 8 +-------
 .../PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c   | 8 +-------
 .../PeiSiliconPolicyInitLibFsp/PeiFspMiscUpdInitLib.c    | 8 +-------
 .../PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c  | 8 +-------
 .../PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.c     | 8 +-------
 .../PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h     | 8 +-------
 .../PeiSiliconPolicyInitLibFsp/PeiFspSaPolicyInitLib.c   | 8 +-------
 .../PeiSiliconPolicyInitLibFsp/PeiFspSiPolicyInitLib.c   | 8 +-------
 .../Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.c   | 8 +-------
 .../Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.h   | 8 +-------
 .../PeiSiliconPolicyInitLibFsp/PeiPolicyInitLib.h        | 8 +-------
 .../PeiSiliconPolicyInitLibFsp/PeiPolicyInitPreMem.c     | 8 +-------
 .../Library/PeiSiliconPolicyInitLibFsp/PeiSiPolicyInit.h | 8 +-------
 .../PeiSiliconPolicyInitLibFsp.inf                       | 8 +-------
 .../Library/SiliconInitLib/SiliconInit.c                 | 8 +-------
 .../Library/SiliconInitLib/SiliconInitLib.inf            | 8 +-------
 .../Library/SiliconInitLib/SiliconInitPreMem.c           | 8 +-------
 .../Me/Include/ConfigBlock/MePeiConfig.h                 | 8 +-------
 .../Me/Include/Library/PeiMePolicyLib.h                  | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h  | 8 +-------
 .../Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h | 8 +-------
 .../Me/Library/PeiMePolicyLib/PeiMePolicyLib.c           | 8 +-------
 .../Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf         | 8 +-------
 .../Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h       | 8 +-------
 .../Pch/AcpiTables/Dsdt/GpioAcpiDefines.h                | 8 +-------
 .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl   | 8 +-------
 .../Pch/AcpiTables/Dsdt/GpioLibObjects.asl               | 8 +-------
 .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl   | 8 +-------
 .../Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl | 8 +-------
 .../Pch/AcpiTables/Dsdt/PchAcpiTables.inf                | 8 +-------
 .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl    | 8 +-------
 .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl   | 8 +-------
 .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl    | 8 +-------
 .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl    | 8 +-------
 .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl   | 8 +-------
 .../Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl            | 8 +-------
 .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl   | 8 +-------
 .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl    | 8 +-------
 .../Pch/AcpiTables/Dsdt/PchSerialIo.asl                  | 8 +-------
 .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl   | 8 +-------
 .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl   | 8 +-------
 .../Pch/AcpiTables/Dsdt/TraceHubDebug.asl                | 8 +-------
 .../KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl    | 8 +-------
 .../Pch/Include/ConfigBlock/Cio2Config.h                 | 8 +-------
 .../Pch/Include/ConfigBlock/DciConfig.h                  | 8 +-------
 .../Pch/Include/ConfigBlock/DmiConfig.h                  | 8 +-------
 .../Pch/Include/ConfigBlock/EspiConfig.h                 | 8 +-------
 .../Pch/Include/ConfigBlock/FlashProtectionConfig.h      | 8 +-------
 .../Pch/Include/ConfigBlock/HdAudioConfig.h              | 8 +-------
 .../Pch/Include/ConfigBlock/HpetConfig.h                 | 8 +-------
 .../Pch/Include/ConfigBlock/HsioConfig.h                 | 8 +-------
 .../Pch/Include/ConfigBlock/HsioPcieConfig.h             | 8 +-------
 .../Pch/Include/ConfigBlock/HsioSataConfig.h             | 8 +-------
 .../Pch/Include/ConfigBlock/InterruptConfig.h            | 8 +-------
 .../Pch/Include/ConfigBlock/IoApicConfig.h               | 8 +-------
 .../Pch/Include/ConfigBlock/IshConfig.h                  | 8 +-------
 .../Pch/Include/ConfigBlock/LanConfig.h                  | 8 +-------
 .../Pch/Include/ConfigBlock/LockDownConfig.h             | 8 +-------
 .../Pch/Include/ConfigBlock/LpcConfig.h                  | 8 +-------
 .../Pch/Include/ConfigBlock/P2sbConfig.h                 | 8 +-------
 .../Pch/Include/ConfigBlock/PchGeneralConfig.h           | 8 +-------
 .../Pch/Include/ConfigBlock/PcieRpConfig.h               | 8 +-------
 .../Pch/Include/ConfigBlock/PmConfig.h                   | 8 +-------
 .../Pch/Include/ConfigBlock/Port61Config.h               | 8 +-------
 .../Pch/Include/ConfigBlock/SataConfig.h                 | 8 +-------
 .../Pch/Include/ConfigBlock/ScsConfig.h                  | 8 +-------
 .../Pch/Include/ConfigBlock/SerialIoConfig.h             | 8 +-------
 .../Pch/Include/ConfigBlock/SerialIrqConfig.h            | 8 +-------
 .../Pch/Include/ConfigBlock/SmbusConfig.h                | 8 +-------
 .../Pch/Include/ConfigBlock/SpiConfig.h                  | 8 +-------
 .../Pch/Include/ConfigBlock/ThermalConfig.h              | 8 +-------
 .../Pch/Include/ConfigBlock/TraceHubConfig.h             | 8 +-------
 .../Pch/Include/ConfigBlock/UsbConfig.h                  | 8 +-------
 .../Pch/Include/ConfigBlock/WatchDogConfig.h             | 8 +-------
 .../Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h    | 8 +-------
 .../Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h  | 8 +-------
 .../Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h     | 8 +-------
 .../Pch/Include/Library/GpioNativeLib.h                  | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h    | 8 +-------
 .../Pch/Include/Library/PchCycleDecodingLib.h            | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h  | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h   | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h  | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h  | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h  | 8 +-------
 .../Pch/Include/Library/PchPcieRpLib.h                   | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h   | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h   | 8 +-------
 .../Pch/Include/Library/PchPolicyLib.h                   | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h   | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h | 8 +-------
 .../Pch/Include/Library/PchSbiAccessLib.h                | 8 +-------
 .../Pch/Include/Library/PchSerialIoLib.h                 | 8 +-------
 .../Pch/Include/Library/PchSerialIoUartLib.h             | 8 +-------
 .../Pch/Include/Library/PchSmmControlLib.h               | 8 +-------
 .../Pch/Include/Library/PchWdtCommonLib.h                | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h   | 8 +-------
 .../Pch/Include/Library/SpiFlashCommonLib.h              | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h      | 8 +-------
 .../Pch/Include/Library/TraceHubInitLib.h                | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h | 8 +-------
 .../Pch/Include/PchPcieStorageDetectHob.h                | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h     | 8 +-------
 .../Pch/Include/PchPreMemPolicyCommon.h                  | 8 +-------
 .../Pch/Include/PchReservedResources.h                   | 8 +-------
 .../Pch/Include/PchResetPlatformSpecific.h               | 8 +-------
 .../Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h  | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h   | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h   | 8 +-------
 .../Pch/Include/Protocol/PchAcpiSmiDispatch.h            | 8 +-------
 .../Pch/Include/Protocol/PchEmmcTuning.h                 | 8 +-------
 .../Pch/Include/Protocol/PchEspiSmiDispatch.h            | 8 +-------
 .../Pch/Include/Protocol/PchGpioUnlockSmiDispatch.h      | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h    | 8 +-------
 .../Pch/Include/Protocol/PchPcieSmiDispatch.h            | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h   | 8 +-------
 .../Pch/Include/Protocol/PchSmiDispatch.h                | 8 +-------
 .../Pch/Include/Protocol/PchSmmIoTrapControl.h           | 8 +-------
 .../Pch/Include/Protocol/PchSmmPeriodicTimerControl.h    | 8 +-------
 .../Pch/Include/Protocol/PchTcoSmiDispatch.h             | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h | 8 +-------
 .../Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h  | 8 +-------
 .../Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h  | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h | 8 +-------
 .../Pch/Include/Register/PchRegsGpio.h                   | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h | 8 +-------
 .../Pch/Include/Register/PchRegsHsio.h                   | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h | 8 +-------
 .../Pch/Include/Register/PchRegsItss.h                   | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h | 8 +-------
 .../Pch/Include/Register/PchRegsP2sb.h                   | 8 +-------
 .../Pch/Include/Register/PchRegsPcie.h                   | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h | 8 +-------
 .../Pch/Include/Register/PchRegsPsth.h                   | 8 +-------
 .../Pch/Include/Register/PchRegsSata.h                   | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h | 8 +-------
 .../Pch/Include/Register/PchRegsSerialIo.h               | 8 +-------
 .../Pch/Include/Register/PchRegsSmbus.h                  | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h | 8 +-------
 .../Pch/Include/Register/PchRegsThermal.h                | 8 +-------
 .../Pch/Include/Register/PchRegsTraceHub.h               | 8 +-------
 .../KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h | 8 +-------
 .../Pch/IncludePrivate/Library/DxePchHdaNhlt.h           | 8 +-------
 .../Pch/IncludePrivate/Library/GpioPrivateLib.h          | 8 +-------
 .../Pch/IncludePrivate/Library/I2cMasterCommonLib.h      | 8 +-------
 .../Pch/IncludePrivate/Library/PchHdaLib.h               | 8 +-------
 .../Pch/IncludePrivate/Library/PchInitCommonLib.h        | 8 +-------
 .../Pch/IncludePrivate/Library/PchPciExpressHelpersLib.h | 8 +-------
 .../Pch/IncludePrivate/Library/PchPsfPrivateLib.h        | 8 +-------
 .../Pch/IncludePrivate/Library/PchSmbusCommonLib.h       | 8 +-------
 .../Pch/IncludePrivate/Library/PchSpiCommonLib.h         | 8 +-------
 .../Pch/IncludePrivate/Library/PeiI2cMasterLib.h         | 8 +-------
 .../Pch/IncludePrivate/Library/RstPrivateLib.h           | 8 +-------
 .../KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h | 8 +-------
 .../Pch/IncludePrivate/PchHdaEndpoints.h                 | 8 +-------
 .../Pch/IncludePrivate/Protocol/PchNvs.h                 | 8 +-------
 .../Pch/IncludePrivate/Protocol/PchNvsArea.h             | 8 +-------
 .../Pch/IncludePrivate/Protocol/PcieIoTrap.h             | 8 +-------
 .../Pch/Library/BaseResetSystemLib/BaseResetSystemLib.c  | 8 +-------
 .../Library/BaseResetSystemLib/BaseResetSystemLib.inf    | 8 +-------
 .../Pch/Library/BaseSmbusLib/BaseSmbusLib.c              | 8 +-------
 .../Pch/Library/BaseSmbusLib/BaseSmbusLib.inf            | 8 +-------
 .../Pch/Library/DxeResetSystemLib/DxeResetSystemLib.c    | 8 +-------
 .../Pch/Library/DxeResetSystemLib/DxeResetSystemLib.inf  | 8 +-------
 .../DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.c  | 8 +-------
 .../DxeRuntimeResetSystemLib.inf                         | 8 +-------
 .../Pch/Library/PeiDxeSmmGpioLib/GpioInit.c              | 8 +-------
 .../Pch/Library/PeiDxeSmmGpioLib/GpioLib.c               | 8 +-------
 .../Pch/Library/PeiDxeSmmGpioLib/GpioLibrary.h           | 8 +-------
 .../Pch/Library/PeiDxeSmmGpioLib/GpioNativeLib.c         | 8 +-------
 .../Pch/Library/PeiDxeSmmGpioLib/PchSklGpioData.c        | 8 +-------
 .../Pch/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf    | 8 +-------
 .../PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c   | 8 +-------
 .../PeiDxeSmmPchCycleDecodingLib.inf                     | 8 +-------
 .../Pch/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c           | 8 +-------
 .../Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf    | 8 +-------
 .../Pch/Library/PeiDxeSmmPchHsioLib/PchHsioLib.c         | 8 +-------
 .../Library/PeiDxeSmmPchHsioLib/PeiDxeSmmPchHsioLib.inf  | 8 +-------
 .../Pch/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c         | 8 +-------
 .../Pch/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c      | 8 +-------
 .../Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf  | 8 +-------
 .../Pch/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c         | 8 +-------
 .../Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf  | 8 +-------
 .../Pch/Library/PeiDxeSmmPchPcieRpLib/PchPcieRpLib.c     | 8 +-------
 .../PeiDxeSmmPchPcieRpLib/PeiDxeSmmPchPcieRpLib.inf      | 8 +-------
 .../Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c           | 8 +-------
 .../Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf    | 8 +-------
 .../Pch/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c           | 8 +-------
 .../Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf    | 8 +-------
 .../Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLib.c           | 8 +-------
 .../Library/PeiDxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf    | 8 +-------
 .../Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c   | 8 +-------
 .../PeiDxeSmmPchSbiAccessLib.inf                         | 8 +-------
 .../PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.c    | 8 +-------
 .../PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.inf  | 8 +-------
 .../PeiDxeSmmPchWdtCommonLib.inf                         | 8 +-------
 .../Pch/Library/PeiDxeSmmPchWdtCommonLib/WdtCommon.c     | 8 +-------
 .../Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c                | 8 +-------
 .../Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf              | 8 +-------
 .../Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.c        | 8 +-------
 .../Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.inf      | 8 +-------
 .../Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c   | 8 +-------
 .../Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c         | 8 +-------
 .../Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c     | 8 +-------
 .../Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c   | 8 +-------
 .../Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c        | 8 +-------
 .../Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf      | 8 +-------
 .../Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h    | 8 +-------
 .../Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c  | 8 +-------
 .../Pch/Library/PeiPchResetLib/PchReset.c                | 8 +-------
 .../Pch/Library/PeiPchResetLib/PeiPchResetLib.inf        | 8 +-------
 .../Pch/Library/PeiResetSystemLib/PeiResetSystemLib.c    | 8 +-------
 .../Pch/Library/PeiResetSystemLib/PeiResetSystemLib.inf  | 8 +-------
 .../Library/PeiResetSystemLib/PeiResetSystemLibFsp.inf   | 8 +-------
 .../KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c | 8 +-------
 .../Pch/Library/PeiSpiLib/PeiSpiLib.inf                  | 8 +-------
 .../SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf        | 8 +-------
 .../Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c    | 8 +-------
 .../Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c  | 8 +-------
 .../BasePchSpiCommonLib/BasePchSpiCommonLib.inf          | 8 +-------
 .../Pch/LibraryPrivate/BasePchSpiCommonLib/SpiCommon.c   | 8 +-------
 .../Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf     | 8 +-------
 .../Pch/LibraryPrivate/DxePchHdaLib/PchHdaEndpoints.c    | 8 +-------
 .../Pch/LibraryPrivate/DxePchHdaLib/PchHdaLib.c          | 8 +-------
 .../Pch/LibraryPrivate/DxePchHdaLib/PchHdaNhltConfig.c   | 8 +-------
 .../PeiDxeI2cMasterCommonLib/I2cMasterCommonLib.c        | 8 +-------
 .../PeiDxeI2cMasterCommonLib.inf                         | 8 +-------
 .../PeiDxeSmmGpioPrivateLib/GpioNativePrivateLib.c       | 8 +-------
 .../PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c             | 8 +-------
 .../PeiDxeSmmGpioPrivateLib/PchSklGpioPrivateData.c      | 8 +-------
 .../PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf  | 8 +-------
 .../PeiDxeSmmPchInitCommonLib/PchInitCommon.c            | 8 +-------
 .../LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchRpfn.c   | 8 +-------
 .../PeiDxeSmmPchInitCommonLib.inf                        | 8 +-------
 .../PchPciExpressHelpersLibrary.c                        | 8 +-------
 .../PchPciExpressHelpersLibrary.h                        | 8 +-------
 .../PeiDxeSmmPchPciExpressHelpersLib.inf                 | 8 +-------
 .../PeiDxeSmmPchPsfPrivateLib/PchPsfPrivateLib.c         | 8 +-------
 .../PeiDxeSmmPchPsfPrivateLib.inf                        | 8 +-------
 .../PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c            | 8 +-------
 .../PeiDxeSmmPchSmbusCommonLib.inf                       | 8 +-------
 .../PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.c      | 8 +-------
 .../PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf    | 8 +-------
 .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c   | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c     | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c      | 8 +-------
 .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c   | 8 +-------
 .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h   | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c      | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf    | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c      | 8 +-------
 .../Pch/PchInit/Dxe/PchRstPcieStorage.c                  | 8 +-------
 .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c   | 8 +-------
 .../Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c    | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c     | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c  | 8 +-------
 .../Pch/PchInit/Smm/PchBiosWriteProtect.c                | 8 +-------
 .../Pch/PchInit/Smm/PchGpioSxIsolationSmm.c              | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c      | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h      | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf    | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c     | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c      | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c   | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c     | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c    | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchSmiDispatch.c            | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf        | 8 +-------
 .../KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchSmmCore.c                | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchSmmEspi.c                | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchSmmEspi.h                | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchSmmGpi.c                 | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchSmmHelpers.c             | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchSmmHelpers.h             | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchSmmPeriodicTimer.c       | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchSmmPowerButton.c         | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchSmmSw.c                  | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchSmmSx.c                  | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchSmmUsb.c                 | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.c            | 8 +-------
 .../Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.h            | 8 +-------
 .../Pch/SmmControl/RuntimeDxe/SmmControl.inf             | 8 +-------
 .../Pch/SmmControl/RuntimeDxe/SmmControlDriver.c         | 8 +-------
 .../Pch/SmmControl/RuntimeDxe/SmmControlDriver.h         | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c    | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h    | 8 +-------
 .../Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf   | 8 +-------
 .../SampleCode/Include/Library/SecPlatformLib.h          | 8 +-------
 .../Include/Guid/DataHubStatusCodeRecord.h               | 8 +-------
 .../IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h  | 8 +-------
 .../IntelFrameworkPkg/Include/Protocol/DataHub.h         | 8 +-------
 .../IntelFrameworkPkg/Include/Protocol/Legacy8259.h      | 8 +-------
 .../IntelFrameworkPkg/Include/Protocol/LegacyBios.h      | 8 +-------
 .../IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h | 8 +-------
 .../SampleCode/MdeModulePkg/Include/Guid/AcpiS3Context.h | 9 +--------
 .../MdeModulePkg/Include/Guid/ConsoleOutDevice.h         | 8 +-------
 .../MdeModulePkg/Include/Guid/MemoryTypeInformation.h    | 8 +-------
 .../MdeModulePkg/Include/Library/ResetSystemLib.h        | 8 +-------
 .../SampleCode/MdeModulePkg/Include/Ppi/SmmAccess.h      | 9 +--------
 .../SampleCode/MdeModulePkg/Include/Ppi/SmmControl.h     | 9 +--------
 .../MdeModulePkg/Include/Protocol/SmmVariable.h          | 8 +-------
 .../SampleCode/Pch/AcpiTables/Dsdt/PchSmb.asl            | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec               | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc    | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc      | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc            | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc         | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc            | 8 +-------
 Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc         | 8 +-------
 .../SystemAgent/AcpiTables/Dmar/Dmar.aslc                | 8 +-------
 .../SystemAgent/AcpiTables/Dmar/Dmar.h                   | 8 +-------
 .../SystemAgent/AcpiTables/HostBus.asl                   | 8 +-------
 .../SystemAgent/AcpiTables/SaAcpiTables.inf              | 8 +-------
 .../SystemAgent/AcpiTables/SaSsdt/Igfx.asl               | 8 +-------
 .../SystemAgent/AcpiTables/SaSsdt/IgfxCommon.asl         | 8 +-------
 .../SystemAgent/AcpiTables/SaSsdt/IgfxDsm.asl            | 8 +-------
 .../SystemAgent/AcpiTables/SaSsdt/IgfxOpGbda.asl         | 8 +-------
 .../SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.asl           | 8 +-------
 .../SystemAgent/AcpiTables/SaSsdt/IgfxOpSbcb.asl         | 8 +-------
 .../SystemAgent/AcpiTables/SaSsdt/Sa.asl                 | 8 +-------
 .../SystemAgent/AcpiTables/SaSsdt/SaNvs.asl              | 8 +-------
 .../SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl             | 8 +-------
 .../SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf             | 8 +-------
 .../SystemAgent/Include/ConfigBlock/GraphicsDxeConfig.h  | 8 +-------
 .../SystemAgent/Include/ConfigBlock/GraphicsPeiConfig.h  | 8 +-------
 .../SystemAgent/Include/ConfigBlock/MemoryConfig.h       | 8 +-------
 .../SystemAgent/Include/ConfigBlock/MiscDxeConfig.h      | 8 +-------
 .../Include/ConfigBlock/SaMiscPeiPreMemConfig.h          | 8 +-------
 .../SystemAgent/Include/ConfigBlock/VtdConfig.h          | 8 +-------
 .../SystemAgent/Include/DmaRemappingTable.h              | 8 +-------
 .../SystemAgent/Include/Library/DxeSaPolicyLib.h         | 8 +-------
 .../SystemAgent/Include/Library/PeiSaPolicyLib.h         | 8 +-------
 .../SystemAgent/Include/Library/SaPlatformLib.h          | 8 +-------
 .../KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h  | 8 +-------
 .../SystemAgent/Include/Protocol/GopPolicy.h             | 8 +-------
 .../SystemAgent/Include/Protocol/IgdOpRegion.h           | 8 +-------
 .../SystemAgent/Include/Protocol/MemInfo.h               | 8 +-------
 .../SystemAgent/Include/Protocol/SaGlobalNvsArea.h       | 8 +-------
 .../SystemAgent/Include/Protocol/SaNvs.h                 | 8 +-------
 .../SystemAgent/Include/Protocol/SaPolicy.h              | 8 +-------
 .../KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h    | 8 +-------
 .../SystemAgent/Include/SaPolicyCommon.h                 | 8 +-------
 .../KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h      | 8 +-------
 .../SystemAgent/IncludePrivate/SaConfigHob.h             | 8 +-------
 .../SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c  | 8 +-------
 .../Library/DxeSaPolicyLib/DxeSaPolicyLib.inf            | 8 +-------
 .../Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h          | 8 +-------
 .../PeiDxeSmmSaPlatformLib/PeiDxeSmmSaPlatformLib.inf    | 8 +-------
 .../Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.c   | 8 +-------
 .../Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.h   | 8 +-------
 .../Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.S         | 8 +-------
 .../Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.asm       | 8 +-------
 .../Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm      | 8 +-------
 .../SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c  | 8 +-------
 .../SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.h  | 8 +-------
 .../SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.c  | 8 +-------
 .../Library/PeiSaPolicyLib/PeiSaPolicyLib.inf            | 8 +-------
 .../Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c        | 8 +-------
 .../Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h          | 8 +-------
 .../SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c   | 8 +-------
 .../SystemAgent/MemoryInit/Include/MrcCommonTypes.h      | 8 +-------
 .../SystemAgent/MemoryInit/Include/MrcInterface.h        | 8 +-------
 .../SystemAgent/MemoryInit/Include/MrcRmtData.h          | 8 +-------
 .../SystemAgent/MemoryInit/Include/MrcSpdData.h          | 8 +-------
 .../SystemAgent/MemoryInit/Include/MrcTypes.h            | 8 +-------
 .../SystemAgent/SaInit/Dxe/GraphicsInit.c                | 8 +-------
 .../SystemAgent/SaInit/Dxe/GraphicsInit.h                | 8 +-------
 .../SystemAgent/SaInit/Dxe/IgdOpRegion.c                 | 8 +-------
 .../SystemAgent/SaInit/Dxe/IgdOpRegion.h                 | 8 +-------
 .../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c   | 8 +-------
 .../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h   | 8 +-------
 .../SystemAgent/SaInit/Dxe/SaInitDxe.c                   | 8 +-------
 .../SystemAgent/SaInit/Dxe/SaInitDxe.h                   | 8 +-------
 .../SystemAgent/SaInit/Dxe/SaInitDxe.inf                 | 8 +-------
 .../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c      | 8 +-------
 .../KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h      | 8 +-------
 .../SystemAgent/SmmAccess/Dxe/SmmAccess.inf              | 8 +-------
 .../SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c          | 8 +-------
 .../SystemAgent/SmmAccess/Dxe/SmmAccessDriver.h          | 8 +-------
 492 files changed, 492 insertions(+), 3447 deletions(-)

diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuCo=
nfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig=
.h
index 863a4fcdf8..6de5efbede 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfig.h
@@ -2,13 +2,7 @@
   CPU Config Block.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuCo=
nfigFspData.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/Cp=
uConfigFspData.h
index 8f333cffeb..53e6d45fe5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFsp=
Data.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFsp=
Data.h
@@ -2,13 +2,7 @@
   FSP CPU Data Config Block.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_CONFIG_FSP_DATA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuCo=
nfigLibPreMemConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Config=
Block/CpuConfigLibPreMemConfig.h
index 19e41287ce..4823b1d713 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLib=
PreMemConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLib=
PreMemConfig.h
@@ -2,13 +2,7 @@
   CPU PreMemory Config Block.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_CONFIG_LIB_PREMEM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOv=
erclockingConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlo=
ck/CpuOverclockingConfig.h
index 735e79c491..7a6d89ebda 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclock=
ingConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclock=
ingConfig.h
@@ -2,13 +2,7 @@
   CPU Overclocking Config Block.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_OVERCLOCKING_PREMEM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPi=
dTestConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/Cp=
uPidTestConfig.h
index d8b5a2ed98..c55f9a0cc3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestCo=
nfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestCo=
nfig.h
@@ -2,13 +2,7 @@
   CPU PID Config Block.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_PID_TEST_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPo=
werMgmtBasicConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigB=
lock/CpuPowerMgmtBasicConfig.h
index 68dc9195ae..6fe9126377 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmt=
BasicConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmt=
BasicConfig.h
@@ -2,13 +2,7 @@
   CPU Power Management Basic Config Block.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_POWER_MGMT_BASIC_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPo=
werMgmtCustomConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Config=
Block/CpuPowerMgmtCustomConfig.h
index edb8182db5..026a1aff5f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmt=
CustomConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmt=
CustomConfig.h
@@ -2,13 +2,7 @@
   CPU Power Managment Custom Config Block.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_POWER_MGMT_CUSTOM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPo=
werMgmtPsysConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBl=
ock/CpuPowerMgmtPsysConfig.h
index 05b1efd5b6..75b49dbe7a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmt=
PsysConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmt=
PsysConfig.h
@@ -2,13 +2,7 @@
   CPU Power Management Psys(Platform) Config Block.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_POWER_MGMT_PSYS_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPo=
werMgmtTestConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBl=
ock/CpuPowerMgmtTestConfig.h
index bf6e829fa3..ab0c194e76 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmt=
TestConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmt=
TestConfig.h
@@ -2,13 +2,7 @@
   CPU Power Management Test Config Block.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_POWER_MGMT_TEST_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPo=
werMgmtVrConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBloc=
k/CpuPowerMgmtVrConfig.h
index ad4ed76250..802f585819 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmt=
VrConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmt=
VrConfig.h
@@ -2,13 +2,7 @@
   CPU Power Management VR Config Block.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_POWER_MGMT_VR_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTe=
stConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTe=
stConfig.h
index 2b1fa5b3a5..2cdf834a89 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfi=
g.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfi=
g.h
@@ -2,13 +2,7 @@
   CPU Test Config Block.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_TEST_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h b/Sil=
icon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
index dc62fea6eb..62a0323cb0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
@@ -2,13 +2,7 @@
   Macros to simplify and abstract the interface to CPU configuration.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPUACCESS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h b=
/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h
index e7caafa416..2dc7be45d2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuDataStruct.h
@@ -2,13 +2,7 @@
   This file declares various data structures used in CPU reference code.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h=
 b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h
index a8ee41ec99..775fc6ce65 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPolicyCommon.h
@@ -2,13 +2,7 @@
   CPU Policy structure definition which will contain several config blocks=
 during runtime.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_POLICY_COMMON_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h b/=
Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h
index 612b166010..4a14004fdf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuPowerMgmt.h
@@ -2,13 +2,7 @@
   This file contains define definitions specific to processor
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h b/Silic=
on/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
index 21b6dd6f4b..3b92fd677f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
@@ -10,13 +10,7 @@
   - Definitions beginning with "N_" are the bit position
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_REGS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailbo=
xLib.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib=
.h
index 0c2df2ff80..4d36a90ad1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.h
@@ -2,13 +2,7 @@
   Header file for Cpu Mailbox Lib.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatfo=
rmLib.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformL=
ib.h
index d1ccc5e7fb..462b083e6a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h
@@ -2,13 +2,7 @@
   Header file for CpuPlatform Lib.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicy=
Lib.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h
index f05c5743d7..4ed5719491 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.h
@@ -2,13 +2,7 @@
   Prototype of the CpuPolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicy=
LibPreMem.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolic=
yLibPreMem.h
index 905937ec88..9e7518f91c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreM=
em.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreM=
em.h
@@ -2,13 +2,7 @@
   Prototype of the CpuPolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_PREMEM_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGloba=
lNvsArea.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGloba=
lNvsArea.h
index 6e807a3504..59c0f812c5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsAre=
a.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsAre=
a.h
@@ -6,13 +6,7 @@
   @note Data structures defined in this protocol are not naturally aligned.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_GLOBAL_NVS_AREA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.=
h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h
index d59994471d..f0095908f3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuInfo.h
@@ -2,13 +2,7 @@
   Protocol used to report CPU information
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_INFO_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDat=
aHob.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob=
.h
index cdc6c463b6..58c968df89 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.h
@@ -2,13 +2,7 @@
   Struct and GUID definitions for CpuInitDataHob.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_INIT_DATA_HOB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivate=
Data.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData=
.h
index 13ca1f2a01..4cc60651c3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.h
@@ -2,13 +2,7 @@
   Struct definition for CpuPrivateData.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CPU_PRIVATE_DATA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/Cp=
uCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/=
CpuCommonLib.h
index 8099236d88..759fa84175 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommon=
Lib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommon=
Lib.h
@@ -2,13 +2,7 @@
   Header file for Cpu Common Lib implementation.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtN=
vsStruct.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtN=
vsStruct.h
index e7f7c19279..bd3fddb86f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruc=
t.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruc=
t.h
@@ -2,13 +2,7 @@
   This file contains CPU Gnvs Struct specific to processor
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _POWER_MGMT_NVS_STRUCT_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLib=
Null/BaseCpuMailboxLibNull.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library=
/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.c
index ed964d00c3..bc2e93a1ac 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Ba=
seCpuMailboxLibNull.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Ba=
seCpuMailboxLibNull.c
@@ -2,13 +2,7 @@
   Mailbox Library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Uefi.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLib=
Null/BaseCpuMailboxLibNull.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Libra=
ry/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.inf
index 0426e05802..0799aa891b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Ba=
seCpuMailboxLibNull.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Ba=
seCpuMailboxLibNull.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/C=
puPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicy=
Lib/CpuPrintPolicy.c
index f871c21e6a..f13ca92661 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrint=
Policy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrint=
Policy.c
@@ -2,13 +2,7 @@
   This file is PeiCpuPolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PeiCpuPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/P=
eiCpuPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolic=
yLib/PeiCpuPolicyLib.c
index 49331f1471..cb7f379e0f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPo=
licyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPo=
licyLib.c
@@ -2,13 +2,7 @@
   This file is PeiCpuPolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PeiCpuPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/P=
eiCpuPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPol=
icyLib/PeiCpuPolicyLib.inf
index 24e9819e34..e0f4ee03ee 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPo=
licyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPo=
licyLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/P=
eiCpuPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuP=
olicyLib/PeiCpuPolicyLibrary.h
index 81301b475e..d2a475591d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPo=
licyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPo=
licyLibrary.h
@@ -2,13 +2,7 @@
   Header file for the PeiCpuPolicyLib library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PEI_CPU_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPr=
eMem/CpuPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpu=
PolicyLibPreMem/CpuPrintPolicy.c
index 1807604405..d7ffd0b600 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Cp=
uPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Cp=
uPrintPolicy.c
@@ -2,13 +2,7 @@
   This file is PeiCpuPolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PeiCpuPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPr=
eMem/PeiCpuPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCp=
uPolicyLibPreMem/PeiCpuPolicyLib.c
index 7d27c0b6dc..35041322a7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Pe=
iCpuPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Pe=
iCpuPolicyLib.c
@@ -2,13 +2,7 @@
   This file is PeiCpuPolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PeiCpuPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPr=
eMem/PeiCpuPolicyLibPreMem.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Libra=
ry/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf
index df6e20baef..a18ea79147 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Pe=
iCpuPolicyLibPreMem.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Pe=
iCpuPolicyLibPreMem.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPr=
eMem/PeiCpuPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/P=
eiCpuPolicyLibPreMem/PeiCpuPolicyLibrary.h
index 8c039b4591..553b7a8ca9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Pe=
iCpuPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Pe=
iCpuPolicyLibrary.h
@@ -2,13 +2,7 @@
   Header file for the PeiCpuPolicyLib library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PEI_CPU_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatf=
ormLib/CpuPlatformLibrary.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/=
PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.c
index 830803a909..0cf2cc8a1f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/=
CpuPlatformLibrary.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/=
CpuPlatformLibrary.c
@@ -2,13 +2,7 @@
   CPU Platform Lib implementation.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatf=
ormLib/CpuPlatformLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/=
PeiDxeSmmCpuPlatformLib/CpuPlatformLibrary.h
index d5b8ed9ae4..3fcdbcb402 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/=
CpuPlatformLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/=
CpuPlatformLibrary.h
@@ -2,13 +2,7 @@
   Header file for Cpu Platform Lib implementation.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatf=
ormLib/PeiDxeSmmCpuPlatformLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/L=
ibrary/PeiDxeSmmCpuPlatformLib/PeiDxeSmmCpuPlatformLib.inf
index 2a123ae708..21d441a577 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/=
PeiDxeSmmCpuPlatformLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/=
PeiDxeSmmCpuPlatformLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmC=
puCommonLib/CpuCommonLib.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPr=
ivate/PeiDxeSmmCpuCommonLib/CpuCommonLib.c
index 100bd1464c..4fa713612b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommo=
nLib/CpuCommonLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommo=
nLib/CpuCommonLib.c
@@ -2,13 +2,7 @@
   CPU Common Lib implementation.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmC=
puCommonLib/PeiDxeSmmCpuCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Cp=
u/LibraryPrivate/PeiDxeSmmCpuCommonLib/PeiDxeSmmCpuCommonLib.inf
index 70d33ce354..e5c546d67a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommo=
nLib/PeiDxeSmmCpuCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommo=
nLib/PeiDxeSmmCpuCommonLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaPro=
tection.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProt=
ection.c
index bf272036c4..a255e7e514 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection=
.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection=
.c
@@ -2,13 +2,7 @@
   This file contains the tests for the BootFirmwareMediaProtection BIT
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c =
b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c
index e96535cf03..0a9d381a53 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/DebugModeDisabled.c
@@ -2,13 +2,7 @@
   This file contains the tests for the DebugModeDisabled Bit
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIn=
tegrity.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootInt=
egrity.c
index beca056028..d159039b35 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity=
.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity=
.c
@@ -2,13 +2,7 @@
   This file contains the tests for the HardwareRootedBootIntegrity bit
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c b/S=
ilicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
index e9a26cac80..3b40893266 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
@@ -2,13 +2,7 @@
   This file contains DXE driver for testing and publishing HSTI
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h b/S=
ilicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
index b2b48a2152..08094dbbc1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
@@ -2,13 +2,7 @@
   This file contains the required header files for the HSTI Silicon DXE dr=
iver
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf b=
/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
index 854343da38..52e3b6ceba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaP=
rotection.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDma=
Protection.c
index d45cc586ba..184ec609ba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtecti=
on.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtecti=
on.c
@@ -2,13 +2,7 @@
   This file contains the tests for the IntegratedDeviceDMAProtection bit
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcem=
ent.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c
index 6d88a64060..c05e6d6ec6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.c
@@ -2,13 +2,7 @@
   This file contains the tests for the MeasuredBootEnforcement BIT
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c b/Si=
licon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
index f1e7a8d946..bac52664b5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
@@ -2,13 +2,7 @@
   This file contains the mpservices helper functions
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfigurati=
on.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c
index 8abb3caf1f..68fda2d634 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.c
@@ -2,13 +2,7 @@
   This file contains the tests for the SecureCPUConfiguration bit
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGrap=
hicsConfiguration.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureInteg=
ratedGraphicsConfiguration.c
index c70ac41cf6..e53d45ee12 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsCon=
figuration.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsCon=
figuration.c
@@ -2,13 +2,7 @@
   This file contains the tests for the SecureIntegratedGraphics bit
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "HstiSiliconDxe.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfi=
guration.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfi=
guration.c
index 00dd3092a1..a3c9bbebea 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguratio=
n.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguratio=
n.c
@@ -2,13 +2,7 @@
   This file contains the tests for the SecureMemoryMapConfiguration bit
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfigurati=
on.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c
index 7274c5556a..2d73c26eb2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.c
@@ -2,13 +2,7 @@
   This file contains the tests for the SecuePCHConfiguration bit
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "HstiSiliconDxe.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentCon=
figuration.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentC=
onfiguration.c
index 2f498cd532..d08a85b87e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfigurat=
ion.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfigurat=
ion.c
@@ -2,13 +2,7 @@
   This file contains the tests for the SecureSystemAgentConfiguration bit
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate=
.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c
index 79dabc690e..aab48e02e6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SignedFirmwareUpdate.c
@@ -2,13 +2,7 @@
   This file contains the tests for the SignedFirmwareUpdate bit
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h b/Silic=
on/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
index 246582e9ee..dd91a55e79 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
@@ -2,13 +2,7 @@
   Header file for Config Block Lib implementation
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h b/Si=
licon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
index cdbe75ae18..12baf4e378 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
@@ -3,13 +3,7 @@
   including error string definitions
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.=
h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.h
index dc76e33557..d58b6d6458 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/AslUpdateLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLi=
b.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
index cc437b93bf..04c8ec5cca 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
@@ -2,13 +2,7 @@
   Header file for Config Block Lib implementation
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h b/=
Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h
index b4f8b41e1b..9049675679 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/MmPciLib.h
@@ -2,13 +2,7 @@
   Get Pci Express address library implementation.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUp=
dateLib.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpd=
ateLib.h
index 184b04f5de..7c9517bdb1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib=
.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib=
.h
@@ -2,13 +2,7 @@
   Header file for PEI SiPolicyUpdate Library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlock=
Lib.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h
index 56527478b4..1534eb59d0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.h
@@ -2,13 +2,7 @@
   Prototype of the SiConfigBlockLib library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h=
 b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h
index 98d3ad25e0..7bd26863b5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiPolicyLib.h
@@ -2,13 +2,7 @@
   Prototype of the SiPolicyLib library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLi=
b.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.h
index d10e7cf0b8..0028c9d911 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h b/Silicon/=
Intel/KabylakeSiliconPkg/Include/PcieRegs.h
index 3a3b22fd83..d91a450023 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/PcieRegs.h
@@ -11,13 +11,7 @@
     Definitions beginning with "N_" are the bit position
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h b/Sil=
icon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
index 6d2b857ac6..b8643b3ede 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
@@ -3,13 +3,7 @@
   init
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h b/Sili=
con/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
index 044dadc022..3088eb89e6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
@@ -5,13 +5,7 @@
   over to silicon DXE modules.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProt=
ocol.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol=
.h
index 91fcad80a0..ff3b92ba1b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.h
@@ -2,13 +2,7 @@
   Protocol used for specifying platform related Silicon information and po=
licy setting.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h b/Si=
licon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
index f1facc4300..375844e506 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
@@ -2,13 +2,7 @@
   Intel reference code configuration policies.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieIn=
itLib.h b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitL=
ib.h
index f8c3c3b43d..f800b78809 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h
@@ -2,13 +2,7 @@
   PCIe Initialization Library header file
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h =
b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h
index 676e5e433b..dbbcfa997c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/SiConfigHob.h
@@ -3,13 +3,7 @@
   related Intel silicon information and config setting.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat b/Si=
licon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
index 98d94cf310..c384ca0a1f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
+++ b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
@@ -1,13 +1,7 @@
 @REM @file
 @REM
 @REM Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-@REM This program and the accompanying materials
-@REM are licensed and made available under the terms and conditions of the=
 BSD License
-@REM which accompanies this distribution.  The full text of the license ma=
y be found at
-@REM http://opensource.org/licenses/bsd-license.php
-@REM
-@REM THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR =
IMPLIED.
+@REM SPDX-License-Identifier: BSD-2-Clause-Patent
 @REM
=20
 @call edksetup.bat
diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc b/Sili=
con/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc
index cbb2a8bec4..5b114ae99e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc
+++ b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.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 availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec b/=
Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
index 163bd429f8..0c013af8b6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
+++ b/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/Ba=
seConfigBlockLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlo=
ckLib/BaseConfigBlockLib.c
index a411547ccb..b9bd6f3a48 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfi=
gBlockLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfi=
gBlockLib.c
@@ -2,13 +2,7 @@
   Library functions for Config Block management.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <ConfigBlock.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/Ba=
seConfigBlockLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigB=
lockLib/BaseConfigBlockLib.inf
index f544c75a6c..646c5b189c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfi=
gBlockLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfi=
gBlockLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/=
BaseSiConfigBlockLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiCon=
figBlockLib/BaseSiConfigBlockLib.c
index 98ff9e3410..8596933549 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiC=
onfigBlockLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiC=
onfigBlockLib.c
@@ -3,13 +3,7 @@
   to config block header.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <ConfigBlock.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/=
BaseSiConfigBlockLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiC=
onfigBlockLib/BaseSiConfigBlockLib.inf
index 5961b1a6b2..c9a70c10c8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiC=
onfigBlockLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiC=
onfigBlockLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAs=
lUpdateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/Dxe=
AslUpdateLib.c
index ea85be4a11..e6ab43db6d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdate=
Lib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdate=
Lib.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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAs=
lUpdateLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/D=
xeAslUpdateLib.inf
index 0b24bbe71e..7a100128f3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdate=
Lib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdate=
Lib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/D=
xeAslUpdateLibNull.c b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdat=
eLibNull/DxeAslUpdateLibNull.c
index 834315d236..490a09ddb5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUp=
dateLibNull.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUp=
dateLibNull.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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/D=
xeAslUpdateLibNull.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpd=
ateLibNull/DxeAslUpdateLibNull.inf
index 3805dbf1dd..a3c8aef60a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUp=
dateLibNull.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUp=
dateLibNull.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitL=
ib/DxePolicyInit.c b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPol=
icyInitLib/DxePolicyInit.c
index ac870bee84..694c896879 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeP=
olicyInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeP=
olicyInit.c
@@ -2,13 +2,7 @@
   This file is SampleCode for Intel PEI Platform Policy initialization.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitL=
ib/DxeSaPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconP=
olicyInitLib/DxeSaPolicyInit.h
index ebc5023f7b..855a89fc23 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeS=
aPolicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeS=
aPolicyInit.h
@@ -2,13 +2,7 @@
   Header file for the SaPolicyInitDxe Driver.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SA_POLICY_INIT_DXE_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitL=
ib/DxeSiliconPolicyInitLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/D=
xeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf
index fbce84e78f..1997f43ab4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeS=
iliconPolicyInitLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeS=
iliconPolicyInitLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/Pei=
DxeSmmMmPciLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciL=
ib/PeiDxeSmmMmPciLib.c
index 3688872019..51a06528e0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmM=
mPciLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmM=
mPciLib.c
@@ -2,13 +2,7 @@
   This file contains routines that get PCI Express Address
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Library/BaseLib.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/Pei=
DxeSmmMmPciLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPc=
iLib/PeiDxeSmmMmPciLib.inf
index 24cae56d04..8ae40a0c9e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmM=
mPciLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmM=
mPciLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiP=
olicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiP=
olicyLib.c
index b7db139ded..813b868fcf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLi=
b.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLi=
b.c
@@ -3,13 +3,7 @@
   Policy and installs RC Policy PPI.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiP=
olicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiS=
iPolicyLib.inf
index 134f60be5e..1d992cfbbd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLi=
b.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLi=
b.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiP=
olicyLibPreMem.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/=
PeiSiPolicyLibPreMem.c
index 3f80b990e9..e0d83cb467 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLi=
bPreMem.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLi=
bPreMem.c
@@ -3,13 +3,7 @@
   Policy and installs RC Policy PPI.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiP=
olicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/Pe=
iSiPolicyLibrary.h
index 4c6ba6309d..f090e58868 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLi=
brary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLi=
brary.h
@@ -2,13 +2,7 @@
   Header file for the PeiSiPolicyLib library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrin=
tPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrint=
Policy.c
index 16cfb52565..623f30de45 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy=
.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy=
.c
@@ -2,13 +2,7 @@
   This file is PeiSiPolicyLib library for printing Policy settings.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ib/PeiPolicyInit.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPol=
icyInitLib/PeiPolicyInit.c
index c3a96e5ad2..0de415ad19 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiP=
olicyInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiP=
olicyInit.c
@@ -2,13 +2,7 @@
   This file is SampleCode for Intel PEI Platform Policy initialization.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ib/PeiPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPol=
icyInitLib/PeiPolicyInit.h
index e85724411a..c38294cfbe 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiP=
olicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiP=
olicyInit.h
@@ -2,13 +2,7 @@
   Header file for the PolicyInitPei PEIM.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ib/PeiPolicyInitPreMem.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSili=
conPolicyInitLib/PeiPolicyInitPreMem.c
index c402dee3a4..fd76b4fac3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiP=
olicyInitPreMem.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiP=
olicyInitPreMem.c
@@ -2,13 +2,7 @@
   This file is SampleCode for Intel PEI Platform Policy initialization.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ib/PeiSiPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconP=
olicyInitLib/PeiSiPolicyInit.h
index 4f4a80b9ae..47ede26b05 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiS=
iPolicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiS=
iPolicyInit.h
@@ -2,13 +2,7 @@
   Header file for the PeiSiPolicyInit
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ib/PeiSiliconPolicyInitLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/P=
eiSiliconPolicyInitLib/PeiSiliconPolicyInitLib.inf
index ac37f17eae..7982a5d87f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiS=
iliconPolicyInitLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiS=
iliconPolicyInitLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibDependency/PeiPostMemSiliconPolicyInitLibDependency.inf b/Silicon/Intel/K=
abylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPostMemSilic=
onPolicyInitLibDependency.inf
index 243a70f30d..2bca431712 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDepen=
dency/PeiPostMemSiliconPolicyInitLibDependency.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDepen=
dency/PeiPostMemSiliconPolicyInitLibDependency.inf
@@ -5,13 +5,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibDependency/PeiPreMemSiliconPolicyInitLibDependency.inf b/Silicon/Intel/Ka=
bylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPreMemSilicon=
PolicyInitLibDependency.inf
index fd54b0bf7d..45a30da9ac 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDepen=
dency/PeiPreMemSiliconPolicyInitLibDependency.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDepen=
dency/PeiPreMemSiliconPolicyInitLibDependency.inf
@@ -5,13 +5,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibDependency/PeiSiliconPolicyInitLibDependency.c b/Silicon/Intel/KabylakeSi=
liconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiSiliconPolicyInitLibD=
ependency.c
index 1db1582ff2..4c3be83c21 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDepen=
dency/PeiSiliconPolicyInitLibDependency.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDepen=
dency/PeiSiliconPolicyInitLibDependency.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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibFsp/PeiFspCpuPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/P=
eiSiliconPolicyInitLibFsp/PeiFspCpuPolicyInitLib.c
index 282f774831..72a797a0ea 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspCpuPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspCpuPolicyInitLib.c
@@ -2,13 +2,7 @@
   Implementation of Fsp PCH Policy Initialization.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibFsp/PeiFspMePolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/Pe=
iSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c
index d97bf8be57..e72a06f5d3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspMePolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspMePolicyInitLib.c
@@ -2,13 +2,7 @@
   Implementation of Fsp Me Policy Initialization.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibFsp/PeiFspMiscUpdInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/Pei=
SiliconPolicyInitLibFsp/PeiFspMiscUpdInitLib.c
index b9329e4c8a..6d1a982bfb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspMiscUpdInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspMiscUpdInitLib.c
@@ -2,13 +2,7 @@
   Implementation of Fsp Misc UPD Initialization.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibFsp/PeiFspPchPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/P=
eiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c
index 3f7e297c0b..46c143553c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspPchPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspPchPolicyInitLib.c
@@ -2,13 +2,7 @@
   Implementation of Fsp PCH Policy Initialization.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibFsp/PeiFspPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiS=
iliconPolicyInitLibFsp/PeiFspPolicyInitLib.c
index 4e82a0cc31..1136996684 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspPolicyInitLib.c
@@ -2,13 +2,7 @@
   Instance of Fsp Policy Initialization Library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibFsp/PeiFspPolicyInitLib.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiS=
iliconPolicyInitLibFsp/PeiFspPolicyInitLib.h
index a17b642a1d..52f20777ec 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspPolicyInitLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspPolicyInitLib.h
@@ -2,13 +2,7 @@
   Internal header file for Fsp Policy Initialization Library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibFsp/PeiFspSaPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/Pe=
iSiliconPolicyInitLibFsp/PeiFspSaPolicyInitLib.c
index 3d218f8ba9..51b72c360a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspSaPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspSaPolicyInitLib.c
@@ -2,13 +2,7 @@
   Implementation of Fsp SA Policy Initialization.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibFsp/PeiFspSiPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/Pe=
iSiliconPolicyInitLibFsp/PeiFspSiPolicyInitLib.c
index 49601b1496..bffabe61d0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspSiPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiFspSiPolicyInitLib.c
@@ -2,13 +2,7 @@
   Implementation of Fsp SI Policy Initialization.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibFsp/PeiPolicyInit.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSilicon=
PolicyInitLibFsp/PeiPolicyInit.c
index abed092c46..06210927d4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiPolicyInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiPolicyInit.c
@@ -2,13 +2,7 @@
   This file is SampleCode for Intel PEI Platform Policy initialization.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibFsp/PeiPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSilicon=
PolicyInitLibFsp/PeiPolicyInit.h
index e85724411a..c38294cfbe 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiPolicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiPolicyInit.h
@@ -2,13 +2,7 @@
   Header file for the PolicyInitPei PEIM.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibFsp/PeiPolicyInitLib.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSili=
conPolicyInitLibFsp/PeiPolicyInitLib.h
index b5a7f4eef3..ae289f884e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiPolicyInitLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiPolicyInitLib.h
@@ -2,13 +2,7 @@
   Header file for the PolicyInitPei Library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibFsp/PeiPolicyInitPreMem.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiS=
iliconPolicyInitLibFsp/PeiPolicyInitPreMem.c
index 35baba3183..ed391db583 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiPolicyInitPreMem.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiPolicyInitPreMem.c
@@ -2,13 +2,7 @@
   This file is SampleCode for Intel PEI Platform Policy initialization.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibFsp/PeiSiPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSilic=
onPolicyInitLibFsp/PeiSiPolicyInit.h
index 4f4a80b9ae..47ede26b05 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiSiPolicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiSiPolicyInit.h
@@ -2,13 +2,7 @@
   Header file for the PeiSiPolicyInit
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitL=
ibFsp/PeiSiliconPolicyInitLibFsp.inf b/Silicon/Intel/KabylakeSiliconPkg/Lib=
rary/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFsp.inf
index 7f0d7a5dec..9ffb84fa1e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiSiliconPolicyInitLibFsp.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/P=
eiSiliconPolicyInitLibFsp.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/Silico=
nInit.c b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconIn=
it.c
index 47ca04b98c..d09bec0489 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/Silico=
nInitLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/Sili=
conInitLib.inf
index f26eea6be6..9007f299bb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLi=
b.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLi=
b.inf
@@ -2,13 +2,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ###
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/Silico=
nInitPreMem.c b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/Sil=
iconInitPreMem.c
index bb21872e1e..65a67a6795 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPr=
eMem.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPr=
eMem.c
@@ -2,13 +2,7 @@
   Source code file for Platform Init Pre-Memory PEI module
=20
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiC=
onfig.h b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConf=
ig.h
index 2ec0d556b1..1d082d5854 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h
@@ -2,13 +2,7 @@
   ME config block for PEI phase
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _ME_PEI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolic=
yLib.h b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib=
.h
index 20afe4c46e..bca35e19d3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
@@ -2,13 +2,7 @@
   Prototype of the MePolicyLibPei library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PEI_ME_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h b/Sili=
con/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
index 11ee04ad12..2ea9da8c2c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
@@ -22,13 +22,7 @@
     as "_ME_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _ME_CHIPSET_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h b=
/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h
index 0243982c80..04d787a0f5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MePolicyCommon.h
@@ -2,13 +2,7 @@
   Definition for ME common policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _ME_POLICY_COMMON_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/Pei=
MePolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/=
PeiMePolicyLib.c
index 94a84a0478..31c7d59d1d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic=
yLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic=
yLib.c
@@ -2,13 +2,7 @@
   This file is PeiMePolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PeiMePolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/Pei=
MePolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLi=
b/PeiMePolicyLib.inf
index 3c6e325772..ea247181a4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic=
yLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic=
yLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/Pei=
MePolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicy=
Lib/PeiMePolicyLibrary.h
index 85e8e2b154..a908bb6c24 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic=
yLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic=
yLibrary.h
@@ -2,13 +2,7 @@
   Header file for the PeiMePolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PEI_ME_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiD=
efines.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDef=
ines.h
index 9cde7e862d..32507d4d11 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.a=
sl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
index b9809bd2ab..db97d4b20d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
@@ -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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 include("GpioLibObjects.asl")
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibOb=
jects.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObj=
ects.asl
index 1468aedba4..ba1bf8cb93 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.a=
sl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.a=
sl
@@ -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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.a=
sl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
index 51d88f1e5a..dfb09b95b0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
@@ -2,13 +2,7 @@
   ACPI DSDT table
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl b=
/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl
index 34f3f6877f..b655572a96 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/Pch.asl
@@ -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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTa=
bles.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTabl=
es.inf
index ec99fb847a..14d5b28c33 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.as=
l b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
index 151ee1fdd8..86a2523eed 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
@@ -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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.a=
sl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
index c79ee8d6cd..10f6c687b4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
@@ -2,13 +2,7 @@
   ACPI DSDT table for MEI1
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.as=
l b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
index 42f12ff266..b792109478 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
@@ -2,13 +2,7 @@
   ACPI DSDT table for ISH
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.as=
l b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
index 7c4a0cc23c..db3ca89608 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
@@ -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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.a=
sl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
index 8628735184..edffaf28d0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
@@ -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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPci=
eStorage.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstP=
cieStorage.asl
index 701cf6891a..a9d3756a74 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorag=
e.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorag=
e.asl
@@ -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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.a=
sl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
index d7f51f2b9b..17d32ade9d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
@@ -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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.as=
l b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
index 808c73e06c..2707ad3a0b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
@@ -2,13 +2,7 @@
   ACPI DSDT table for SCS Controllers
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerial=
Io.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.a=
sl
index f33ee887e7..deaf57400f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
@@ -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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.a=
sl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
index 54c1242178..432669a692 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
@@ -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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.a=
sl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
index 873246f662..d261973583 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
@@ -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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubD=
ebug.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDeb=
ug.asl
index a8e4f0b34c..35a2232bc4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl
@@ -2,13 +2,7 @@
  Trace Hub debug library for ASL code.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.as=
l b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
index 5036b4b771..acb948f699 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
@@ -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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2C=
onfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Conf=
ig.h
index 187d4cd506..a3e15daede 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h
@@ -2,13 +2,7 @@
   CIO2 policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _CIO2_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciCo=
nfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig=
.h
index aba0677abc..37cb469db6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.h
@@ -2,13 +2,7 @@
   Dci policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _DCI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiCo=
nfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig=
.h
index 2fd5d1b171..e8ff6d91d6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.h
@@ -2,13 +2,7 @@
   DMI policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _DMI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiC=
onfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConf=
ig.h
index c952bf9f31..c00e5a81be 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h
@@ -2,13 +2,7 @@
   Espi policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _ESPI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Flash=
ProtectionConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlo=
ck/FlashProtectionConfig.h
index b55aaa705a..77f43a80fc 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtect=
ionConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtect=
ionConfig.h
@@ -2,13 +2,7 @@
   FlashProtection policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _FLASH_PROTECTION_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAud=
ioConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAud=
ioConfig.h
index a0ebbbd84d..6498d84646 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfi=
g.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfi=
g.h
@@ -2,13 +2,7 @@
   HDAUDIO policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _HDAUDIO_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetC=
onfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConf=
ig.h
index 30928e5d08..7c2721a3cb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h
@@ -2,13 +2,7 @@
   HPET policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _HPET_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioC=
onfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConf=
ig.h
index e4973fc25e..a463d40814 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h
@@ -2,13 +2,7 @@
   HSIO policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _HSIO_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioP=
cieConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Hsio=
PcieConfig.h
index cf7bd6251a..c4043bee3e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConf=
ig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConf=
ig.h
@@ -2,13 +2,7 @@
   HSIO pcie policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _HSIO_PCIE_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioS=
ataConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Hsio=
SataConfig.h
index 53c1a01a17..fb1c2fa279 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConf=
ig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConf=
ig.h
@@ -2,13 +2,7 @@
   Hsio Sata policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _HSIO_SATA_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Inter=
ruptConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Int=
erruptConfig.h
index 3b8e247a31..6a032dbe0b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptCon=
fig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptCon=
fig.h
@@ -2,13 +2,7 @@
   Interrupt policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _INTERRUPT_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApi=
cConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApic=
Config.h
index c96e3a3a04..603b876fb8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig=
.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig=
.h
@@ -2,13 +2,7 @@
   IoApic policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _IOAPIC_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshCo=
nfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig=
.h
index 6a4f6c9ee0..6ffdb0946f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.h
@@ -2,13 +2,7 @@
   ISH policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _ISH_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanCo=
nfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig=
.h
index 980f3ac709..873a131e61 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.h
@@ -2,13 +2,7 @@
   Lan policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _LAN_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockD=
ownConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Lock=
DownConfig.h
index f083b3b50c..4f7526f3eb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConf=
ig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConf=
ig.h
@@ -2,13 +2,7 @@
   Lock down policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _LOCK_DOWN_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcCo=
nfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig=
.h
index be1613a5c2..85fb80c403 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.h
@@ -2,13 +2,7 @@
   Lpc policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _LPC_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbC=
onfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConf=
ig.h
index 60b9828ebf..5a61e10299 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h
@@ -2,13 +2,7 @@
   P2sb policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _P2SB_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGe=
neralConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Pc=
hGeneralConfig.h
index c946e9a116..9873061049 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralCo=
nfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralCo=
nfig.h
@@ -2,13 +2,7 @@
   PCH General policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_GENERAL_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieR=
pConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRp=
Config.h
index 873386afe7..d3d92378bd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig=
.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig=
.h
@@ -2,13 +2,7 @@
   Pcie root port policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_PCIE_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmCon=
fig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h
index f483987c97..fc899ab864 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.h
@@ -2,13 +2,7 @@
   Power Management policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port6=
1Config.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61=
Config.h
index d8b9cf6145..aa897d0e86 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config=
.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config=
.h
@@ -2,13 +2,7 @@
   Port 61h policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PORT_61_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataC=
onfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConf=
ig.h
index 0dc76e0c23..368e470af8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h
@@ -2,13 +2,7 @@
   Sata policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SATA_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsCo=
nfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig=
.h
index 05a2f5dbfa..ba8ab17429 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.h
@@ -2,13 +2,7 @@
   Scs policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SCS_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Seria=
lIoConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Seri=
alIoConfig.h
index 5caa24310a..529c89f3bf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConf=
ig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConf=
ig.h
@@ -2,13 +2,7 @@
   Serial IO policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SERIAL_IO_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Seria=
lIrqConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Ser=
ialIrqConfig.h
index b64579cd92..38ab7ca013 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqCon=
fig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqCon=
fig.h
@@ -2,13 +2,7 @@
   Serial IRQ policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SERIAL_IRQ_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Smbus=
Config.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusCo=
nfig.h
index 78ac72aa87..c2f5b07636 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h
@@ -2,13 +2,7 @@
   Smbus policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SMBUS_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiCo=
nfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig=
.h
index 688fa314cb..e97f88cf71 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.h
@@ -2,13 +2,7 @@
   Spi policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SPI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Therm=
alConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Therm=
alConfig.h
index 8963da6ee7..b64948ac05 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfi=
g.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfi=
g.h
@@ -2,13 +2,7 @@
   Thermal policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _THERMAL_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Trace=
HubConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Trac=
eHubConfig.h
index 5455c40514..a284dd3840 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConf=
ig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConf=
ig.h
@@ -2,13 +2,7 @@
   Trace Hub policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _TRACEHUB_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbCo=
nfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig=
.h
index c2cef0aa43..0936e8321a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.h
@@ -2,13 +2,7 @@
   USB policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _USB_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Watch=
DogConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Watc=
hDogConfig.h
index 610c1092fb..a01481af64 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConf=
ig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConf=
ig.h
@@ -2,13 +2,7 @@
   WatchDog policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _WATCH_DOG_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h b/Si=
licon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
index 8b26020da2..9967241df3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
@@ -2,13 +2,7 @@
   Header file for GpioConfig structure used by GPIO library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _GPIO_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h b/=
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h
index 5230656791..c8629ab12e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklH.h
@@ -2,13 +2,7 @@
   GPIO pins for SKL-PCH-H,
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _GPIO_PINS_SKL_H_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h b=
/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h
index 999b417011..73a982b240 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioPinsSklLp.h
@@ -2,13 +2,7 @@
   GPIO pins for SKL-PCH-LP,
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _GPIO_PINS_SKL_LP_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h=
 b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h
index 5362beeea3..30ac4abc8b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioLib.h
@@ -7,13 +7,7 @@
          returned in this case will be 0xFF.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _GPIO_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativ=
eLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib=
.h
index 5f2c57fd34..dab6708971 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.h
@@ -3,13 +3,7 @@
   All function in this library is available for PEI, DXE, and SMM,
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _GPIO_NATIVE_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.=
h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h
index 9f5da64dff..b58c0d7acd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/OcWdtLib.h
@@ -2,13 +2,7 @@
   Header file for OC WDT Library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _OC_WDT_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleD=
ecodingLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycl=
eDecodingLib.h
index 8247f8f3c8..1b24e94f74 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecoding=
Lib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecoding=
Lib.h
@@ -2,13 +2,7 @@
   Header file for PchCycleDecodingLib.
=20
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_CYCLE_DECODING_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLi=
b.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h
index 2096645375..479a4cc375 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.h
@@ -3,13 +3,7 @@
   All function in this library is available for PEI, DXE, and SMM,
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib=
.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h
index 5461286634..9fa03a98c7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchGbeLib.h
@@ -2,13 +2,7 @@
   Header file for PchGbeLib.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_GBE_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLi=
b.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h
index 65076800a9..9b775b3ce5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.h
@@ -2,13 +2,7 @@
   Header file for PchHsioLib.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_HSIO_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLi=
b.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h
index 5902b92f18..8b0c123048 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.h
@@ -2,13 +2,7 @@
   Header file for PchInfoLib.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_INFO_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLi=
b.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h
index 8083ac4efd..6161016312 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.h
@@ -2,13 +2,7 @@
   Header file for PchP2sbLib.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_P2SB_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRp=
Lib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h
index d5084772dd..1975465841 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.h
@@ -2,13 +2,7 @@
   Header file for PchPcieRpLib.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_PCIERP_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib=
.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h
index 149168993f..968e59e412 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcrLib.h
@@ -2,13 +2,7 @@
   Header file for PchPcrLib.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_PCR_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib=
.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h
index 61a955802a..ec98e07100 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPmcLib.h
@@ -2,13 +2,7 @@
   Header file for PchPmcLib.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_PMC_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicy=
Lib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h
index f4e3659960..cd7622e00c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.h
@@ -2,13 +2,7 @@
   Prototype of the PeiPchPolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PEI_PCH_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib=
.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h
index 4a2924f8f6..a2b4a9c2bc 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPsfLib.h
@@ -4,13 +4,7 @@
   It's not expected to be used in platform code.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_PSF_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetL=
ib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h
index 448cd21f50..6a2c57a202 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.h
@@ -2,13 +2,7 @@
   Header file for PCH RESET Driver.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_RESET_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAcc=
essLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAcces=
sLib.h
index 87d3318260..a11cc224e7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h
@@ -2,13 +2,7 @@
   Header file for PchSbiAccessLib.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_SBI_ACCESS_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerial=
IoLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoL=
ib.h
index 4ee5a9713e..6b2ba73061 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h
@@ -2,13 +2,7 @@
   Header file for PCH Serial IO Lib implementation.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_SERIAL_IO_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerial=
IoUartLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSeria=
lIoUartLib.h
index 66c5945a7b..ac729c2bcf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartL=
ib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartL=
ib.h
@@ -2,13 +2,7 @@
   Header file for PCH Serial IO UART Lib implementation.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_SERIAL_IO_UART_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmCon=
trolLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmCont=
rolLib.h
index cdeeae5e6d..6cca4b7cb4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib=
.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib=
.h
@@ -2,13 +2,7 @@
   Header file for SMM Control PEI Library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_SMM_CONTROL_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCom=
monLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommo=
nLib.h
index f89e42a546..fde5d785c8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.h
@@ -2,13 +2,7 @@
   Library that contains common parts of WdtPei and WdtDxe. Not a standalon=
e module.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_WDT_COMMON_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib=
.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h
index ba9586a7a2..fc7b42889f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SecPchLib.h
@@ -3,13 +3,7 @@
   All function in this library is available for SEC
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SEC_PCH_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashC=
ommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashC=
ommonLib.h
index 12dfaeb440..0c5e72258c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLi=
b.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLi=
b.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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h =
b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h
index 6af66f8869..c3a64eab90 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiLib.h
@@ -2,13 +2,7 @@
   Library to initialize SPI services for future SPI accesses.
=20
 Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubI=
nitLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubIni=
tLib.h
index 23cb544d67..85e4e32d23 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h
@@ -4,13 +4,7 @@
   But do not support UEFI RUNTIME environment call.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _TRACE_HUB_INIT_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h b/Sil=
icon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
index 2c457e3a1e..399f618c70 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
@@ -2,13 +2,7 @@
   Macros that simplify accessing PCH devices's PCI registers.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_ACCESS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h b/Sil=
icon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
index 905a4778ce..710ae04aee 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
@@ -2,13 +2,7 @@
   Build time limits of PCH resources.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_LIMITS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDet=
ectHob.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetec=
tHob.h
index 664f66f296..f28c3c2804 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h
@@ -3,13 +3,7 @@
   Definitions required to create PcieStorageInfoHob
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h=
 b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h
index 67b255fe97..807bf3c10b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPolicyCommon.h
@@ -2,13 +2,7 @@
   PCH configuration based on PCH policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_POLICY_COMMON_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCo=
mmon.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon=
.h
index 8bd4c9b960..1b492b9fe9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.h
@@ -2,13 +2,7 @@
   PCH configuration based on PCH policy
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_PREMEM_POLICY_COMMON_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResour=
ces.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h
index e5de75c0e3..d54d8736c4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.h
@@ -2,13 +2,7 @@
   PCH preserved MMIO resource definitions.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_PRESERVED_RESOURCES_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformS=
pecific.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSp=
ecific.h
index c19677cccd..ff49f818ca 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific=
.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific=
.h
@@ -2,13 +2,7 @@
   PCH Reset Platform Specific definitions.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_RESET_PLATFORM_SPECIFIC_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h b/=
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h
index 951dac00dc..bb66f5dfde 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/PchReset.h
@@ -2,13 +2,7 @@
   PCH Reset PPI
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h b/Silic=
on/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
index cd98f3601c..e11f82edca 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
@@ -3,13 +3,7 @@
   Intel(R) PCH SPI Host Controller Compatibility Interface.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_SPI_PPI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h b/Silic=
on/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
index b0bb6bccbd..a97be47abb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
@@ -2,13 +2,7 @@
   Watchdog Timer PPI
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PEI_WDT_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiS=
miDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcp=
iSmiDispatch.h
index eb08a89f00..68f76fc411 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispa=
tch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispa=
tch.h
@@ -2,13 +2,7 @@
   APIs of PCH ACPI SMI Dispatch Protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_ACPI_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcT=
uning.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuni=
ng.h
index ad1db3833a..4423cc1c79 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h
@@ -2,13 +2,7 @@
   PCH eMMC HS400 Tuning Protocol
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_EMMC_TUNING_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiS=
miDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEsp=
iSmiDispatch.h
index 7d7d3a5339..f3e2e05eda 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispa=
tch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispa=
tch.h
@@ -2,13 +2,7 @@
   SmmEspiDispatch Protocol
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_ESPI_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioU=
nlockSmiDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/=
PchGpioUnlockSmiDispatch.h
index 392733117b..4df549ec31 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSm=
iDispatch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSm=
iDispatch.h
@@ -2,13 +2,7 @@
   APIs of PCH GPIO UNLOCK SMI Dispatch Protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_GPIO_UNLOCK_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.=
h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h
index ff81aebddf..312269e74b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchInfo.h
@@ -2,13 +2,7 @@
   This file defines the PCH Info Protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_INFO_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieS=
miDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPci=
eSmiDispatch.h
index b80597ae9b..cff66f4366 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispa=
tch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispa=
tch.h
@@ -2,13 +2,7 @@
   APIs of PCH PCIE SMI Dispatch Protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_PCIE_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset=
.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h
index b39543b36e..b2911ade7e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchReset.h
@@ -2,13 +2,7 @@
   PCH Reset Protocol
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_RESET_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDi=
spatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDisp=
atch.h
index 4f0508b238..3e301cb66d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h
@@ -2,13 +2,7 @@
   APIs of PCH SMI Dispatch Protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIo=
TrapControl.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSm=
mIoTrapControl.h
index 5d0a4d34cf..d94dc2c480 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapCon=
trol.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapCon=
trol.h
@@ -2,13 +2,7 @@
   PCH SMM IO Trap Control Protocol
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_SMM_IO_TRAP_CONTROL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPe=
riodicTimerControl.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protoco=
l/PchSmmPeriodicTimerControl.h
index 95c680e75c..4e2c73e28d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicT=
imerControl.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicT=
imerControl.h
@@ -2,13 +2,7 @@
   PCH SMM Periodic Timer Control Protocol
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_SMM_PERIODIC_TIMER_CONTROL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSm=
iDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoS=
miDispatch.h
index 457cdb682c..60c627f778 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispat=
ch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispat=
ch.h
@@ -2,13 +2,7 @@
   APIs of PCH TCO SMI Dispatch Protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_TCO_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGp=
io.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h
index 4bc396132d..22663ce8d9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.h
@@ -3,13 +3,7 @@
   Intel(R) Serial Data over GPIO Pin functionality Protocol Interface.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_SERIAL_GPIO_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h b/=
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
index e4ce8fb472..8c66e5063f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Spi.h
@@ -3,13 +3,7 @@
   Intel(R) PCH SPI Host Controller Compatibility Interface.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_SPI_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h b/=
Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h
index 4a65e016e6..171fe8aebc 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/Wdt.h
@@ -2,13 +2,7 @@
   Watchdog Timer protocol
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _DXE_WDT_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsC=
am.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h
index c4be5c27e7..0e16b63d29 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_CAM_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsD=
ci.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h
index d38bd7f0c4..72b4d086e2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_DCI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsD=
mi.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h
index 942aeda324..c94a384c79 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_DMI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsF=
ia.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h
index c9e08ca854..537e83c25a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_FIA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsG=
pio.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h
index a6b2c4a8e5..a8649a23a1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_GPIO_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsH=
da.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h
index 1d5c0e9e76..c598c3b439 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_HDA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsH=
sio.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h
index faa938e5a5..635320056e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.h
@@ -2,13 +2,7 @@
   Register definition for HSIO
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_HSIO_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsI=
sh.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h
index 687a153f30..4cf546b288 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_ISH_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsI=
tss.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h
index 21269155b5..45ba22490e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_ITSS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsL=
an.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h
index bb4c2c15a9..974ca27c26 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_LAN_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsL=
pc.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h
index 7c6f639260..052680e9f0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_LPC_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP=
2sb.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h
index b2779ab0ce..7619bf27cd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_P2SB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP=
cie.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h
index 704f77c52f..0a1530743f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_PCIE_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP=
cr.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h
index eac209a149..49aa13b52b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_PCR_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP=
mc.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h
index d4c048ffe3..91b4a5f9a6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_PMC_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP=
sf.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h
index c52f1e721d..ba5c5ce26b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_PSF_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP=
sth.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h
index b312f7100e..0e599fef2b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_PSTH_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsS=
ata.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h
index 88d066ea28..5f62bb538d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_SATA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsS=
cs.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h
index b1872adbe6..7af90cfe0c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_SCS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsS=
erialIo.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSe=
rialIo.h
index 461b935fde..eab67649ee 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo=
.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo=
.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_SERIAL_IO_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsS=
mbus.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus=
.h
index 9682040879..d52133fa3a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_SMBUS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsS=
pi.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h
index f43c676797..6d7bf8f59a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_SPI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsT=
hermal.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThe=
rmal.h
index fe43d210ab..cdeaaab6a4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_THERMAL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsT=
raceHub.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTr=
aceHub.h
index 513b022f08..53526c8753 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub=
.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub=
.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsU=
sb.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h
index 7dfe90815f..56a864cf4b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.h
@@ -22,13 +22,7 @@
     as "_PCH_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_REGS_USB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/Dx=
ePchHdaNhlt.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library=
/DxePchHdaNhlt.h
index 5e7674a412..366b9d6707 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHda=
Nhlt.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHda=
Nhlt.h
@@ -2,13 +2,7 @@
   Header file for DxePchHdaLib - NHLT structure definitions.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/Gp=
ioPrivateLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Librar=
y/GpioPrivateLib.h
index f555182bc4..395d009adf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPriva=
teLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPriva=
teLib.h
@@ -3,13 +3,7 @@
   All function in this library is available for PEI, DXE, and SMM,
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _GPIO_PRIVATE_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2=
cMasterCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Li=
brary/I2cMasterCommonLib.h
index 8f0a1adf38..9c8335861d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMaster=
CommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMaster=
CommonLib.h
@@ -2,13 +2,7 @@
  Implement the I2C port control.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/Pc=
hHdaLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/Pch=
HdaLib.h
index f3f7c27340..e7d5fdc3dc 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib=
.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib=
.h
@@ -2,13 +2,7 @@
   This library provides PCH HD Audio functions.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/Pc=
hInitCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Libr=
ary/PchInitCommonLib.h
index 8c016c624f..449b38f111 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitCo=
mmonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitCo=
mmonLib.h
@@ -2,13 +2,7 @@
   Header file for PCH Init Common Lib
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_INIT_COMMON_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/Pc=
hPciExpressHelpersLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePriva=
te/Library/PchPciExpressHelpersLib.h
index 49c89a2fcc..2c800ca8e0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExp=
ressHelpersLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExp=
ressHelpersLib.h
@@ -2,13 +2,7 @@
   Header file for PCH PCI Express helpers library
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_PCI_EXPRESS_HELPERS_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/Pc=
hPsfPrivateLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Libr=
ary/PchPsfPrivateLib.h
index ad390103ce..e72cc87a27 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPri=
vateLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPri=
vateLib.h
@@ -2,13 +2,7 @@
   Header file for PchPsfPrivateLib.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_PSF_PRIVATE_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/Pc=
hSmbusCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Lib=
rary/PchSmbusCommonLib.h
index 5c2a6c30e2..e6494a1a38 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusC=
ommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusC=
ommonLib.h
@@ -2,13 +2,7 @@
   PCH Smbus Protocol
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_SMBUS_COMMON_LIB_H
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/Pc=
hSpiCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Libra=
ry/PchSpiCommonLib.h
index 8b6b6a6c97..d408289ea2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCom=
monLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCom=
monLib.h
@@ -2,13 +2,7 @@
   Header file for the PCH SPI Common Driver.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_SPI_COMMON_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/Pe=
iI2cMasterLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Libra=
ry/PeiI2cMasterLib.h
index da4cfc6d19..78c07f20c6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMas=
terLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMas=
terLib.h
@@ -2,13 +2,7 @@
   PEI I2C Master module
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/Rs=
tPrivateLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library=
/RstPrivateLib.h
index 2301c9fc0f..28edfda991 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivat=
eLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivat=
eLib.h
@@ -2,13 +2,7 @@
   Header file for Rst Library
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigH=
ob.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h
index fb372e92ac..9827beb085 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.h
@@ -2,13 +2,7 @@
   The GUID definition for PchConfigHob
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_CONFIG_HOB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndp=
oints.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoin=
ts.h
index 97f7be6c11..4c3f1795c0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h
@@ -2,13 +2,7 @@
   Header file for PchHdaLib Endpoint descriptors.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/P=
chNvs.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchN=
vs.h
index ac288a56d0..b071061883 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h
@@ -2,13 +2,7 @@
   This file defines the PCH NVS Protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_NVS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/P=
chNvsArea.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/=
PchNvsArea.h
index 66c119f577..c82498bde5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsAr=
ea.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsAr=
ea.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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/P=
cieIoTrap.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/=
PcieIoTrap.h
index 26d13b7a7d..8e05dd2c0a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTr=
ap.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTr=
ap.h
@@ -2,13 +2,7 @@
   This file defines the PCH PCIE IoTrap Protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_PCIE_IOTRAP_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLi=
b/BaseResetSystemLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseR=
esetSystemLib/BaseResetSystemLib.c
index f6f708172e..0fddff71a1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseR=
esetSystemLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseR=
esetSystemLib.c
@@ -2,13 +2,7 @@
   System reset library services.
=20
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Uefi.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLi=
b/BaseResetSystemLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/Bas=
eResetSystemLib/BaseResetSystemLib.inf
index 2af43b5091..4c46216b44 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseR=
esetSystemLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseR=
esetSystemLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/Base=
SmbusLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/Base=
SmbusLib.c
index 17e42dfd0b..5d09e18613 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLi=
b.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLi=
b.c
@@ -2,13 +2,7 @@
   PCH SMBUS library implementation built upon I/O library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/Base=
SmbusLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/Ba=
seSmbusLib.inf
index a737f7105f..2894d137b9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLi=
b.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLi=
b.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib=
/DxeResetSystemLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRese=
tSystemLib/DxeResetSystemLib.c
index c591bdddef..51facacf08 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeRes=
etSystemLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeRes=
etSystemLib.c
@@ -2,13 +2,7 @@
   System reset library services.
=20
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib=
/DxeResetSystemLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRe=
setSystemLib/DxeResetSystemLib.inf
index 1736c3189e..aa8877140a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeRes=
etSystemLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeRes=
etSystemLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSy=
stemLib/DxeRuntimeResetSystemLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/L=
ibrary/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.c
index 2bd8828836..9d09b3681b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib=
/DxeRuntimeResetSystemLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib=
/DxeRuntimeResetSystemLib.c
@@ -2,13 +2,7 @@
   System reset library services.
=20
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSy=
stemLib/DxeRuntimeResetSystemLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch=
/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.inf
index 801876dd93..6b27661603 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib=
/DxeRuntimeResetSystemLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib=
/DxeRuntimeResetSystemLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/=
GpioInit.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/=
GpioInit.c
index 6e0c1c8b46..5d4d758e57 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioIni=
t.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioIni=
t.c
@@ -2,13 +2,7 @@
   This file contains routines for GPIO initialization
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "GpioLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/=
GpioLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/G=
pioLib.c
index bf76d40963..9679f657f3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib=
.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib=
.c
@@ -2,13 +2,7 @@
   This file contains routines for GPIO
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "GpioLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/=
GpioLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioL=
ib/GpioLibrary.h
index 97a5287067..ed4f2f8023 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib=
rary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib=
rary.h
@@ -2,13 +2,7 @@
   Header file for GPIO Lib implementation.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _GPIO_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/=
GpioNativeLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpi=
oLib/GpioNativeLib.c
index e57e3ecbfa..a4f6466ed4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNat=
iveLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNat=
iveLib.c
@@ -2,13 +2,7 @@
   This file contains routines for GPIO native and chipset specific usage
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "GpioLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/=
PchSklGpioData.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGp=
ioLib/PchSklGpioData.c
index c36792139c..42f57df921 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklG=
pioData.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklG=
pioData.c
@@ -2,13 +2,7 @@
   This file contains SKL specific GPIO information
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "GpioLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/=
PeiDxeSmmGpioLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeS=
mmGpioLib/PeiDxeSmmGpioLib.inf
index 747fa67199..1282118d55 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeS=
mmGpioLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeS=
mmGpioLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycle=
DecodingLib/PchCycleDecodingLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Li=
brary/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c
index 1f13b094fc..540e5ba116 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin=
gLib/PchCycleDecodingLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin=
gLib/PchCycleDecodingLib.c
@@ -2,13 +2,7 @@
   PCH cycle deocding configuration and query library.
=20
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycle=
DecodingLib/PeiDxeSmmPchCycleDecodingLib.inf b/Silicon/Intel/KabylakeSilico=
nPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.=
inf
index 446703d918..24d08f662f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin=
gLib/PeiDxeSmmPchCycleDecodingLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin=
gLib/PeiDxeSmmPchCycleDecodingLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLi=
b/PchGbeLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGb=
eLib/PchGbeLib.c
index 277923bdcc..d3bdfd2fc8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGb=
eLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGb=
eLib.c
@@ -4,13 +4,7 @@
   But do not support UEFI RUNTIME environment call.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLi=
b/PeiDxeSmmPchGbeLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/Pei=
DxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf
index b05d82fce1..bfcb71ec20 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDx=
eSmmPchGbeLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDx=
eSmmPchGbeLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioL=
ib/PchHsioLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPch=
HsioLib/PchHsioLib.c
index d3e6094954..d7483ebd97 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchH=
sioLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchH=
sioLib.c
@@ -4,13 +4,7 @@
   But do not support UEFI RUNTIME environment call.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioL=
ib/PeiDxeSmmPchHsioLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/P=
eiDxeSmmPchHsioLib/PeiDxeSmmPchHsioLib.inf
index f233f3e673..11a32ad78e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiD=
xeSmmPchHsioLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiD=
xeSmmPchHsioLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoL=
ib/PchInfoLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPch=
InfoLib/PchInfoLib.c
index 3f72e006c8..a1c20ba04f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchI=
nfoLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchI=
nfoLib.c
@@ -5,13 +5,7 @@
   But do not support UEFI RUNTIME environment call.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoL=
ib/PchInfoStrLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmm=
PchInfoLib/PchInfoStrLib.c
index 6fb06eac2f..05b8587263 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchI=
nfoStrLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchI=
nfoStrLib.c
@@ -5,13 +5,7 @@
   But do not support UEFI RUNTIME environment call.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoL=
ib/PeiDxeSmmPchInfoLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/P=
eiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf
index 35566d8243..44d56ea838 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiD=
xeSmmPchInfoLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiD=
xeSmmPchInfoLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbL=
ib/PchP2sbLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPch=
P2sbLib/PchP2sbLib.c
index dba89d3edc..ca3a222979 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP=
2sbLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP=
2sbLib.c
@@ -4,13 +4,7 @@
   But do not support UEFI RUNTIME environment call.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbL=
ib/PeiDxeSmmPchP2sbLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/P=
eiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf
index 115175f8a2..da3390c4ca 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiD=
xeSmmPchP2sbLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiD=
xeSmmPchP2sbLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieR=
pLib/PchPcieRpLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSm=
mPchPcieRpLib/PchPcieRpLib.c
index 6b8a51d8d2..43caf3e9bd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pc=
hPcieRpLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pc=
hPcieRpLib.c
@@ -4,13 +4,7 @@
   But do not support UEFI RUNTIME environment call.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieR=
pLib/PeiDxeSmmPchPcieRpLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Libra=
ry/PeiDxeSmmPchPcieRpLib/PeiDxeSmmPchPcieRpLib.inf
index 79ddb969ae..6b22411162 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pe=
iDxeSmmPchPcieRpLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pe=
iDxeSmmPchPcieRpLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLi=
b/PchPcrLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPc=
rLib/PchPcrLib.c
index e2585c36e0..b07a903d44 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPc=
rLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPc=
rLib.c
@@ -4,13 +4,7 @@
   But do not support UEFI RUNTIME environment call.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLi=
b/PeiDxeSmmPchPcrLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/Pei=
DxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf
index fdc523143f..2de45d5240 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDx=
eSmmPchPcrLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDx=
eSmmPchPcrLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLi=
b/PchPmcLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPm=
cLib/PchPmcLib.c
index 1985d5d133..790af0a7a1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchPm=
cLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchPm=
cLib.c
@@ -4,13 +4,7 @@
   But do not support UEFI RUNTIME environment call.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLi=
b/PeiDxeSmmPchPmcLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/Pei=
DxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf
index bd3a33ff70..8b46a59b67 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDx=
eSmmPchPmcLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDx=
eSmmPchPmcLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLi=
b/PchPsfLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPs=
fLib/PchPsfLib.c
index 08a28f7e6d..a6f484f47b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPs=
fLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPs=
fLib.c
@@ -2,13 +2,7 @@
   This file contains PSF routines
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLi=
b/PeiDxeSmmPchPsfLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/Pei=
DxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf
index 941f5a72dd..82db84c539 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDx=
eSmmPchPsfLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDx=
eSmmPchPsfLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAc=
cessLib/PchSbiAccessLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/Pe=
iDxeSmmPchSbiAccessLib/PchSbiAccessLib.c
index 9434b7f236..85a699689e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib=
/PchSbiAccessLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib=
/PchSbiAccessLib.c
@@ -2,13 +2,7 @@
   PCH SBI access library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAc=
cessLib/PeiDxeSmmPchSbiAccessLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch=
/Library/PeiDxeSmmPchSbiAccessLib/PeiDxeSmmPchSbiAccessLib.inf
index 38ca8dce0e..be8b2f55dc 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib=
/PeiDxeSmmPchSbiAccessLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib=
/PeiDxeSmmPchSbiAccessLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSeria=
lIoLib/PeiDxeSmmPchSerialIoLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Lib=
rary/PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.c
index 7d24ed1269..03e2c60a5e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/=
PeiDxeSmmPchSerialIoLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/=
PeiDxeSmmPchSerialIoLib.c
@@ -4,13 +4,7 @@
   But do not support UEFI RUNTIME environment call.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSeria=
lIoLib/PeiDxeSmmPchSerialIoLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/L=
ibrary/PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.inf
index 28ee07ee15..fc25c3001d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/=
PeiDxeSmmPchSerialIoLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/=
PeiDxeSmmPchSerialIoLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCo=
mmonLib/PeiDxeSmmPchWdtCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch=
/Library/PeiDxeSmmPchWdtCommonLib/PeiDxeSmmPchWdtCommonLib.inf
index 723ad14ced..95e4893d6c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib=
/PeiDxeSmmPchWdtCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib=
/PeiDxeSmmPchWdtCommonLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCo=
mmonLib/WdtCommon.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSm=
mPchWdtCommonLib/WdtCommon.c
index 00a2fef78d..50d2dd638e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib=
/WdtCommon.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib=
/WdtCommon.c
@@ -2,13 +2,7 @@
   Library that contains common parts of WdtPei and WdtDxe. Not a standalon=
e module.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Uefi/UefiBaseType.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOc=
WdtLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWd=
tLib.c
index 0996b02ea6..e8c8dab6e7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
@@ -2,13 +2,7 @@
   The PEI Library Implements OcWdt Support.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOc=
WdtLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOc=
WdtLib.inf
index a2b8f71784..32a1df1b64 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.=
inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.=
inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/P=
eiOcWdtLibNull.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib=
Null/PeiOcWdtLibNull.c
index fdde6803c3..ccd6c73599 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdt=
LibNull.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdt=
LibNull.c
@@ -2,13 +2,7 @@
   The Null PEI Library Implements OcWdt Support.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/P=
eiOcWdtLibNull.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtL=
ibNull/PeiOcWdtLibNull.inf
index 93c951d49c..dbe58c6acd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdt=
LibNull.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdt=
LibNull.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/P=
chPreMemPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPch=
PolicyLib/PchPreMemPrintPolicy.c
index 650d414247..b7fcb0944e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMe=
mPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMe=
mPrintPolicy.c
@@ -2,13 +2,7 @@
   Print whole PCH_PREMEM_POLICY_PPI
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/P=
chPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicy=
Lib/PchPrintPolicy.c
index 13a8f9fbd6..72a78e5faf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrint=
Policy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrint=
Policy.c
@@ -2,13 +2,7 @@
   Print whole PCH_POLICY_PPI
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/P=
chSamplePolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPo=
licyLib/PchSamplePolicyLib.c
index 4e57b72d6e..62b621ce2f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSampl=
ePolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSampl=
ePolicyLib.c
@@ -2,13 +2,7 @@
   This file is to load sample board policy.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/P=
chSamplePreMemPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/Pe=
iPchPolicyLib/PchSamplePreMemPolicyLib.c
index fcefd76e8e..6cf9d9069e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSampl=
ePreMemPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSampl=
ePreMemPolicyLib.c
@@ -2,13 +2,7 @@
   This file is to load sample board policy.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/P=
eiPchPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolic=
yLib/PeiPchPolicyLib.c
index f0f9f33f71..201c49b3a8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPo=
licyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPo=
licyLib.c
@@ -2,13 +2,7 @@
   This file is PeiPchPolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/P=
eiPchPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPol=
icyLib/PeiPchPolicyLib.inf
index d4d4ac1e54..39004319aa 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPo=
licyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPo=
licyLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/P=
eiPchPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchP=
olicyLib/PeiPchPolicyLibrary.h
index 9be618d38a..f8d01614ac 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPo=
licyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPo=
licyLibrary.h
@@ -2,13 +2,7 @@
   Header file for the PeiPchPolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PEI_PCH_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/P=
eiPchPreMemPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPc=
hPolicyLib/PeiPchPreMemPolicyLib.c
index 5480cf3d5c..b5c1a39399 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPr=
eMemPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPr=
eMemPolicyLib.c
@@ -2,13 +2,7 @@
   This file is PeiPchPreMemPolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/Pc=
hReset.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchR=
eset.c
index 1a30bf31f6..20e5d36892 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c
@@ -2,13 +2,7 @@
   PCH RESET PEIM DRIVER.
=20
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <PiPei.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/Pe=
iPchResetLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchReset=
Lib/PeiPchResetLib.inf
index b03a986313..b04f4006ef 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchRes=
etLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchRes=
etLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib=
/PeiResetSystemLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiRese=
tSystemLib/PeiResetSystemLib.c
index 9429b0ecf4..6f12abf111 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiRes=
etSystemLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiRes=
etSystemLib.c
@@ -2,13 +2,7 @@
   System reset library services.
=20
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib=
/PeiResetSystemLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiRe=
setSystemLib/PeiResetSystemLib.inf
index a259bdf6ec..18a92a6f18 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiRes=
etSystemLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiRes=
etSystemLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib=
/PeiResetSystemLibFsp.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/Pe=
iResetSystemLib/PeiResetSystemLibFsp.inf
index 9abb7c2107..e7284e6668 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiRes=
etSystemLibFsp.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiRes=
etSystemLibFsp.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiL=
ib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c
index ecd6878490..aadc367a9f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.c
@@ -2,13 +2,7 @@
   PCH SPI PEI Library implements the SPI Host Controller Interface.
=20
 Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiL=
ib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.i=
nf
index 9240b6ef06..31f4ffe43a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommon=
Lib/SmmSpiFlashCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library=
/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
index c7b3e864eb..d712b9e5f7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Smm=
SpiFlashCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Smm=
SpiFlashCommonLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ###
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommon=
Lib/SpiFlashCommon.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiF=
lashCommonLib/SpiFlashCommon.c
index d95f51af41..7ee7ffab50 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Spi=
FlashCommon.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Spi=
FlashCommon.c
@@ -3,13 +3,7 @@
   for module use.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommon=
Lib/SpiFlashCommonSmmLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/S=
mmSpiFlashCommonLib/SpiFlashCommonSmmLib.c
index 8d2238dbf1..11133163d2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Spi=
FlashCommonSmmLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Spi=
FlashCommonSmmLib.c
@@ -2,13 +2,7 @@
   SMM 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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpi=
CommonLib/BasePchSpiCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Li=
braryPrivate/BasePchSpiCommonLib/BasePchSpiCommonLib.inf
index 128f7adcea..599b07d3d3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonL=
ib/BasePchSpiCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonL=
ib/BasePchSpiCommonLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpi=
CommonLib/SpiCommon.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate=
/BasePchSpiCommonLib/SpiCommon.c
index 0b708d4aad..58757a8cba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonL=
ib/SpiCommon.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonL=
ib/SpiCommon.c
@@ -2,13 +2,7 @@
   PCH SPI Common Driver implements the SPI Host Controller Compatibility I=
nterface.
=20
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Uefi/UefiBaseType.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaL=
ib/DxePchHdaLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/D=
xePchHdaLib/DxePchHdaLib.inf
index 52d7c8bbaf..04940c75c1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxeP=
chHdaLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxeP=
chHdaLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaL=
ib/PchHdaEndpoints.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/=
DxePchHdaLib/PchHdaEndpoints.c
index 11c6ec0269..31ea72bc55 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchH=
daEndpoints.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchH=
daEndpoints.c
@@ -2,13 +2,7 @@
   This file contains HD Audio NHLT Endpoints definitions
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaL=
ib/PchHdaLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePch=
HdaLib/PchHdaLib.c
index e577cd9038..2e93507a8a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchH=
daLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchH=
daLib.c
@@ -2,13 +2,7 @@
   PCH HD Audio Library implementation.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaL=
ib/PchHdaNhltConfig.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate=
/DxePchHdaLib/PchHdaNhltConfig.c
index 46096a0ac3..6e56d357f5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchH=
daNhltConfig.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchH=
daNhltConfig.c
@@ -2,13 +2,7 @@
   This file contains HD Audio NHLT Configuration BLOBs
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cM=
asterCommonLib/I2cMasterCommonLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/=
LibraryPrivate/PeiDxeI2cMasterCommonLib/I2cMasterCommonLib.c
index 32814bf773..16a2c73a77 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCo=
mmonLib/I2cMasterCommonLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCo=
mmonLib/I2cMasterCommonLib.c
@@ -2,13 +2,7 @@
  Implement the I2C controller driver.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cM=
asterCommonLib/PeiDxeI2cMasterCommonLib.inf b/Silicon/Intel/KabylakeSilicon=
Pkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/PeiDxeI2cMasterCommonLib.inf
index a6af85a4a0..5218191d8a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCo=
mmonLib/PeiDxeI2cMasterCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCo=
mmonLib/PeiDxeI2cMasterCommonLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmG=
pioPrivateLib/GpioNativePrivateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch=
/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioNativePrivateLib.c
index 89bf0a73ee..d47ae6fd55 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPriv=
ateLib/GpioNativePrivateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPriv=
ateLib/GpioNativePrivateLib.c
@@ -3,13 +3,7 @@
   used by Reference Code only.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmG=
pioPrivateLib/GpioPrivateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Libra=
ryPrivate/PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c
index b386e071f7..bc660b0906 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPriv=
ateLib/GpioPrivateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPriv=
ateLib/GpioPrivateLib.c
@@ -2,13 +2,7 @@
   This file contains GPIO routines for RC usage
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmG=
pioPrivateLib/PchSklGpioPrivateData.c b/Silicon/Intel/KabylakeSiliconPkg/Pc=
h/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PchSklGpioPrivateData.c
index 3d8b128a1c..6cf855d692 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPriv=
ateLib/PchSklGpioPrivateData.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPriv=
ateLib/PchSklGpioPrivateData.c
@@ -2,13 +2,7 @@
   This file contains SKL specific GPIO information
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmG=
pioPrivateLib/PeiDxeSmmGpioPrivateLib.inf b/Silicon/Intel/KabylakeSiliconPk=
g/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf
index d2542a1673..7986358ce1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPriv=
ateLib/PeiDxeSmmGpioPrivateLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPriv=
ateLib/PeiDxeSmmGpioPrivateLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmP=
chInitCommonLib/PchInitCommon.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Libr=
aryPrivate/PeiDxeSmmPchInitCommonLib/PchInitCommon.c
index a49bbc5c18..ed088bd642 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitC=
ommonLib/PchInitCommon.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitC=
ommonLib/PchInitCommon.c
@@ -2,13 +2,7 @@
   Pch common library for PCH INIT PEI/DXE/SMM modules
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmP=
chInitCommonLib/PchRpfn.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPri=
vate/PeiDxeSmmPchInitCommonLib/PchRpfn.c
index 77dd285430..1cd4884bc9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitC=
ommonLib/PchRpfn.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitC=
ommonLib/PchRpfn.c
@@ -2,13 +2,7 @@
   This file contains functions that configures PCI Express Root Ports func=
tion swapping.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Uefi/UefiBaseType.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmP=
chInitCommonLib/PeiDxeSmmPchInitCommonLib.inf b/Silicon/Intel/KabylakeSilic=
onPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLi=
b.inf
index df4900d964..52ab228442 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitC=
ommonLib/PeiDxeSmmPchInitCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitC=
ommonLib/PeiDxeSmmPchInitCommonLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmP=
chPciExpressHelpersLib/PchPciExpressHelpersLibrary.c b/Silicon/Intel/Kabyla=
keSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpr=
essHelpersLibrary.c
index 815b800db7..04145d8373 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciEx=
pressHelpersLib/PchPciExpressHelpersLibrary.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciEx=
pressHelpersLib/PchPciExpressHelpersLibrary.c
@@ -2,13 +2,7 @@
   This file contains routines that support PCI Express initialization
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchPciExpressHelpersLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmP=
chPciExpressHelpersLib/PchPciExpressHelpersLibrary.h b/Silicon/Intel/Kabyla=
keSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpr=
essHelpersLibrary.h
index bd59b5346e..7fe8985946 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciEx=
pressHelpersLib/PchPciExpressHelpersLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciEx=
pressHelpersLib/PchPciExpressHelpersLibrary.h
@@ -2,13 +2,7 @@
   Header file for PCH Pci Express helps library implementation.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_PCI_EXPRESS_HELPERS_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmP=
chPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf b/Silicon/Intel=
/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/Pei=
DxeSmmPchPciExpressHelpersLib.inf
index b02f311f02..39dc89670a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciEx=
pressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciEx=
pressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmP=
chPsfPrivateLib/PchPsfPrivateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/L=
ibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PchPsfPrivateLib.c
index ef579c825d..55124c0cb9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPr=
ivateLib/PchPsfPrivateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPr=
ivateLib/PchPsfPrivateLib.c
@@ -2,13 +2,7 @@
   This file contains PSF routines for RC usage
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmP=
chPsfPrivateLib/PeiDxeSmmPchPsfPrivateLib.inf b/Silicon/Intel/KabylakeSilic=
onPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PeiDxeSmmPchPsfPrivateLi=
b.inf
index 6995171b10..0d7050500a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPr=
ivateLib/PeiDxeSmmPchPsfPrivateLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPr=
ivateLib/PeiDxeSmmPchPsfPrivateLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmP=
chSmbusCommonLib/PchSmbusExec.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Libr=
aryPrivate/PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c
index ad5c784bff..abdc06cd70 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus=
CommonLib/PchSmbusExec.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus=
CommonLib/PchSmbusExec.c
@@ -2,13 +2,7 @@
   PCH Smbus Executive Code (common PEI/DXE/SMM code)
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <Uefi/UefiBaseType.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmP=
chSmbusCommonLib/PeiDxeSmmPchSmbusCommonLib.inf b/Silicon/Intel/KabylakeSil=
iconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PeiDxeSmmPchSmbusComm=
onLib.inf
index 54a67614af..78324e1fef 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus=
CommonLib/PeiDxeSmmPchSmbusCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus=
CommonLib/PeiDxeSmmPchSmbusCommonLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmR=
stPrivateLib/PeiDxeSmmRstPrivateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pc=
h/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.c
index 7436a76ec1..e97d48f777 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPriva=
teLib/PeiDxeSmmRstPrivateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPriva=
teLib/PeiDxeSmmRstPrivateLib.c
@@ -2,13 +2,7 @@
  Routines for Rst remapping
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmR=
stPrivateLib/PeiDxeSmmRstPrivateLib.inf b/Silicon/Intel/KabylakeSiliconPkg/=
Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf
index 1bbcc7eda7..413d0c86f8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPriva=
teLib/PeiDxeSmmRstPrivateLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPriva=
teLib/PeiDxeSmmRstPrivateLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c b/S=
ilicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
index 789b61170d..a0e3996664 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
@@ -2,13 +2,7 @@
   This is the driver that initializes the Intel PCH.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c=
 b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c
index f0abea1323..0769655757 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchCio2Acpi.c
@@ -2,13 +2,7 @@
   Initializes PCH CIO2 device ACPI data.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c =
b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
index 732dc8905d..f8839c47b5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
@@ -2,13 +2,7 @@
   Initializes the PCH HD Audio ACPI Tables.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c b/S=
ilicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
index 0428479b50..40c814f460 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
@@ -2,13 +2,7 @@
   This is the Common driver that initializes the Intel PCH.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h b/S=
ilicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
index a05697d337..516606e604 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
@@ -2,13 +2,7 @@
   Header file for PCH Initialization Driver.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_INITIALIZATION_DRIVER_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c =
b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c
index 1857b7f3c5..bd3efd8eda 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.c
@@ -2,13 +2,7 @@
   This is the Uefi driver that initializes the Intel PCH.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.in=
f b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
index 0242dcbe9a..49ede590e8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp=
.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
index 18feffd894..68c1bca40c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c =
b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c
index 9307b8fc4c..56052d8c9f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitFsp.c
@@ -2,13 +2,7 @@
   This is the FSP driver that initializes the Intel PCH.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieSto=
rage.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage=
.c
index 801abf2602..bcd8bb8232 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.c
@@ -3,13 +3,7 @@
   In order to use this feature, Intel RST Driver is required
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c b/S=
ilicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
index d1f2948de6..fabb536df0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
@@ -2,13 +2,7 @@
   Perform related functions for PCH Sata in DXE phase
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <PchInit.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c b/Si=
licon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
index 34227826b4..defe183965 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
@@ -2,13 +2,7 @@
   Initializes PCH Storage and Communications Subsystem Controllers.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <PchInit.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c=
 b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c
index 013c729ddf..93f07fa906 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIo.c
@@ -2,13 +2,7 @@
   Initializes Serial IO Controllers.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <PchInit.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDx=
e.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c
index 3b951092b5..077012bd25 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.c
@@ -2,13 +2,7 @@
   Initializes Serial IO Controllers.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <PchInit.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteP=
rotect.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWritePro=
tect.c
index cfaf0d57bd..c1bc98bb6b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c
@@ -2,13 +2,7 @@
   PCH BIOS Write Protect Driver.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchInitSmm.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsol=
ationSmm.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsol=
ationSmm.c
index 4c3dd6cf11..4cad3c6230 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSm=
m.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSm=
m.c
@@ -2,13 +2,7 @@
   PCH GPIO Sx Isolation Driver Entry
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchInitSmm.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c =
b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c
index c6e1809946..d2dba930ff 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.c
@@ -2,13 +2,7 @@
   PCH Init Smm module for PCH specific SMI handlers.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchInitSmm.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h =
b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
index 58ef567cc0..44f151c243 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
@@ -2,13 +2,7 @@
   Header file for PCH Init SMM Handler
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.in=
f b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
index 458eac090e..ea6692f6d9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c=
 b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c
index d05cb61bbc..8c2496a79e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchLanSxSmm.c
@@ -2,13 +2,7 @@
   PCH LAN Sx handler implementation.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c =
b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
index b4234f649c..aed33bba25 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPcieSmm.c
@@ -2,13 +2,7 @@
   PCH Pcie SMM Driver Entry
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchInitSmm.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm=
.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c
index 0717f38291..6267607a46 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchPort61hSmm.c
@@ -2,13 +2,7 @@
   PCH Port 61h bit-4 toggling in SMM IO Trap
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c=
 b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c
index 463de1dba8..139a60631c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchSpiAsync.c
@@ -2,13 +2,7 @@
   PCH SPI Async SMI handler.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchInitSmm.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.=
c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c
index f17b125d4f..72603e36e7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchXhciSxSmm.c
@@ -2,13 +2,7 @@
   PCH xHCI Sx handler implementation.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTr=
ap.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c
index ffb2105719..ea794669ba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.c
@@ -2,13 +2,7 @@
   Main implementation source file for the Io Trap SMM driver
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTr=
ap.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h
index 99bb3527f7..13ad2f6f1b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.h
@@ -2,13 +2,7 @@
   Defines and prototypes for the IoTrap SMM driver
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _IO_TRAP_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchS=
miDispatch.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/Pc=
hSmiDispatch.c
index a0bd9aaaa1..5f8c9375ea 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa=
tch.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa=
tch.c
@@ -2,13 +2,7 @@
   This function handle the register/unregister of PCH specific SMI events.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchS=
miDispatcher.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Sm=
m/PchSmiDispatcher.inf
index a593d631d3..46c4c72617 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa=
tcher.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa=
tcher.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchS=
mm.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
index 3eebdc1daf..508832e76e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.h
@@ -2,13 +2,7 @@
   Prototypes and defines for the PCH SMM Dispatcher.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef PCH_SMM_H
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchS=
mmCore.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm=
Core.c
index 77f0561ce4..0c494bffef 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.c
@@ -3,13 +3,7 @@
   and the abstraction of the PCH SMI sources.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchSmm.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchS=
mmEspi.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm=
Espi.c
index a4a7380737..a8a3a3dac6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.c
@@ -2,13 +2,7 @@
   eSPI SMI implementation
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchS=
mmEspi.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm=
Espi.h
index da600495c0..af152414f5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.h
@@ -2,13 +2,7 @@
   eSPI SMI Dispatch header
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchS=
mmGpi.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmG=
pi.c
index fd79538d3a..5690b91465 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.c
@@ -2,13 +2,7 @@
   File to contain all the hardware specific stuff for the Smm Gpi dispatch=
 protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchS=
mmHelpers.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/Pch=
SmmHelpers.c
index fea1ac9165..24bdf6a6e5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpe=
rs.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpe=
rs.c
@@ -2,13 +2,7 @@
   Helper functions for PCH SMM dispatcher.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchS=
mmHelpers.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/Pch=
SmmHelpers.h
index 44a8936790..dffd0e3944 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpe=
rs.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpe=
rs.h
@@ -2,13 +2,7 @@
   Helper functions for PCH SMM
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef PCH_SMM_HELPERS_H
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchS=
mmPeriodicTimer.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/S=
mm/PchSmmPeriodicTimer.c
index 324eaeb7e8..29afe30817 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPerio=
dicTimer.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPerio=
dicTimer.c
@@ -2,13 +2,7 @@
   File to contain all the hardware specific stuff for the Periodical Timer=
 dispatch protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchS=
mmPowerButton.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm=
/PchSmmPowerButton.c
index 404d2a31bc..82f0f6ffb2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPower=
Button.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPower=
Button.c
@@ -2,13 +2,7 @@
   File to contain all the hardware specific stuff for the Smm Power Button=
 dispatch protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <PchSmmHelpers.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchS=
mmSw.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw=
.c
index c285c677f1..ccaac28794 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.c
@@ -2,13 +2,7 @@
   File to contain all the hardware specific stuff for the Smm Sw dispatch =
protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchS=
mmSx.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx=
.c
index 523cea27aa..6fbe87c75d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.c
@@ -2,13 +2,7 @@
   File to contain all the hardware specific stuff for the Smm Sx dispatch =
protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchS=
mmUsb.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmU=
sb.c
index 71c11ed71d..f5ed3a1892 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.c
@@ -2,13 +2,7 @@
   File to contain all the hardware specific stuff for the Smm USB dispatch=
 protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/Pchx=
SmmHelpers.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/Pc=
hxSmmHelpers.c
index d4f4603eea..4d2a926491 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelp=
ers.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelp=
ers.c
@@ -3,13 +3,7 @@
   and the abstraction of the PCH SMI sources.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/Pchx=
SmmHelpers.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/Pc=
hxSmmHelpers.h
index 273bed32bc..08bf728da0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelp=
ers.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelp=
ers.h
@@ -3,13 +3,7 @@
   and the abstraction of the PCH SMI sources.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCHX_SMM_HELPERS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/Smm=
Control.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/Sm=
mControl.inf
index 2871b6c7c4..2695eaf9af 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl=
.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl=
.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/Smm=
ControlDriver.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDx=
e/SmmControlDriver.c
index 96727dde8f..7abac4e110 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl=
Driver.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl=
Driver.c
@@ -2,13 +2,7 @@
   This is the driver that publishes the SMM Control Protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "SmmControlDriver.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/Smm=
ControlDriver.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDx=
e/SmmControlDriver.h
index 110b93a3ca..fbb108f9d8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl=
Driver.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl=
Driver.h
@@ -2,13 +2,7 @@
   Header file for SMM Control Driver.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SMM_CONTROL_DRIVER_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c b/Silico=
n/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c
index 5cc808aa9d..1d84d06134 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c
@@ -2,13 +2,7 @@
   PCH SPI SMM Driver implements the SPI Host Controller Compatibility Inte=
rface.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PchSpi.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h b/Silico=
n/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h
index e3b6d7fd90..43e158b604 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h
@@ -2,13 +2,7 @@
   Header file for the PCH SPI SMM Driver.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PCH_SPI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf b/S=
ilicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
index 52f83a9953..964489064a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/Se=
cPlatformLib.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Librar=
y/SecPlatformLib.h
index f9bbc931aa..bf4f75effb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatfo=
rmLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatfo=
rmLib.h
@@ -2,13 +2,7 @@
   Prototype of SEC Platform hook library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModu=
lePkg/Include/Guid/DataHubStatusCodeRecord.h b/Silicon/Intel/KabylakeSilico=
nPkg/SampleCode/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecor=
d.h
index d18a2eda21..7611700179 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/I=
nclude/Guid/DataHubStatusCodeRecord.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/I=
nclude/Guid/DataHubStatusCodeRecord.h
@@ -2,13 +2,7 @@
   GUID used to identify Data Hub records logged by Status Code Protocol.
=20
 Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/=
Include/Guid/SmramMemoryReserve.h b/Silicon/Intel/KabylakeSiliconPkg/Sample=
Code/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h
index 04589cf040..9918c768ba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include=
/Guid/SmramMemoryReserve.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include=
/Guid/SmramMemoryReserve.h
@@ -9,13 +9,7 @@
   This GUIDed HOB can be used to convey the existence of the T-SEG reserva=
tion 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 availabl=
e under=20
-the terms and conditions of the BSD License that accompanies this distribu=
tion. =20
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.                           =
              =20
-   =20
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,     =
               =20
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
   @par Revision Reference:
   GUIDs defined in SmmCis spec version 0.9.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/=
Include/Protocol/DataHub.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/In=
telFrameworkPkg/Include/Protocol/DataHub.h
index ce73e3e8a6..4890ef7895 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include=
/Protocol/DataHub.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include=
/Protocol/DataHub.h
@@ -4,13 +4,7 @@
   has been logged.  This protocol may only be called <=3D TPL_NOTIFY.
=20
 Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
   @par Revision Reference:
   The Data Hub Protocol is defined in Framework for EFI Data Hub Specifica=
tion
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/=
Include/Protocol/Legacy8259.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode=
/IntelFrameworkPkg/Include/Protocol/Legacy8259.h
index c12936f2d2..6a2e4669db 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include=
/Protocol/Legacy8259.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include=
/Protocol/Legacy8259.h
@@ -3,13 +3,7 @@
   PCI IRQ routing needed to program the PCI Interrupt Line register.
=20
 Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
   @par Revision Reference:
   This protocol is defined in Framework for EFI Compatibility Support Modu=
le spec
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/=
Include/Protocol/LegacyBios.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode=
/IntelFrameworkPkg/Include/Protocol/LegacyBios.h
index a5f8f8abf7..e60afb6dcd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include=
/Protocol/LegacyBios.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include=
/Protocol/LegacyBios.h
@@ -10,13 +10,7 @@
   environment. Reverse thunk is the code that does the opposite.
=20
 Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
   @par Revision Reference:
   This protocol is defined in Framework for EFI Compatibility Support Modu=
le spec
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/=
Include/Protocol/LegacyInterrupt.h b/Silicon/Intel/KabylakeSiliconPkg/Sampl=
eCode/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h
index f06836a97c..f4944d4c79 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include=
/Protocol/LegacyInterrupt.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include=
/Protocol/LegacyInterrupt.h
@@ -2,13 +2,7 @@
   This protocol abstracts the PIRQ programming from the generic EFI Compat=
ibility Support Modules (CSMs).
=20
 Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
   @par Revision Reference:
   This protocol is defined in Framework for the EFI Compatibility Support =
Module specification.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Inclu=
de/Guid/AcpiS3Context.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeMo=
dulePkg/Include/Guid/AcpiS3Context.h
index 8f78e284f6..c5a995b8e8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid=
/AcpiS3Context.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid=
/AcpiS3Context.h
@@ -3,14 +3,7 @@
=20
 Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
=20
-This program and the accompanying materials
-are licensed and made available under the terms and conditions
-of the BSD License which accompanies this distribution.  The
-full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Inclu=
de/Guid/ConsoleOutDevice.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Md=
eModulePkg/Include/Guid/ConsoleOutDevice.h
index 7ca3f424e5..0a9aef19c6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid=
/ConsoleOutDevice.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid=
/ConsoleOutDevice.h
@@ -2,13 +2,7 @@
   This GUID can be installed to the device handle to specify that the devi=
ce is the console-out device.
=20
 Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Inclu=
de/Guid/MemoryTypeInformation.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCo=
de/MdeModulePkg/Include/Guid/MemoryTypeInformation.h
index e3e2ec82fd..3b05c9a79e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid=
/MemoryTypeInformation.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid=
/MemoryTypeInformation.h
@@ -8,13 +8,7 @@
   be used to store the information for each memory type in Variable or HOB.
=20
 Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Inclu=
de/Library/ResetSystemLib.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/M=
deModulePkg/Include/Library/ResetSystemLib.h
index 6cab22a80c..75d3e15ed7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Libr=
ary/ResetSystemLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Libr=
ary/ResetSystemLib.h
@@ -3,13 +3,7 @@
   methods that reset the whole system.
=20
 Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Inclu=
de/Ppi/SmmAccess.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModuleP=
kg/Include/Ppi/SmmAccess.h
index 8255a4a1d1..83a8edb449 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/=
SmmAccess.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/=
SmmAccess.h
@@ -13,14 +13,7 @@
=20
 Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
=20
-This program and the accompanying materials
-are licensed and made available under the terms and conditions
-of the BSD License which accompanies this distribution.  The
-full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Inclu=
de/Ppi/SmmControl.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModule=
Pkg/Include/Ppi/SmmControl.h
index fef5a3dca3..5bf1084a7a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/=
SmmControl.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/=
SmmControl.h
@@ -11,14 +11,7 @@
=20
   Copyright (c) 2010, Intel Corporation. All rights reserved.<BR>
=20
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions
-  of the BSD License which accompanies this distribution.  The
-  full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Inclu=
de/Protocol/SmmVariable.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Mde=
ModulePkg/Include/Protocol/SmmVariable.h
index 7e72bee166..c2dbdb3651 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Prot=
ocol/SmmVariable.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Prot=
ocol/SmmVariable.h
@@ -3,13 +3,7 @@
   and intended for use as a means to store data in the EFI SMM environment.
=20
   Copyright (c) 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 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 IMP=
LIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsd=
t/PchSmb.asl b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/D=
sdt/PchSmb.asl
index 25c4960585..9f23b3bb3c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSm=
b.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSm=
b.asl
@@ -6,13 +6,7 @@
   driver with SMBUS operation region support implemented for ACPI usage.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec b/Silicon/Intel/Kab=
ylakeSiliconPkg/SiPkg.dec
index 078d10c520..a613079dd4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc b/Silico=
n/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc
index f313e4c352..20132653bd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc b/Silicon/=
Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc
index eb7d43191f..920b02e410 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgCommonLib.dsc
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 #
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc b/Silicon/Intel/=
KabylakeSiliconPkg/SiPkgDxe.dsc
index 4fe0f8d18c..c39bd56c0e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxe.dsc
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc b/Silicon/Int=
el/KabylakeSiliconPkg/SiPkgDxeLib.dsc
index 9697da6c30..8c194d8e7c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc b/Silicon/Intel/=
KabylakeSiliconPkg/SiPkgPei.dsc
index a2bc1cd49f..8bd16c3845 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPei.dsc
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc b/Silicon/Int=
el/KabylakeSiliconPkg/SiPkgPeiLib.dsc
index bb95ce3888..86e34ff359 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc
+++ b/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.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 availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/D=
mar.aslc b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dma=
r.aslc
index bf7b56e23e..cd3192639b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc
@@ -2,13 +2,7 @@
   This file describes the contents of the ACPI DMA address Remapping
  =20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "Dmar.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/D=
mar.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h
index aaa027806b..32aba45fc8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.h
@@ -3,13 +3,7 @@
   Some additional ACPI values are defined in Acpi1_0.h and Acpi2_0.h.
  =20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SA_DMAR_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBu=
s.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl
index ea14d5d479..597a10dc08 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.asl
@@ -6,13 +6,7 @@
   @note This ASL file needs to be included as part of platform ACPI DSDT t=
able.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpi=
Tables.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpi=
Tables.inf
index ff39573378..1488d3ba61 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.=
inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.=
inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 ##########################################################################=
######
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt=
/Igfx.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/=
Igfx.asl
index c853700c40..2770e91752 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.a=
sl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.a=
sl
@@ -7,13 +7,7 @@
   present in the system, etc.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt=
/IgfxCommon.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/S=
aSsdt/IgfxCommon.asl
index 4d28ad0068..5f46e49ff6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxCo=
mmon.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxCo=
mmon.asl
@@ -4,13 +4,7 @@
   i.e. hotkeys and other system interrupts.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 //
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt=
/IgfxDsm.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSs=
dt/IgfxDsm.asl
index 974f7b706d..a045242872 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDs=
m.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDs=
m.asl
@@ -4,13 +4,7 @@
   the Integrated Graphics Device (IGD) OpRegion/DSM mechanism
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt=
/IgfxOpGbda.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/S=
aSsdt/IgfxOpGbda.asl
index cd86e25fca..4705df772d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOp=
Gbda.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOp=
Gbda.asl
@@ -4,13 +4,7 @@
   the Integrated Graphics Device (IGD) OpRegion/Software SCI mechanism
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 Method (GBDA, 0, Serialized)
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt=
/IgfxOpRn.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaS=
sdt/IgfxOpRn.asl
index 4e3b6c5522..4f85e17a0e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOp=
Rn.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOp=
Rn.asl
@@ -6,13 +6,7 @@
   as described in the IGD OpRegion specification.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 //
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt=
/IgfxOpSbcb.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/S=
aSsdt/IgfxOpSbcb.asl
index 1f688e3b4a..e6a6f67621 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOp=
Sbcb.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOp=
Sbcb.asl
@@ -3,13 +3,7 @@
   OpRegion/Software SCI mechanism.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt=
/Sa.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa=
.asl
index 7bc2d80667..8b5ea28035 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Sa.asl
@@ -5,13 +5,7 @@
   System Agent PCI Express* ports (PEG), iGfx and other devices.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt=
/SaNvs.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt=
/SaNvs.asl
index 311810020f..179b6b95b8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaNvs.=
asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaNvs.=
asl
@@ -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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt=
/SaSsdt.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsd=
t/SaSsdt.asl
index b19a3cfa7b..df187f593e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt=
.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt=
.asl
@@ -4,13 +4,7 @@
   and BIOS.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt=
/SaSsdt.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsd=
t/SaSsdt.inf
index 43d7819263..e5f234ec2a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt=
.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt=
.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 ##########################################################################=
######
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlo=
ck/GraphicsDxeConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Inclu=
de/ConfigBlock/GraphicsDxeConfig.h
index 8f746dcc95..81549871b7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Grap=
hicsDxeConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Grap=
hicsDxeConfig.h
@@ -2,13 +2,7 @@
   Graphics DXE Policy definitions
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _GRAPHICS_DXE_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlo=
ck/GraphicsPeiConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Inclu=
de/ConfigBlock/GraphicsPeiConfig.h
index ee294650bf..4063f800e8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Grap=
hicsPeiConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Grap=
hicsPeiConfig.h
@@ -2,13 +2,7 @@
   Policy definition for Internal Graphics Config Block (PostMem)
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _GRAPHICS_PEI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlo=
ck/MemoryConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Co=
nfigBlock/MemoryConfig.h
index 8f77fa720b..d64d3d3d0a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Memo=
ryConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Memo=
ryConfig.h
@@ -2,13 +2,7 @@
   Policy definition of Memory Config Block
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _MEMORY_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlo=
ck/MiscDxeConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/C=
onfigBlock/MiscDxeConfig.h
index 18a5371c4b..08229cd33c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Misc=
DxeConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/Misc=
DxeConfig.h
@@ -2,13 +2,7 @@
   MISC DXE policy definitions
  =20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _MISC_DXE_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlo=
ck/SaMiscPeiPreMemConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/I=
nclude/ConfigBlock/SaMiscPeiPreMemConfig.h
index 0bf1934207..4aa02e3142 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMi=
scPeiPreMemConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMi=
scPeiPreMemConfig.h
@@ -2,13 +2,7 @@
   Policy details for miscellaneous configuration in System Agent
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SA_MISC_PEI_PREMEM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlo=
ck/VtdConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Confi=
gBlock/VtdConfig.h
index 086d70849a..8430563788 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdC=
onfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdC=
onfig.h
@@ -2,13 +2,7 @@
   VT-d policy definitions.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _VTD_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemapp=
ingTable.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemapp=
ingTable.h
index 0c49f98f2c..08edcee410 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTabl=
e.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTabl=
e.h
@@ -2,13 +2,7 @@
   This code defines ACPI DMA Remapping table related definitions.
  =20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _DMA_REMAPPING_TABLE_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/D=
xeSaPolicyLib.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Libr=
ary/DxeSaPolicyLib.h
index 12274d797d..61457dfb59 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPol=
icyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPol=
icyLib.h
@@ -2,13 +2,7 @@
   Prototype of the DxeSaPolicyLib library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _DXE_SA_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/P=
eiSaPolicyLib.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Libr=
ary/PeiSaPolicyLib.h
index 6348fd003e..28e648f4a0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPol=
icyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPol=
icyLib.h
@@ -2,13 +2,7 @@
   Prototype of the PeiSaPolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PEI_SA_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/S=
aPlatformLib.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Libra=
ry/SaPlatformLib.h
index f3762e91a5..cf62e1a9e2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatfo=
rmLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatfo=
rmLib.h
@@ -2,13 +2,7 @@
   Header file for SaPlatformLib.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHo=
b.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h
index dbf93ac265..ae51195736 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.h
@@ -4,13 +4,7 @@
   data hobs.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _MEM_INFO_HOB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/=
GopPolicy.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol=
/GopPolicy.h
index e7e72e5e53..9a7f02353c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPoli=
cy.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPoli=
cy.h
@@ -2,13 +2,7 @@
   Interface definition for GopPolicy Protocol.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _GOP_POLICY_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/=
IgdOpRegion.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protoc=
ol/IgdOpRegion.h
index b39ccc31d4..1410a8a309 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRe=
gion.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRe=
gion.h
@@ -3,13 +3,7 @@
   an interface between system BIOS, ASL code, and Graphics drivers.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 @par Specification Reference:
   - IGD OpRegion/Software SCI SPEC
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/=
MemInfo.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/M=
emInfo.h
index ceadd739d6..7d5dd03f55 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/MemInfo=
.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/MemInfo=
.h
@@ -4,13 +4,7 @@
   of each dimm and rank.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _MEM_INFO_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/=
SaGlobalNvsArea.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Pr=
otocol/SaGlobalNvsArea.h
index 5daf183c1a..08ab89898b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGloba=
lNvsArea.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGloba=
lNvsArea.h
@@ -4,13 +4,7 @@
   used as a communications buffer between SMM/DXE/PEI code and ASL code.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SYSTEM_AGENT_GLOBAL_NVS_AREA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/=
SaNvs.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaN=
vs.h
index 8f6ec57304..01cdf6d56d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaNvs.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaNvs.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 availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/=
SaPolicy.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/=
SaPolicy.h
index 577eaa8ffc..40a0ab884d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolic=
y.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolic=
y.h
@@ -2,13 +2,7 @@
   Interface definition details between System Agent and platform drivers d=
uring DXE phase.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SA_POLICY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.=
h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h
index 5d343ba57a..45caa7fe90 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaAccess.h
@@ -2,13 +2,7 @@
   Macros to simplify and abstract the interface to PCI configuration.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SAACCESS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyC=
ommon.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyComm=
on.h
index bfe6011763..dccd4c9b3b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
@@ -2,13 +2,7 @@
   Main System Agent Policy structure definition which will contain several=
 config blocks during runtime.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SA_POLICY_COMMON_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h =
b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h
index 5f92981f4b..2b518853bd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaRegs.h
@@ -16,13 +16,7 @@
     as "_SA_" without [generation_name] inserted.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SA_REGS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/Sa=
ConfigHob.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/S=
aConfigHob.h
index 02ec08fc96..16f31bbdfd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigH=
ob.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigH=
ob.h
@@ -2,13 +2,7 @@
   The GUID definition for SaConfigHob
  =20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SA_CONFIG_HOB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPoli=
cyLib/DxeSaPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Libra=
ry/DxeSaPolicyLib/DxeSaPolicyLib.c
index 4909ed8f62..67fe214d0e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D=
xeSaPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D=
xeSaPolicyLib.c
@@ -2,13 +2,7 @@
   This file provide services for DXE phase policy default initialization
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPoli=
cyLib/DxeSaPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Lib=
rary/DxeSaPolicyLib/DxeSaPolicyLib.inf
index f75ecb1388..9eb389b14f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D=
xeSaPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D=
xeSaPolicyLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPoli=
cyLib/DxeSaPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/L=
ibrary/DxeSaPolicyLib/DxeSaPolicyLibrary.h
index f754072411..ec1b7d10e8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D=
xeSaPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D=
xeSaPolicyLibrary.h
@@ -2,13 +2,7 @@
   Header file for the DxeSaPolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _DXE_SA_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmm=
SaPlatformLib/PeiDxeSmmSaPlatformLib.inf b/Silicon/Intel/KabylakeSiliconPkg=
/SystemAgent/Library/PeiDxeSmmSaPlatformLib/PeiDxeSmmSaPlatformLib.inf
index 860da17031..9fe71e5bac 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatf=
ormLib/PeiDxeSmmSaPlatformLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatf=
ormLib/PeiDxeSmmSaPlatformLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmm=
SaPlatformLib/SaPlatformLibrary.c b/Silicon/Intel/KabylakeSiliconPkg/System=
Agent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.c
index df662b0222..4fd3ffa64b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatf=
ormLib/SaPlatformLibrary.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatf=
ormLib/SaPlatformLibrary.c
@@ -2,13 +2,7 @@
   SA Platform Lib implementation.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "SaPlatformLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmm=
SaPlatformLib/SaPlatformLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/System=
Agent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.h
index 632b801ad2..1e7b0d051a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatf=
ormLib/SaPlatformLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatf=
ormLib/SaPlatformLibrary.h
@@ -2,13 +2,7 @@
   Header file for SA Platform Lib implementation.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPoli=
cyLib/Ia32/MrcOemPlatform.S b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/=
Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.S
index d8fe66154a..74e5589d0b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/I=
a32/MrcOemPlatform.S
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/I=
a32/MrcOemPlatform.S
@@ -1,13 +1,7 @@
 ## @file
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License that accompanies this distri=
bution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPoli=
cyLib/Ia32/MrcOemPlatform.asm b/Silicon/Intel/KabylakeSiliconPkg/SystemAgen=
t/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.asm
index bef8aafe1a..3899ef119e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/I=
a32/MrcOemPlatform.asm
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/I=
a32/MrcOemPlatform.asm
@@ -2,13 +2,7 @@
 ;  This file provides assembly 64-bit atomic reads/writes required for mem=
ory initialization.
 ;
 ; Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-; This program and the accompanying materials are licensed and made availa=
ble under
-; the terms and conditions of the BSD License that accompanies this distri=
bution.
-; The full text of the license may be found at
-; http://opensource.org/licenses/bsd-license.php.
-;
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+; SPDX-License-Identifier: BSD-2-Clause-Patent
 ;
 ;;
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPoli=
cyLib/Ia32/MrcOemPlatform.nasm b/Silicon/Intel/KabylakeSiliconPkg/SystemAge=
nt/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm
index 5bc17065bd..03c1380f89 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/I=
a32/MrcOemPlatform.nasm
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/I=
a32/MrcOemPlatform.nasm
@@ -2,13 +2,7 @@
 ;  This file provides assembly 64-bit atomic reads/writes required for mem=
ory initialization.
 ;
 ; Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-; This program and the accompanying materials are licensed and made availa=
ble under
-; the terms and conditions of the BSD License that accompanies this distri=
bution.
-; The full text of the license may be found at
-; http://opensource.org/licenses/bsd-license.php.
-;
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+; SPDX-License-Identifier: BSD-2-Clause-Patent
 ;
 ;;
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPoli=
cyLib/MrcOemPlatform.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Libra=
ry/PeiSaPolicyLib/MrcOemPlatform.c
index e4d6f1b35c..f62651796a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/M=
rcOemPlatform.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/M=
rcOemPlatform.c
@@ -2,13 +2,7 @@
   This file is SampleCode for Intel SA PEI Policy initialization.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPoli=
cyLib/MrcOemPlatform.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Libra=
ry/PeiSaPolicyLib/MrcOemPlatform.h
index f561138b04..53440d5d80 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/M=
rcOemPlatform.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/M=
rcOemPlatform.h
@@ -4,13 +4,7 @@
   This file is SampleCode for Intel SA PEI Policy initialization.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPoli=
cyLib/PeiSaPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Libra=
ry/PeiSaPolicyLib/PeiSaPolicyLib.c
index ddc83ba4b2..eb18d993e7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/P=
eiSaPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/P=
eiSaPolicyLib.c
@@ -2,13 +2,7 @@
   This file provides services for PEI policy default initialization
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PeiSaPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPoli=
cyLib/PeiSaPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Lib=
rary/PeiSaPolicyLib/PeiSaPolicyLib.inf
index 0afd31b584..8fae4cee61 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/P=
eiSaPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/P=
eiSaPolicyLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPoli=
cyLib/PeiSaPolicyLibSample.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent=
/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c
index a65349b29c..63e93094e1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/P=
eiSaPolicyLibSample.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/P=
eiSaPolicyLibSample.c
@@ -2,13 +2,7 @@
   This file provides services for Sample PEI policy default initialization.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include <SaPolicyCommon.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPoli=
cyLib/PeiSaPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/L=
ibrary/PeiSaPolicyLib/PeiSaPolicyLibrary.h
index e7fe3d2fcf..a44f7343dd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/P=
eiSaPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/P=
eiSaPolicyLibrary.h
@@ -2,13 +2,7 @@
   Header file for the PeiSaPolicy library.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _PEI_SA_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPoli=
cyLib/SaPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Librar=
y/PeiSaPolicyLib/SaPrintPolicy.c
index 0a6ddb8a8f..8b3a81a1c4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/S=
aPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/S=
aPrintPolicy.c
@@ -2,13 +2,7 @@
   This file provides service for PEI phase policy printing
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "PeiSaPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Includ=
e/MrcCommonTypes.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryIni=
t/Include/MrcCommonTypes.h
index 792b2ca58d..3b612e3177 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCo=
mmonTypes.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCo=
mmonTypes.h
@@ -2,13 +2,7 @@
   This file contains the definitions common to the MRC API and other APIs.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _MrcCommonTypes_h_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Includ=
e/MrcInterface.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/=
Include/MrcInterface.h
index 87ad005f03..8e6aa32ed8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcIn=
terface.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcIn=
terface.h
@@ -2,13 +2,7 @@
   This file includes all the data structures that the MRC considers "globa=
l data".
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _MrcInterface_h_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Includ=
e/MrcRmtData.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/In=
clude/MrcRmtData.h
index 51d40ff376..73cdb214f7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRm=
tData.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRm=
tData.h
@@ -3,13 +3,7 @@
   Compatible BIOS data (BDAT) table.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _MrcRmtData_h_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Includ=
e/MrcSpdData.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/In=
clude/MrcSpdData.h
index cbfeb1cd0a..304db700c0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSp=
dData.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSp=
dData.h
@@ -2,13 +2,7 @@
   SPD data format header file.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Includ=
e/MrcTypes.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Incl=
ude/MrcTypes.h
index 5bb771089d..241e5adcb7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTy=
pes.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTy=
pes.h
@@ -3,13 +3,7 @@
   Include the the general MRC types
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _MRC_TYPES_H
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/Graphi=
csInit.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/Graphics=
Init.c
index 1d438e3c85..045f82a31d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
@@ -2,13 +2,7 @@
   DXE driver for Initializing SystemAgent Graphics ACPI table initializati=
on.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "GraphicsInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/Graphi=
csInit.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/Graphics=
Init.h
index b76f775b24..00e8c08b53 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h
@@ -2,13 +2,7 @@
   Header file for initialization of GT PowerManagement
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _GRAPHICS_INIT_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpR=
egion.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegi=
on.c
index 8e7ef7bc29..b7e6cc44b1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c
@@ -4,13 +4,7 @@
   The code in this file will load the driver and initialize the interface
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
   @par Specification Reference:
   - OpRegion / Software SCI SPEC
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpR=
egion.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegi=
on.h
index 40616c4b82..1b960e4b11 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h
@@ -3,13 +3,7 @@
   Software SCI interface between system BIOS, ASL code, and Graphics drive=
rs.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
   @par Specification Reference:
   - OpRegion / Software SCI SPEC
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi=
.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c
index 40aa155ead..09e23c250d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaAcpi.c
@@ -2,13 +2,7 @@
   This is the driver that initializes the Intel System Agent.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "SaInitDxe.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit=
.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h
index 7e9efc40bc..69cd9407eb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit.h
@@ -2,13 +2,7 @@
   Header file for SA Common Initialization Driver.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SA_INITIALIZATION_DRIVER_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit=
Dxe.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c
index 0948a91a72..8ea4f3eb84 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.c
@@ -2,13 +2,7 @@
   This is the driver that initializes the Intel System Agent.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "SaInitDxe.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit=
Dxe.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h
index 9381941b87..b77962fa2e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.h
@@ -2,13 +2,7 @@
   Header file for SA Initialization Driver.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SA_INITIALIZATION_DXE_DRIVER_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInit=
Dxe.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe=
.inf
index 6b01b494cd..cc05f336b3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c =
b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c
index ded44b661f..0adabd18bc 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.c
@@ -2,13 +2,7 @@
   This code provides a initialization of intel VT-d (Virtualization Techno=
logy for Directed I/O).
  =20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "SaInitDxe.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h =
b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h
index fc84a7c41e..c74c5447ff 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/VTd.h
@@ -2,13 +2,7 @@
   This code provides a initialization of intel VT-d (Virtualization Techno=
logy for Directed I/O).
  =20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _VT_D_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/Smm=
Access.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/Smm=
Access.inf
index 150716529c..93ab408206 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.=
inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.=
inf
@@ -5,13 +5,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made availa=
ble under
-# the terms and conditions of the BSD License which accompanies this distr=
ibution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMP=
LIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
=20
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/Smm=
AccessDriver.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe=
/SmmAccessDriver.c
index 3e8fd96484..f03dbe3d27 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessD=
river.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessD=
river.c
@@ -3,13 +3,7 @@
   instance for System Agent.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #include "SmmAccessDriver.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/Smm=
AccessDriver.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe=
/SmmAccessDriver.h
index 69e9e89b24..dbc1894af5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessD=
river.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessD=
river.h
@@ -2,13 +2,7 @@
   Header file for SMM Access Driver.
=20
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made availabl=
e under
-the terms and conditions of the BSD License that accompanies this distribu=
tion.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLI=
ED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
=20
 **/
 #ifndef _SMM_ACCESS_DRIVER_H_
--=20
2.21.0.windows.1


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

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