[edk2-devel] [[edk2-platforms][PATCH V2] 23/30] Silicon/Intel/KabylakeSiliconPkg: Replace BSD License with BSD+Patent License

Michael D Kinney posted 1 patch 1 week ago
Failed in applying to current master (apply log)
.../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(-)

[edk2-devel] [[edk2-platforms][PATCH V2] 23/30] Silicon/Intel/KabylakeSiliconPkg: Replace BSD License with BSD+Patent License

Posted by Michael D Kinney 1 week ago
https://bugzilla.tianocore.org/show_bug.cgi?id=1373

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

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

RFCs with detailed process for the license change:

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

Cc: 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/CpuConfig.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspData.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspData.h
index 8f333cffeb..53e6d45fe5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspData.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspData.h
@@ -2,13 +2,7 @@
   FSP CPU Data Config Block.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_CONFIG_FSP_DATA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPreMemConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPreMemConfig.h
index 19e41287ce..4823b1d713 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPreMemConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPreMemConfig.h
@@ -2,13 +2,7 @@
   CPU PreMemory Config Block.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_CONFIG_LIB_PREMEM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockingConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockingConfig.h
index 735e79c491..7a6d89ebda 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockingConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockingConfig.h
@@ -2,13 +2,7 @@
   CPU Overclocking Config Block.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_OVERCLOCKING_PREMEM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConfig.h
index d8b5a2ed98..c55f9a0cc3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConfig.h
@@ -2,13 +2,7 @@
   CPU PID Config Block.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_PID_TEST_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtBasicConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtBasicConfig.h
index 68dc9195ae..6fe9126377 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtBasicConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtBasicConfig.h
@@ -2,13 +2,7 @@
   CPU Power Management Basic Config Block.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_POWER_MGMT_BASIC_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtCustomConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtCustomConfig.h
index edb8182db5..026a1aff5f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtCustomConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtCustomConfig.h
@@ -2,13 +2,7 @@
   CPU Power Managment Custom Config Block.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_POWER_MGMT_CUSTOM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtPsysConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtPsysConfig.h
index 05b1efd5b6..75b49dbe7a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtPsysConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtPsysConfig.h
@@ -2,13 +2,7 @@
   CPU Power Management Psys(Platform) Config Block.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_POWER_MGMT_PSYS_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtTestConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtTestConfig.h
index bf6e829fa3..ab0c194e76 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtTestConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtTestConfig.h
@@ -2,13 +2,7 @@
   CPU Power Management Test Config Block.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_POWER_MGMT_TEST_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtVrConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtVrConfig.h
index ad4ed76250..802f585819 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtVrConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgmtVrConfig.h
@@ -2,13 +2,7 @@
   CPU Power Management VR Config Block.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_POWER_MGMT_VR_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.h
index 2b1fa5b3a5..2cdf834a89 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.h
@@ -2,13 +2,7 @@
   CPU Test Config Block.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_TEST_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h b/Silicon/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h b/Silicon/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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_REGS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem.h
index 905937ec88..9e7518f91c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem.h
@@ -2,13 +2,7 @@
   Prototype of the CpuPolicy library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_PREMEM_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.h
index 6e807a3504..59c0f812c5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.h
@@ -6,13 +6,7 @@
   @note Data structures defined in this protocol are not naturally aligned.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_INFO_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_INIT_DATA_HOB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CPU_PRIVATE_DATA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonLib.h
index 8099236d88..759fa84175 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonLib.h
@@ -2,13 +2,7 @@
   Header file for Cpu Common Lib implementation.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct.h
index e7f7c19279..bd3fddb86f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct.h
@@ -2,13 +2,7 @@
   This file contains CPU Gnvs Struct specific to processor
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _POWER_MGMT_NVS_STRUCT_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.c
index ed964d00c3..bc2e93a1ac 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.c
@@ -2,13 +2,7 @@
   Mailbox Library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Uefi.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.inf
index 0426e05802..0799aa891b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/BaseCpuMailboxLibNull.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
index f871c21e6a..f13ca92661 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPolicy.c
@@ -2,13 +2,7 @@
   This file is PeiCpuPolicy library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiCpuPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.c
index 49331f1471..cb7f379e0f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.c
@@ -2,13 +2,7 @@
   This file is PeiCpuPolicy library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiCpuPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf
index 24e9819e34..e0f4ee03ee 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibrary.h
index 81301b475e..d2a475591d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibrary.h
@@ -2,13 +2,7 @@
   Header file for the PeiCpuPolicyLib library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PEI_CPU_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/CpuPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/CpuPrintPolicy.c
index 1807604405..d7ffd0b600 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/CpuPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/CpuPrintPolicy.c
@@ -2,13 +2,7 @@
   This file is PeiCpuPolicy library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiCpuPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c
index 7d27c0b6dc..35041322a7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLib.c
@@ -2,13 +2,7 @@
   This file is PeiCpuPolicy library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiCpuPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf
index df6e20baef..a18ea79147 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibrary.h
index 8c039b4591..553b7a8ca9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibrary.h
@@ -2,13 +2,7 @@
   Header file for the PeiCpuPolicyLib library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PEI_CPU_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/PeiDxeSmmCpuPlatformLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/CpuCommonLib.c b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/CpuCommonLib.c
index 100bd1464c..4fa713612b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/CpuCommonLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/CpuCommonLib.c
@@ -2,13 +2,7 @@
   CPU Common Lib implementation.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/PeiDxeSmmCpuCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/PeiDxeSmmCpuCommonLib.inf
index 70d33ce354..e5c546d67a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/PeiDxeSmmCpuCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuCommonLib/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c b/Silicon/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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h b/Silicon/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 driver
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection.c
index d45cc586ba..184ec609ba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection.c
@@ -2,13 +2,7 @@
   This file contains the tests for the IntegratedDeviceDMAProtection bit
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c b/Silicon/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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfiguration.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfiguration.c
index c70ac41cf6..e53d45ee12 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfiguration.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfiguration.c
@@ -2,13 +2,7 @@
   This file contains the tests for the SecureIntegratedGraphics bit
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "HstiSiliconDxe.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.c
index 00dd3092a1..a3c9bbebea 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguration.c
@@ -2,13 +2,7 @@
   This file contains the tests for the SecureMemoryMapConfiguration bit
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "HstiSiliconDxe.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguration.c b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguration.c
index 2f498cd532..d08a85b87e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguration.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguration.c
@@ -2,13 +2,7 @@
   This file contains the tests for the SecureSystemAgentConfiguration bit
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h b/Silicon/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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h b/Silicon/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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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).
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h b/Silicon/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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h b/Silicon/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.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 policy setting.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h b/Silicon/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat b/Silicon/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 may 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
 
 @call edksetup.bat
diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc b/Silicon/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.c
index a411547ccb..b9bd6f3a48 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.c
@@ -2,13 +2,7 @@
   Library functions for Config Block management.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <ConfigBlock.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf
index f544c75a6c..646c5b189c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.c
index 98ff9e3410..8596933549 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.c
@@ -3,13 +3,7 @@
   to config block header.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <ConfigBlock.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf
index 5961b1a6b2..c9a70c10c8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
index ea85be4a11..e6ab43db6d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.c
@@ -7,13 +7,7 @@
   This library uses the ACPI Support protocol.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf
index 0b24bbe71e..7a100128f3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.c b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.c
index 834315d236..490a09ddb5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.c
@@ -7,13 +7,7 @@
   This library uses the ACPI Support protocol.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.inf
index 3805dbf1dd..a3c8aef60a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpdateLibNull.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyInit.c b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyInit.c
index ac870bee84..694c896879 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyInit.c
@@ -2,13 +2,7 @@
   This file is SampleCode for Intel PEI Platform Policy initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolicyInit.h
index ebc5023f7b..855a89fc23 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolicyInit.h
@@ -2,13 +2,7 @@
   Header file for the SaPolicyInitDxe Driver.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SA_POLICY_INIT_DXE_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf
index fbce84e78f..1997f43ab4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.c
index 3688872019..51a06528e0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.c
@@ -2,13 +2,7 @@
   This file contains routines that get PCI Express Address
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Library/BaseLib.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.inf
index 24cae56d04..8ae40a0c9e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmmMmPciLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
index b7db139ded..813b868fcf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
@@ -3,13 +3,7 @@
   Policy and installs RC Policy PPI.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
index 134f60be5e..1d992cfbbd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c
index 3f80b990e9..e0d83cb467 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c
@@ -3,13 +3,7 @@
   Policy and installs RC Policy PPI.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
index 4c6ba6309d..f090e58868 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
@@ -2,13 +2,7 @@
   Header file for the PeiSiPolicyLib library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.c
index c3a96e5ad2..0de415ad19 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.c
@@ -2,13 +2,7 @@
   This file is SampleCode for Intel PEI Platform Policy initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.h
index e85724411a..c38294cfbe 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInit.h
@@ -2,13 +2,7 @@
   Header file for the PolicyInitPei PEIM.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInitPreMem.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInitPreMem.c
index c402dee3a4..fd76b4fac3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInitPreMem.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyInitPreMem.c
@@ -2,13 +2,7 @@
   This file is SampleCode for Intel PEI Platform Policy initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyInit.h
index 4f4a80b9ae..47ede26b05 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyInit.h
@@ -2,13 +2,7 @@
   Header file for the PeiSiPolicyInit
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconPolicyInitLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconPolicyInitLib.inf
index ac37f17eae..7982a5d87f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconPolicyInitLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconPolicyInitLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPostMemSiliconPolicyInitLibDependency.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPostMemSiliconPolicyInitLibDependency.inf
index 243a70f30d..2bca431712 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPostMemSiliconPolicyInitLibDependency.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPreMemSiliconPolicyInitLibDependency.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPreMemSiliconPolicyInitLibDependency.inf
index fd54b0bf7d..45a30da9ac 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiPreMemSiliconPolicyInitLibDependency.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiSiliconPolicyInitLibDependency.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiSiliconPolicyInitLibDependency.c
index 1db1582ff2..4c3be83c21 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiSiliconPolicyInitLibDependency.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency/PeiSiliconPolicyInitLibDependency.c
@@ -1,13 +1,7 @@
 /** @file
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspCpuPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspCpuPolicyInitLib.c
index 282f774831..72a797a0ea 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspCpuPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspCpuPolicyInitLib.c
@@ -2,13 +2,7 @@
   Implementation of Fsp PCH Policy Initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c
index d97bf8be57..e72a06f5d3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c
@@ -2,13 +2,7 @@
   Implementation of Fsp Me Policy Initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMiscUpdInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMiscUpdInitLib.c
index b9329e4c8a..6d1a982bfb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMiscUpdInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMiscUpdInitLib.c
@@ -2,13 +2,7 @@
   Implementation of Fsp Misc UPD Initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c
index 3f7e297c0b..46c143553c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c
@@ -2,13 +2,7 @@
   Implementation of Fsp PCH Policy Initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.c
index 4e82a0cc31..1136996684 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.c
@@ -2,13 +2,7 @@
   Instance of Fsp Policy Initialization Library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h
index a17b642a1d..52f20777ec 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h
@@ -2,13 +2,7 @@
   Internal header file for Fsp Policy Initialization Library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSaPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSaPolicyInitLib.c
index 3d218f8ba9..51b72c360a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSaPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSaPolicyInitLib.c
@@ -2,13 +2,7 @@
   Implementation of Fsp SA Policy Initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSiPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSiPolicyInitLib.c
index 49601b1496..bffabe61d0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSiPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSiPolicyInitLib.c
@@ -2,13 +2,7 @@
   Implementation of Fsp SI Policy Initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.c
index abed092c46..06210927d4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.c
@@ -2,13 +2,7 @@
   This file is SampleCode for Intel PEI Platform Policy initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.h
index e85724411a..c38294cfbe 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInit.h
@@ -2,13 +2,7 @@
   Header file for the PolicyInitPei PEIM.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitLib.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitLib.h
index b5a7f4eef3..ae289f884e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitLib.h
@@ -2,13 +2,7 @@
   Header file for the PolicyInitPei Library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitPreMem.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitPreMem.c
index 35baba3183..ed391db583 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitPreMem.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolicyInitPreMem.c
@@ -2,13 +2,7 @@
   This file is SampleCode for Intel PEI Platform Policy initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPolicyInit.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPolicyInit.h
index 4f4a80b9ae..47ede26b05 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPolicyInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPolicyInit.h
@@ -2,13 +2,7 @@
   Header file for the PeiSiPolicyInit
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFsp.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFsp.inf
index 7f0d7a5dec..9ffb84fa1e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFsp.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFsp.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
index f26eea6be6..9007f299bb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
@@ -2,13 +2,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ###
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
index bb21872e1e..65a67a6795 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
@@ -2,13 +2,7 @@
   Source code file for Platform Init Pre-Memory PEI module
 
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _ME_PEI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PEI_ME_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h b/Silicon/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _ME_POLICY_COMMON_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c
index 94a84a0478..31c7d59d1d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c
@@ -2,13 +2,7 @@
   This file is PeiMePolicy library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiMePolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf
index 3c6e325772..ea247181a4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h
index 85e8e2b154..a908bb6c24 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h
@@ -2,13 +2,7 @@
   Header file for the PeiMePolicy library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PEI_ME_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl 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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 include("GpioLibObjects.asl")
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
index 1468aedba4..ba1bf8cb93 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
@@ -1,13 +1,7 @@
 /**@file
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl 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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl 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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl 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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl 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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl 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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl 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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl
index 701cf6891a..a9d3756a74 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.asl
@@ -1,13 +1,7 @@
 /**@file
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl 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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl 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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl 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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl 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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl 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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _CIO2_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _DCI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _DMI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _ESPI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtectionConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtectionConfig.h
index b55aaa705a..77f43a80fc 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtectionConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtectionConfig.h
@@ -2,13 +2,7 @@
   FlashProtection policy
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _FLASH_PROTECTION_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.h
index a0ebbbd84d..6498d84646 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.h
@@ -2,13 +2,7 @@
   HDAUDIO policy
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _HDAUDIO_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _HPET_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _HSIO_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.h
index cf7bd6251a..c4043bee3e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.h
@@ -2,13 +2,7 @@
   HSIO pcie policy
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _HSIO_PCIE_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.h
index 53c1a01a17..fb1c2fa279 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.h
@@ -2,13 +2,7 @@
   Hsio Sata policy
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _HSIO_SATA_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.h
index 3b8e247a31..6a032dbe0b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.h
@@ -2,13 +2,7 @@
   Interrupt policy
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _INTERRUPT_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _IOAPIC_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _ISH_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _LAN_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfig.h
index f083b3b50c..4f7526f3eb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfig.h
@@ -2,13 +2,7 @@
   Lock down policy
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _LOCK_DOWN_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _LPC_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _P2SB_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConfig.h
index c946e9a116..9873061049 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConfig.h
@@ -2,13 +2,7 @@
   PCH General policy
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_GENERAL_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_PCIE_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PORT_61_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SATA_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SCS_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
index 5caa24310a..529c89f3bf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
@@ -2,13 +2,7 @@
   Serial IO policy
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SERIAL_IO_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.h
index b64579cd92..38ab7ca013 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.h
@@ -2,13 +2,7 @@
   Serial IRQ policy
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SERIAL_IRQ_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SMBUS_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SPI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.h
index 8963da6ee7..b64948ac05 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.h
@@ -2,13 +2,7 @@
   Thermal policy
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _THERMAL_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig.h
index 5455c40514..a284dd3840 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig.h
@@ -2,13 +2,7 @@
   Trace Hub policy
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _TRACEHUB_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _USB_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfig.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfig.h
index 610c1092fb..a01481af64 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfig.h
@@ -2,13 +2,7 @@
   WatchDog policy
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _WATCH_DOG_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h b/Silicon/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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,
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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,
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _GPIO_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.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,
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _OC_WDT_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib.h
index 8247f8f3c8..1b24e94f74 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib.h
@@ -2,13 +2,7 @@
   Header file for PchCycleDecodingLib.
 
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_CYCLE_DECODING_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.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,
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_GBE_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_HSIO_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_INFO_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_P2SB_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_PMC_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_PSF_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_RESET_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_SBI_ACCESS_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_SERIAL_IO_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
index 66c5945a7b..ac729c2bcf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
@@ -2,13 +2,7 @@
   Header file for PCH Serial IO UART Lib implementation.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_SERIAL_IO_UART_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_SMM_CONTROL_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.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 standalone module.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SEC_PCH_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
index 12dfaeb440..0c5e72258c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.h
@@ -3,13 +3,7 @@
   internal structure and functions used by SpiFlashCommonLib.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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.
 
 Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _TRACE_HUB_INIT_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h b/Silicon/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_ACCESS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h b/Silicon/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_LIMITS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_POLICY_COMMON_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_PREMEM_POLICY_COMMON_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_PRESERVED_RESOURCES_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h b/Silicon/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_SPI_PPI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h b/Silicon/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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PEI_WDT_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatch.h
index eb08a89f00..68f76fc411 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatch.h
@@ -2,13 +2,7 @@
   APIs of PCH ACPI SMI Dispatch Protocol.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_ACPI_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_EMMC_TUNING_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch.h
index 7d7d3a5339..f3e2e05eda 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch.h
@@ -2,13 +2,7 @@
   SmmEspiDispatch Protocol
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_ESPI_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmiDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmiDispatch.h
index 392733117b..4df549ec31 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmiDispatch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmiDispatch.h
@@ -2,13 +2,7 @@
   APIs of PCH GPIO UNLOCK SMI Dispatch Protocol.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_INFO_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch.h
index b80597ae9b..cff66f4366 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch.h
@@ -2,13 +2,7 @@
   APIs of PCH PCIE SMI Dispatch Protocol.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_RESET_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapControl.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapControl.h
index 5d0a4d34cf..d94dc2c480 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapControl.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapControl.h
@@ -2,13 +2,7 @@
   PCH SMM IO Trap Control Protocol
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_SMM_IO_TRAP_CONTROL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTimerControl.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTimerControl.h
index 95c680e75c..4e2c73e28d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTimerControl.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTimerControl.h
@@ -2,13 +2,7 @@
   PCH SMM Periodic Timer Control Protocol
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_SMM_PERIODIC_TIMER_CONTROL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch.h
index 457cdb682c..60c627f778 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch.h
@@ -2,13 +2,7 @@
   APIs of PCH TCO SMI Dispatch Protocol.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_TCO_SMI_DISPATCH_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _DXE_WDT_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_CAM_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_DCI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_DMI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_FIA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_GPIO_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_HDA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_HSIO_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_ISH_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_ITSS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_LAN_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_LPC_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_P2SB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_PCIE_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_PCR_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_PMC_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_PSF_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_PSTH_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_SATA_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_SCS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_SERIAL_IO_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_SMBUS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_SPI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_THERMAL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_REGS_USB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNhlt.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNhlt.h
index 5e7674a412..366b9d6707 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNhlt.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNhlt.h
@@ -2,13 +2,7 @@
   Header file for DxePchHdaLib - NHLT structure definitions.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib.h
index f555182bc4..395d009adf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib.h
@@ -3,13 +3,7 @@
   All function in this library is available for PEI, DXE, and SMM,
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _GPIO_PRIVATE_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCommonLib.h
index 8f0a1adf38..9c8335861d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCommonLib.h
@@ -2,13 +2,7 @@
  Implement the I2C port control.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitCommonLib.h
index 8c016c624f..449b38f111 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitCommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitCommonLib.h
@@ -2,13 +2,7 @@
   Header file for PCH Init Common Lib
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_INIT_COMMON_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpressHelpersLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpressHelpersLib.h
index 49c89a2fcc..2c800ca8e0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpressHelpersLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpressHelpersLib.h
@@ -2,13 +2,7 @@
   Header file for PCH PCI Express helpers library
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_PCI_EXPRESS_HELPERS_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateLib.h
index ad390103ce..e72cc87a27 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateLib.h
@@ -2,13 +2,7 @@
   Header file for PchPsfPrivateLib.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_PSF_PRIVATE_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCommonLib.h
index 5c2a6c30e2..e6494a1a38 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCommonLib.h
@@ -2,13 +2,7 @@
   PCH Smbus Protocol
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_SMBUS_COMMON_LIB_H
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommonLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommonLib.h
index 8b6b6a6c97..d408289ea2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommonLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommonLib.h
@@ -2,13 +2,7 @@
   Header file for the PCH SPI Common Driver.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_SPI_COMMON_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterLib.h
index da4cfc6d19..78c07f20c6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterLib.h
@@ -2,13 +2,7 @@
   PEI I2C Master module
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.h
index 2301c9fc0f..28edfda991 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.h
@@ -2,13 +2,7 @@
   Header file for Rst Library
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_CONFIG_HOB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_NVS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.h
index 66c119f577..c82498bde5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.h
@@ -1,13 +1,7 @@
 /**@file
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
index 26d13b7a7d..8e05dd2c0a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
@@ -2,13 +2,7 @@
   This file defines the PCH PCIE IoTrap Protocol.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_PCIE_IOTRAP_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.c
index f6f708172e..0fddff71a1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.c
@@ -2,13 +2,7 @@
   System reset library services.
 
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Uefi.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.inf
index 2af43b5091..4c46216b44 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseResetSystemLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.c
index 17e42dfd0b..5d09e18613 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.c
@@ -2,13 +2,7 @@
   PCH SMBUS library implementation built upon I/O library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.inf
index a737f7105f..2894d137b9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.c
index c591bdddef..51facacf08 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.c
@@ -2,13 +2,7 @@
   System reset library services.
 
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.inf
index 1736c3189e..aa8877140a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeResetSystemLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/DxeRuntimeResetSystemLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/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.
 
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/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/GpioInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioInit.c
@@ -2,13 +2,7 @@
   This file contains routines for GPIO initialization
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "GpioLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "GpioLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibrary.h
index 97a5287067..ed4f2f8023 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibrary.h
@@ -2,13 +2,7 @@
   Header file for GPIO Lib implementation.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _GPIO_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNativeLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNativeLib.c
index e57e3ecbfa..a4f6466ed4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNativeLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNativeLib.c
@@ -2,13 +2,7 @@
   This file contains routines for GPIO native and chipset specific usage
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "GpioLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpioData.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpioData.c
index c36792139c..42f57df921 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpioData.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpioData.c
@@ -2,13 +2,7 @@
   This file contains SKL specific GPIO information
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "GpioLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf
index 747fa67199..1282118d55 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeSmmGpioLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c
index 1f13b094fc..540e5ba116 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PchCycleDecodingLib.c
@@ -2,13 +2,7 @@
   PCH cycle deocding configuration and query library.
 
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf
index 446703d918..24d08f662f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/PeiDxeSmmPchCycleDecodingLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodingLib/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c
index 277923bdcc..d3bdfd2fc8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGbeLib.c
@@ -4,13 +4,7 @@
   But do not support UEFI RUNTIME environment call.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf
index b05d82fce1..bfcb71ec20 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDxeSmmPchGbeLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHsioLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHsioLib.c
index d3e6094954..d7483ebd97 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHsioLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHsioLib.c
@@ -4,13 +4,7 @@
   But do not support UEFI RUNTIME environment call.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDxeSmmPchHsioLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDxeSmmPchHsioLib.inf
index f233f3e673..11a32ad78e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDxeSmmPchHsioLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDxeSmmPchHsioLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c
index 3f72e006c8..a1c20ba04f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoLib.c
@@ -5,13 +5,7 @@
   But do not support UEFI RUNTIME environment call.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c
index 6fb06eac2f..05b8587263 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInfoStrLib.c
@@ -5,13 +5,7 @@
   But do not support UEFI RUNTIME environment call.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf
index 35566d8243..44d56ea838 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDxeSmmPchInfoLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c
index dba89d3edc..ca3a222979 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2sbLib.c
@@ -4,13 +4,7 @@
   But do not support UEFI RUNTIME environment call.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf
index 115175f8a2..da3390c4ca 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDxeSmmPchP2sbLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PchPcieRpLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PchPcieRpLib.c
index 6b8a51d8d2..43caf3e9bd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PchPcieRpLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PchPcieRpLib.c
@@ -4,13 +4,7 @@
   But do not support UEFI RUNTIME environment call.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PeiDxeSmmPchPcieRpLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PeiDxeSmmPchPcieRpLib.inf
index 79ddb969ae..6b22411162 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PeiDxeSmmPchPcieRpLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/PeiDxeSmmPchPcieRpLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c
index e2585c36e0..b07a903d44 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcrLib.c
@@ -4,13 +4,7 @@
   But do not support UEFI RUNTIME environment call.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf
index fdc523143f..2de45d5240 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxeSmmPchPcrLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c
index 1985d5d133..790af0a7a1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchPmcLib.c
@@ -4,13 +4,7 @@
   But do not support UEFI RUNTIME environment call.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf
index bd3a33ff70..8b46a59b67 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDxeSmmPchPmcLib.inf
@@ -6,13 +6,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLib.c
index 08a28f7e6d..a6f484f47b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfLib.c
@@ -2,13 +2,7 @@
   This file contains PSF routines
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf
index 941f5a72dd..82db84c539 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxeSmmPchPsfLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/PchSbiAccessLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/PeiDxeSmmPchSerialIoLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib/WdtCommon.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonLib/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 standalone module.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Uefi/UefiBaseType.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.c
index fdde6803c3..ccd6c73599 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.c
@@ -2,13 +2,7 @@
   The Null PEI Library Implements OcWdt Support.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.inf
index 93c951d49c..dbe58c6acd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLibNull.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c
index 650d414247..b7fcb0944e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c
@@ -2,13 +2,7 @@
   Print whole PCH_PREMEM_POLICY_PPI
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c
index 13a8f9fbd6..72a78e5faf 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c
@@ -2,13 +2,7 @@
   Print whole PCH_POLICY_PPI
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c
index 4e57b72d6e..62b621ce2f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c
@@ -2,13 +2,7 @@
   This file is to load sample board policy.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c
index fcefd76e8e..6cf9d9069e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c
@@ -2,13 +2,7 @@
   This file is to load sample board policy.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
index f0f9f33f71..201c49b3a8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
@@ -2,13 +2,7 @@
   This file is PeiPchPolicy library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
index d4d4ac1e54..39004319aa 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
index 9be618d38a..f8d01614ac 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
@@ -2,13 +2,7 @@
   Header file for the PeiPchPolicy library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PEI_PCH_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c
index 5480cf3d5c..b5c1a39399 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c
@@ -2,13 +2,7 @@
   This file is PeiPchPreMemPolicy library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiPchPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.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.
 
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <PiPei.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLib.inf
index b03a986313..b04f4006ef 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.c
index 9429b0ecf4..6f12abf111 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.c
@@ -2,13 +2,7 @@
   System reset library services.
 
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.inf
index a259bdf6ec..18a92a6f18 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLibFsp.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLibFsp.inf
index 9abb7c2107..e7284e6668 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLibFsp.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetSystemLibFsp.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.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.
 
 Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
index c7b3e864eb..d712b9e5f7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SmmSpiFlashCommonLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ###
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
index d95f51af41..7ee7ffab50 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
@@ -3,13 +3,7 @@
   for module use.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c
index 8d2238dbf1..11133163d2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiFlashCommonSmmLib.c
@@ -2,13 +2,7 @@
   SMM Library instance of SPI Flash Common Library Class
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/BasePchSpiCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/BasePchSpiCommonLib.inf
index 128f7adcea..599b07d3d3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/BasePchSpiCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/SpiCommon.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/SpiCommon.c
index 0b708d4aad..58757a8cba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/SpiCommon.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/SpiCommon.c
@@ -2,13 +2,7 @@
   PCH SPI Common Driver implements the SPI Host Controller Compatibility Interface.
 
 Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Uefi/UefiBaseType.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf
index 52d7c8bbaf..04940c75c1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaEndpoints.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaEndpoints.c
index 11c6ec0269..31ea72bc55 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaEndpoints.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaEndpoints.c
@@ -2,13 +2,7 @@
   This file contains HD Audio NHLT Endpoints definitions
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaLib.c
index e577cd9038..2e93507a8a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaLib.c
@@ -2,13 +2,7 @@
   PCH HD Audio Library implementation.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaNhltConfig.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaNhltConfig.c
index 46096a0ac3..6e56d357f5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaNhltConfig.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHdaNhltConfig.c
@@ -2,13 +2,7 @@
   This file contains HD Audio NHLT Configuration BLOBs
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/I2cMasterCommonLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/I2cMasterCommonLib.c
index 32814bf773..16a2c73a77 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/I2cMasterCommonLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/I2cMasterCommonLib.c
@@ -2,13 +2,7 @@
  Implement the I2C controller driver.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/PeiDxeI2cMasterCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/PeiDxeI2cMasterCommonLib.inf
index a6af85a4a0..5218191d8a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/PeiDxeI2cMasterCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioNativePrivateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioNativePrivateLib.c
index 89bf0a73ee..d47ae6fd55 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioNativePrivateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioNativePrivateLib.c
@@ -3,13 +3,7 @@
   used by Reference Code only.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c
index b386e071f7..bc660b0906 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/GpioPrivateLib.c
@@ -2,13 +2,7 @@
   This file contains GPIO routines for RC usage
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PchSklGpioPrivateData.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PchSklGpioPrivateData.c
index 3d8b128a1c..6cf855d692 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PchSklGpioPrivateData.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PchSklGpioPrivateData.c
@@ -2,13 +2,7 @@
   This file contains SKL specific GPIO information
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf
index d2542a1673..7986358ce1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchInitCommon.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchInitCommon.c
index a49bbc5c18..ed088bd642 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchInitCommon.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchInitCommon.c
@@ -2,13 +2,7 @@
   Pch common library for PCH INIT PEI/DXE/SMM modules
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchRpfn.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchRpfn.c
index 77dd285430..1cd4884bc9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchRpfn.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PchRpfn.c
@@ -2,13 +2,7 @@
   This file contains functions that configures PCI Express Root Ports function swapping.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Uefi/UefiBaseType.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf
index df4900d964..52ab228442 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
index 815b800db7..04145d8373 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.c
@@ -2,13 +2,7 @@
   This file contains routines that support PCI Express initialization
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchPciExpressHelpersLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.h
index bd59b5346e..7fe8985946 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PchPciExpressHelpersLibrary.h
@@ -2,13 +2,7 @@
   Header file for PCH Pci Express helps library implementation.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_PCI_EXPRESS_HELPERS_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
index b02f311f02..39dc89670a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PchPsfPrivateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PchPsfPrivateLib.c
index ef579c825d..55124c0cb9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PchPsfPrivateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PchPsfPrivateLib.c
@@ -2,13 +2,7 @@
   This file contains PSF routines for RC usage
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Base.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PeiDxeSmmPchPsfPrivateLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PeiDxeSmmPchPsfPrivateLib.inf
index 6995171b10..0d7050500a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PeiDxeSmmPchPsfPrivateLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c
index ad5c784bff..abdc06cd70 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PchSmbusExec.c
@@ -2,13 +2,7 @@
   PCH Smbus Executive Code (common PEI/DXE/SMM code)
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <Uefi/UefiBaseType.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PeiDxeSmmPchSmbusCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PeiDxeSmmPchSmbusCommonLib.inf
index 54a67614af..78324e1fef 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PeiDxeSmmPchSmbusCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.c
index 7436a76ec1..e97d48f777 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.c
@@ -2,13 +2,7 @@
  Routines for Rst remapping
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf
index 1bbcc7eda7..413d0c86f8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c b/Silicon/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c b/Silicon/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h b/Silicon/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf 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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c b/Silicon/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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <PchInit.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c b/Silicon/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <PchInit.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <PchInit.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchInitSmm.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSmm.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSmm.c
index 4c3dd6cf11..4cad3c6230 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSmm.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSmm.c
@@ -2,13 +2,7 @@
   PCH GPIO Sx Isolation Driver Entry
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf 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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _IO_TRAP_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatch.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatch.c
index a0bd9aaaa1..5f8c9375ea 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatch.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatch.c
@@ -2,13 +2,7 @@
   This function handle the register/unregister of PCH specific SMI events.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf
index a593d631d3..46c4c72617 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef PCH_SMM_H
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCore.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchSmm.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.c
index fea1ac9165..24bdf6a6e5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.c
@@ -2,13 +2,7 @@
   Helper functions for PCH SMM dispatcher.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.h
index 44a8936790..dffd0e3944 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelpers.h
@@ -2,13 +2,7 @@
   Helper functions for PCH SMM
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef PCH_SMM_HELPERS_H
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeriodicTimer.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeriodicTimer.c
index 324eaeb7e8..29afe30817 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeriodicTimer.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeriodicTimer.c
@@ -2,13 +2,7 @@
   File to contain all the hardware specific stuff for the Periodical Timer dispatch protocol.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPowerButton.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPowerButton.c
index 404d2a31bc..82f0f6ffb2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPowerButton.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPowerButton.c
@@ -2,13 +2,7 @@
   File to contain all the hardware specific stuff for the Smm Power Button dispatch protocol.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <PchSmmHelpers.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.c
index d4f4603eea..4d2a926491 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.c
@@ -3,13 +3,7 @@
   and the abstraction of the PCH SMI sources.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchSmmHelpers.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.h
index 273bed32bc..08bf728da0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHelpers.h
@@ -3,13 +3,7 @@
   and the abstraction of the PCH SMI sources.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCHX_SMM_HELPERS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControl.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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.c
index 96727dde8f..7abac4e110 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.c
@@ -2,13 +2,7 @@
   This is the driver that publishes the SMM Control Protocol.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "SmmControlDriver.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.h
index 110b93a3ca..fbb108f9d8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/SmmControl/RuntimeDxe/SmmControlDriver.h
@@ -2,13 +2,7 @@
   Header file for SMM Control Driver.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SMM_CONTROL_DRIVER_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.c b/Silicon/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 Interface.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PchSpi.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpi.h b/Silicon/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PCH_SPI_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Spi/Smm/PchSpiSmm.inf b/Silicon/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatformLib.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatformLib.h
index f9bbc931aa..bf4f75effb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatformLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Include/Library/SecPlatformLib.h
@@ -2,13 +2,7 @@
   Prototype of SEC Platform hook library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h
index d18a2eda21..7611700179 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkModulePkg/Include/Guid/DataHubStatusCodeRecord.h
@@ -2,13 +2,7 @@
   GUID used to identify Data Hub records logged by Status Code Protocol.
 
 Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Guid/SmramMemoryReserve.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/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 reservation and H-SEG usage
 
 Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under 
-the terms and conditions of the BSD License that accompanies this distribution.  
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.                                          
-    
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @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/IntelFrameworkPkg/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 <= TPL_NOTIFY.
 
 Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Revision Reference:
   The Data Hub Protocol is defined in Framework for EFI Data Hub Specification
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.
 
 Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Revision Reference:
   This protocol is defined in Framework for EFI Compatibility Support Module 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.
 
 Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Revision Reference:
   This protocol is defined in Framework for EFI Compatibility Support Module spec
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/IntelFrameworkPkg/Include/Protocol/LegacyInterrupt.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/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 Compatibility Support Modules (CSMs).
 
 Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Revision Reference:
   This protocol is defined in Framework for the EFI Compatibility Support Module specification.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/AcpiS3Context.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/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 @@
 
 Copyright (c) 2011 - 2012, Intel Corporation. All rights reserved.<BR>
 
-This program and the accompanying materials
-are licensed and made available under the terms and conditions
-of the BSD License which accompanies this distribution.  The
-full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/ConsoleOutDevice.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/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 device is the console-out device.
 
 Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Guid/MemoryTypeInformation.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/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.
 
 Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Library/ResetSystemLib.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Library/ResetSystemLib.h
index 6cab22a80c..75d3e15ed7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Library/ResetSystemLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Library/ResetSystemLib.h
@@ -3,13 +3,7 @@
   methods that reset the whole system.
 
 Copyright (c) 2005 - 2010, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/SmmAccess.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/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 @@
 
 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 BSD License which accompanies this distribution.  The
-full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Ppi/SmmControl.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/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 @@
 
   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 BSD License which accompanies this distribution.  The
-  full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Protocol/SmmVariable.h b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Protocol/SmmVariable.h
index 7e72bee166..c2dbdb3651 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Protocol/SmmVariable.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/MdeModulePkg/Include/Protocol/SmmVariable.h
@@ -3,13 +3,7 @@
   and intended for use as a means to store data in the EFI SMM environment.
 
   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 BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSmb.asl b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSmb.asl
index 25c4960585..9f23b3bb3c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSmb.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SampleCode/Pch/AcpiTables/Dsdt/PchSmb.asl
@@ -6,13 +6,7 @@
   driver with SMBUS operation region support implemented for ACPI usage.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkg.dec b/Silicon/Intel/KabylakeSiliconPkg/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgBuildOption.dsc b/Silicon/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 #
diff --git a/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgDxeLib.dsc b/Silicon/Intel/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SiPkgPeiLib.dsc b/Silicon/Intel/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.aslc b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.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
   
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "Dmar.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/Dmar/Dmar.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.
   
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SA_DMAR_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/HostBus.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 table.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaAcpiTables.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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 ################################################################################
diff --git a/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.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/Igfx.asl
@@ -7,13 +7,7 @@
   present in the system, etc.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxCommon.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxCommon.asl
index 4d28ad0068..5f46e49ff6 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxCommon.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxCommon.asl
@@ -4,13 +4,7 @@
   i.e. hotkeys and other system interrupts.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 //
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.asl
index 974f7b706d..a045242872 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxDsm.asl
@@ -4,13 +4,7 @@
   the Integrated Graphics Device (IGD) OpRegion/DSM mechanism
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpGbda.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpGbda.asl
index cd86e25fca..4705df772d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpGbda.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpGbda.asl
@@ -4,13 +4,7 @@
   the Integrated Graphics Device (IGD) OpRegion/Software SCI mechanism
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 Method (GBDA, 0, Serialized)
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.asl
index 4e3b6c5522..4f85e17a0e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpRn.asl
@@ -6,13 +6,7 @@
   as described in the IGD OpRegion specification.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 //
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSbcb.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSbcb.asl
index 1f688e3b4a..e6a6f67621 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSbcb.asl
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/IgfxOpSbcb.asl
@@ -3,13 +3,7 @@
   OpRegion/Software SCI mechanism.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.asl b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/SaSsdt.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/AcpiTables/SaSsdt/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 ################################################################################
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsDxeConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsDxeConfig.h
index 8f746dcc95..81549871b7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsDxeConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsDxeConfig.h
@@ -2,13 +2,7 @@
   Graphics DXE Policy definitions
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _GRAPHICS_DXE_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsPeiConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsPeiConfig.h
index ee294650bf..4063f800e8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsPeiConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/GraphicsPeiConfig.h
@@ -2,13 +2,7 @@
   Policy definition for Internal Graphics Config Block (PostMem)
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _GRAPHICS_PEI_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MemoryConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MemoryConfig.h
index 8f77fa720b..d64d3d3d0a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MemoryConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MemoryConfig.h
@@ -2,13 +2,7 @@
   Policy definition of Memory Config Block
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _MEMORY_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscDxeConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscDxeConfig.h
index 18a5371c4b..08229cd33c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscDxeConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/MiscDxeConfig.h
@@ -2,13 +2,7 @@
   MISC DXE policy definitions
   
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _MISC_DXE_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMiscPeiPreMemConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMiscPeiPreMemConfig.h
index 0bf1934207..4aa02e3142 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMiscPeiPreMemConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/SaMiscPeiPreMemConfig.h
@@ -2,13 +2,7 @@
   Policy details for miscellaneous configuration in System Agent
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SA_MISC_PEI_PREMEM_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdConfig.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdConfig.h
index 086d70849a..8430563788 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdConfig.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/ConfigBlock/VtdConfig.h
@@ -2,13 +2,7 @@
   VT-d policy definitions.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _VTD_CONFIG_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTable.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTable.h
index 0c49f98f2c..08edcee410 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTable.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/DmaRemappingTable.h
@@ -2,13 +2,7 @@
   This code defines ACPI DMA Remapping table related definitions.
   
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _DMA_REMAPPING_TABLE_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicyLib.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicyLib.h
index 12274d797d..61457dfb59 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/DxeSaPolicyLib.h
@@ -2,13 +2,7 @@
   Prototype of the DxeSaPolicyLib library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _DXE_SA_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h
index 6348fd003e..28e648f4a0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h
@@ -2,13 +2,7 @@
   Prototype of the PeiSaPolicy library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PEI_SA_POLICY_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformLib.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformLib.h
index f3762e91a5..cf62e1a9e2 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/SaPlatformLib.h
@@ -2,13 +2,7 @@
   Header file for SaPlatformLib.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/MemInfoHob.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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/GopPolicy.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/GopPolicy.h
@@ -2,13 +2,7 @@
   Interface definition for GopPolicy Protocol.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _GOP_POLICY_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegion.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegion.h
index b39ccc31d4..1410a8a309 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegion.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/IgdOpRegion.h
@@ -3,13 +3,7 @@
   an interface between system BIOS, ASL code, and Graphics drivers.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 @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/MemInfo.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _MEM_INFO_PROTOCOL_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalNvsArea.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalNvsArea.h
index 5daf183c1a..08ab89898b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalNvsArea.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaGlobalNvsArea.h
@@ -4,13 +4,7 @@
   used as a communications buffer between SMM/DXE/PEI code and ASL code.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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/SaNvs.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
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/SaPolicy.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
@@ -2,13 +2,7 @@
   Interface definition details between System Agent and platform drivers during DXE phase.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SAACCESS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SA_REGS_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob.h
index 02ec08fc96..16f31bbdfd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/IncludePrivate/SaConfigHob.h
@@ -2,13 +2,7 @@
   The GUID definition for SaConfigHob
   
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SA_CONFIG_HOB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c
index 4909ed8f62..67fe214d0e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c
@@ -2,13 +2,7 @@
   This file provide services for DXE phase policy default initialization
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf
index f75ecb1388..9eb389b14f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h
index f754072411..ec1b7d10e8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h
@@ -2,13 +2,7 @@
   Header file for the DxeSaPolicy library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _DXE_SA_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/PeiDxeSmmSaPlatformLib.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/PeiDxeSmmSaPlatformLib.inf
index 860da17031..9fe71e5bac 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/PeiDxeSmmSaPlatformLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.c
index df662b0222..4fd3ffa64b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.c
@@ -2,13 +2,7 @@
   SA Platform Lib implementation.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "SaPlatformLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.h
index 632b801ad2..1e7b0d051a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiDxeSmmSaPlatformLib/SaPlatformLibrary.h
@@ -2,13 +2,7 @@
   Header file for SA Platform Lib implementation.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.S b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.S
index d8fe66154a..74e5589d0b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.S
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/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 available under
-# the terms and conditions of the BSD License that accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php.
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.asm b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.asm
index bef8aafe1a..3899ef119e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.asm
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.asm
@@ -2,13 +2,7 @@
 ;  This file provides assembly 64-bit atomic reads/writes required for memory initialization.
 ;
 ; Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-; This program and the accompanying materials are licensed and made available under
-; the terms and conditions of the BSD License that accompanies this distribution.
-; The full text of the license may be found at
-; http://opensource.org/licenses/bsd-license.php.
-;
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+; SPDX-License-Identifier: BSD-2-Clause-Patent
 ;
 ;;
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm
index 5bc17065bd..03c1380f89 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Ia32/MrcOemPlatform.nasm
@@ -2,13 +2,7 @@
 ;  This file provides assembly 64-bit atomic reads/writes required for memory initialization.
 ;
 ; Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-; This program and the accompanying materials are licensed and made available under
-; the terms and conditions of the BSD License that accompanies this distribution.
-; The full text of the license may be found at
-; http://opensource.org/licenses/bsd-license.php.
-;
-; THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-; WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+; SPDX-License-Identifier: BSD-2-Clause-Patent
 ;
 ;;
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c
index e4d6f1b35c..f62651796a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c
@@ -2,13 +2,7 @@
   This file is SampleCode for Intel SA PEI Policy initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.h
index f561138b04..53440d5d80 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.h
@@ -4,13 +4,7 @@
   This file is SampleCode for Intel SA PEI Policy initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.c
index ddc83ba4b2..eb18d993e7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.c
@@ -2,13 +2,7 @@
   This file provides services for PEI policy default initialization
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiSaPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf
index 0afd31b584..8fae4cee61 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf
@@ -3,13 +3,7 @@
 #
 # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
 #
-# This program and the accompanying materials are licensed and made available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c
index a65349b29c..63e93094e1 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c
@@ -2,13 +2,7 @@
   This file provides services for Sample PEI policy default initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include <SaPolicyCommon.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h
index e7fe3d2fcf..a44f7343dd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h
@@ -2,13 +2,7 @@
   Header file for the PeiSaPolicy library.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _PEI_SA_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c
index 0a6ddb8a8f..8b3a81a1c4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c
@@ -2,13 +2,7 @@
   This file provides service for PEI phase policy printing
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiSaPolicyLibrary.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCommonTypes.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCommonTypes.h
index 792b2ca58d..3b612e3177 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCommonTypes.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcCommonTypes.h
@@ -2,13 +2,7 @@
   This file contains the definitions common to the MRC API and other APIs.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _MrcCommonTypes_h_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInterface.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInterface.h
index 87ad005f03..8e6aa32ed8 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInterface.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcInterface.h
@@ -2,13 +2,7 @@
   This file includes all the data structures that the MRC considers "global data".
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _MrcInterface_h_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRmtData.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRmtData.h
index 51d40ff376..73cdb214f7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRmtData.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcRmtData.h
@@ -3,13 +3,7 @@
   Compatible BIOS data (BDAT) table.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _MrcRmtData_h_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSpdData.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSpdData.h
index cbfeb1cd0a..304db700c0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSpdData.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcSpdData.h
@@ -2,13 +2,7 @@
   SPD data format header file.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTypes.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTypes.h
index 5bb771089d..241e5adcb7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTypes.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/MemoryInit/Include/MrcTypes.h
@@ -3,13 +3,7 @@
   Include the the general MRC types
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _MRC_TYPES_H
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.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 initialization.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "GraphicsInit.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _GRAPHICS_INIT_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.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
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @par Specification Reference:
   - OpRegion / Software SCI SPEC
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegion.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 drivers.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
   @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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SA_INITIALIZATION_DRIVER_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "SaInitDxe.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.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.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SA_INITIALIZATION_DXE_DRIVER_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/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 Technology for Directed I/O).
   
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #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 Technology for Directed I/O).
   
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _VT_D_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccess.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 available under
-# the terms and conditions of the BSD License which accompanies this distribution.
-# The full text of the license may be found at
-# http://opensource.org/licenses/bsd-license.php
-#
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+# SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
index 3e8fd96484..f03dbe3d27 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.c
@@ -3,13 +3,7 @@
   instance for System Agent.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "SmmAccessDriver.h"
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.h
index 69e9e89b24..dbc1894af5 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SmmAccess/Dxe/SmmAccessDriver.h
@@ -2,13 +2,7 @@
   Header file for SMM Access Driver.
 
 Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-This program and the accompanying materials are licensed and made available under
-the terms and conditions of the BSD License that accompanies this distribution.
-The full text of the license may be found at
-http://opensource.org/licenses/bsd-license.php.
-
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #ifndef _SMM_ACCESS_DRIVER_H_
-- 
2.21.0.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
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]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [[edk2-platforms][PATCH V2] 23/30] Silicon/Intel/KabylakeSiliconPkg: Replace BSD License with BSD+Patent License

Posted by Kubacki, Michael A 1 week ago
Reviewed-by: Michael Kubacki <michael.a.kubacki@intel.com>

> -----Original Message-----
> From: Kinney, Michael D
> Sent: Wednesday, May 15, 2019 4:10 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Kubacki, Michael A
> <michael.a.kubacki@intel.com>
> Subject: [[edk2-platforms][PATCH V2] 23/30]
> Silicon/Intel/KabylakeSiliconPkg: Replace BSD License with BSD+Patent
> License
> 
> https://bugzilla.tianocore.org/show_bug.cgi?id=1373
> 
> Replace BSD 2-Clause License with BSD+Patent License.  This change is
> based on the following emails:
> 
>   https://lists.01.org/pipermail/edk2-devel/2019-February/036260.html
>   https://lists.01.org/pipermail/edk2-devel/2018-October/030385.html
> 
> RFCs with detailed process for the license change:
> 
>   V3: https://lists.01.org/pipermail/edk2-devel/2019-March/038116.html
>   V2: https://lists.01.org/pipermail/edk2-devel/2019-March/037669.html
>   V1: https://lists.01.org/pipermail/edk2-devel/2019-March/037500.html
> 
> 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/CpuConfig.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspD
> ata.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspD
> ata.h
> index 8f333cffeb..53e6d45fe5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspD
> ata.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigFspD
> ata.h
> @@ -2,13 +2,7 @@
>    FSP CPU Data Config Block.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_CONFIG_FSP_DATA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPr
> eMemConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPr
> eMemConfig.h
> index 19e41287ce..4823b1d713 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPr
> eMemConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuConfigLibPr
> eMemConfig.h
> @@ -2,13 +2,7 @@
>    CPU PreMemory Config Block.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_CONFIG_LIB_PREMEM_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockin
> gConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockin
> gConfig.h
> index 735e79c491..7a6d89ebda 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockin
> gConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuOverclockin
> gConfig.h
> @@ -2,13 +2,7 @@
>    CPU Overclocking Config Block.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_OVERCLOCKING_PREMEM_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConf
> ig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConf
> ig.h
> index d8b5a2ed98..c55f9a0cc3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConf
> ig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPidTestConf
> ig.h
> @@ -2,13 +2,7 @@
>    CPU PID Config Block.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_PID_TEST_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tBasicConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tBasicConfig.h
> index 68dc9195ae..6fe9126377 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tBasicConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tBasicConfig.h
> @@ -2,13 +2,7 @@
>    CPU Power Management Basic Config Block.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_POWER_MGMT_BASIC_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tCustomConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tCustomConfig.h
> index edb8182db5..026a1aff5f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tCustomConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tCustomConfig.h
> @@ -2,13 +2,7 @@
>    CPU Power Managment Custom Config Block.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_POWER_MGMT_CUSTOM_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tPsysConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tPsysConfig.h
> index 05b1efd5b6..75b49dbe7a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tPsysConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tPsysConfig.h
> @@ -2,13 +2,7 @@
>    CPU Power Management Psys(Platform) Config Block.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_POWER_MGMT_PSYS_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tTestConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tTestConfig.h
> index bf6e829fa3..ab0c194e76 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tTestConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tTestConfig.h
> @@ -2,13 +2,7 @@
>    CPU Power Management Test Config Block.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_POWER_MGMT_TEST_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tVrConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tVrConfig.h
> index ad4ed76250..802f585819 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tVrConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuPowerMgm
> tVrConfig.h
> @@ -2,13 +2,7 @@
>    CPU Power Management VR Config Block.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_POWER_MGMT_VR_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.
> h
> index 2b1fa5b3a5..2cdf834a89 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/ConfigBlock/CpuTestConfig.
> h
> @@ -2,13 +2,7 @@
>    CPU Test Config Block.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_TEST_CONFIG_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuAccess.h
> b/Silicon/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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/CpuRegs.h
> b/Silicon/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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_REGS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuMailboxLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPlatformLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_POLICY_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem
> .h
> index 905937ec88..9e7518f91c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Library/CpuPolicyLibPreMem
> .h
> @@ -2,13 +2,7 @@
>    Prototype of the CpuPolicy library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_PREMEM_POLICY_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.
> h
> index 6e807a3504..59c0f812c5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Include/Protocol/CpuGlobalNvsArea.
> h
> @@ -6,13 +6,7 @@
>    @note Data structures defined in this protocol are not naturally aligned.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_INFO_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuInitDataHob.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_INIT_DATA_HOB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/CpuPrivateData.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CPU_PRIVATE_DATA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonL
> ib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonL
> ib.h
> index 8099236d88..759fa84175 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonL
> ib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/Library/CpuCommonL
> ib.h
> @@ -2,13 +2,7 @@
>    Header file for Cpu Common Lib implementation.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct
> .h
> index e7f7c19279..bd3fddb86f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/IncludePrivate/PowerMgmtNvsStruct
> .h
> @@ -2,13 +2,7 @@
>    This file contains CPU Gnvs Struct specific to processor
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _POWER_MGMT_NVS_STRUCT_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.c
> index ed964d00c3..bc2e93a1ac 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.c
> @@ -2,13 +2,7 @@
>    Mailbox Library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Uefi.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.inf
> index 0426e05802..0799aa891b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/BaseCpuMailboxLibNull/Base
> CpuMailboxLibNull.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPoli
> cy.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPoli
> cy.c
> index f871c21e6a..f13ca92661 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPoli
> cy.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/CpuPrintPoli
> cy.c
> @@ -2,13 +2,7 @@
>    This file is PeiCpuPolicy library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiCpuPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.c
> index 49331f1471..cb7f379e0f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.c
> @@ -2,13 +2,7 @@
>    This file is PeiCpuPolicy library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiCpuPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.inf
> index 24e9819e34..e0f4ee03ee 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> 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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Library.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Library.h
> index 81301b475e..d2a475591d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Library.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Library.h
> @@ -2,13 +2,7 @@
>    Header file for the PeiCpuPolicyLib library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PEI_CPU_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Cpu
> PrintPolicy.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Cpu
> PrintPolicy.c
> index 1807604405..d7ffd0b600 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Cpu
> PrintPolicy.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Cpu
> PrintPolicy.c
> @@ -2,13 +2,7 @@
>    This file is PeiCpuPolicy library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiCpuPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLib.c
> index 7d27c0b6dc..35041322a7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLib.c
> @@ -2,13 +2,7 @@
>    This file is PeiCpuPolicy library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiCpuPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibPreMem.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibPreMem.inf
> index df6e20baef..a18ea79147 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibPreMem.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibPreMem.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibrary.h
> index 8c039b4591..553b7a8ca9 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiC
> puPolicyLibrary.h
> @@ -2,13 +2,7 @@
>    Header file for the PeiCpuPolicyLib library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PEI_CPU_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.c
> index 830803a909..0cf2cc8a1f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.c
> @@ -2,13 +2,7 @@
>    CPU Platform Lib implementation.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.h
> index d5b8ed9ae4..3fcdbcb402 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/C
> puPlatformLibrary.h
> @@ -2,13 +2,7 @@
>    Header file for Cpu Platform Lib implementation.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/P
> eiDxeSmmCpuPlatformLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/P
> eiDxeSmmCpuPlatformLib.inf
> index 2a123ae708..21d441a577 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/P
> eiDxeSmmCpuPlatformLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiDxeSmmCpuPlatformLib/P
> eiDxeSmmCpuPlatformLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/CpuCommonLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/CpuCommonLib.c
> index 100bd1464c..4fa713612b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/CpuCommonLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/CpuCommonLib.c
> @@ -2,13 +2,7 @@
>    CPU Common Lib implementation.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/PeiDxeSmmCpuCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/PeiDxeSmmCpuCommonLib.inf
> index 70d33ce354..e5c546d67a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/PeiDxeSmmCpuCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/LibraryPrivate/PeiDxeSmmCpuComm
> onLib/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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/BootFirmwareMediaProtection.
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HardwareRootedBootIntegrity.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.c
> b/Silicon/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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/HstiSiliconDxe.h
> b/Silicon/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 driver
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection
> .c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection
> .c
> index d45cc586ba..184ec609ba 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection
> .c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/IntegratedDeviceDmaProtection
> .c
> @@ -2,13 +2,7 @@
>    This file contains the tests for the IntegratedDeviceDMAProtection bit
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MeasuredBootEnforcement.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/MpServiceHelp.c
> b/Silicon/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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureCpuConfiguration.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfig
> uration.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfig
> uration.c
> index c70ac41cf6..e53d45ee12 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfig
> uration.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureIntegratedGraphicsConfig
> uration.c
> @@ -2,13 +2,7 @@
>    This file contains the tests for the SecureIntegratedGraphics bit
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "HstiSiliconDxe.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguratio
> n.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureMemoryMapConfiguratio
> n.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecurePCHConfiguration.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "HstiSiliconDxe.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguratio
> n.c
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguratio
> n.c
> index 2f498cd532..d08a85b87e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguratio
> n.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Hsti/Dxe/SecureSystemAgentConfiguratio
> n.c
> @@ -2,13 +2,7 @@
>    This file contains the tests for the SecureSystemAgentConfiguration bit
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
> b/Silicon/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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/HstiFeatureBit.h
> b/Silicon/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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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).
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/PeiSiPolicyUpdateLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiConfigBlockLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/SiliconInitLib.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiInitPpi.h
> b/Silicon/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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Ppi/SiPolicy.h
> b/Silicon/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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Include/Protocol/SiPolicyProtocol.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 policy
> setting.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/SiPolicyStruct.h
> b/Silicon/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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/IncludePrivate/Library/PcieInitLib.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconBuild.bat
> b/Silicon/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 may
> 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
> 
>  @call edksetup.bat
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/KabylakeSiliconPkg.dsc
> b/Silicon/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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git a/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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.c
> index a411547ccb..b9bd6f3a48 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.c
> @@ -2,13 +2,7 @@
>    Library functions for Config Block management.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <ConfigBlock.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.inf
> index f544c75a6c..646c5b189c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBl
> ockLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.c
> index 98ff9e3410..8596933549 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.c
> @@ -3,13 +3,7 @@
>    to config block header.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <ConfigBlock.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.inf
> index 5961b1a6b2..c9a70c10c8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> 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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.c
> index ea85be4a11..e6ab43db6d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.c
> @@ -7,13 +7,7 @@
>    This library uses the ACPI Support protocol.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.inf
> index 0b24bbe71e..7a100128f3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> b.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLib/DxeAslUpdateLi
> 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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.c
> index 834315d236..490a09ddb5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.c
> @@ -7,13 +7,7 @@
>    This library uses the ACPI Support protocol.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.inf
> index 3805dbf1dd..a3c8aef60a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeAslUpdateLibNull/DxeAslUpda
> teLibNull.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyI
> nit.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyI
> nit.c
> index ac870bee84..694c896879 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyI
> nit.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxePolicyI
> nit.c
> @@ -2,13 +2,7 @@
>    This file is SampleCode for Intel PEI Platform Policy initialization.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolic
> yInit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolic
> yInit.h
> index ebc5023f7b..855a89fc23 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolic
> yInit.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSaPolic
> yInit.h
> @@ -2,13 +2,7 @@
>    Header file for the SaPolicyInitDxe Driver.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _SA_POLICY_INIT_DXE_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSilicon
> PolicyInitLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSilicon
> PolicyInitLib.inf
> index fbce84e78f..1997f43ab4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSilicon
> PolicyInitLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSilicon
> PolicyInitLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.c
> index 3688872019..51a06528e0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.c
> @@ -2,13 +2,7 @@
>    This file contains routines that get PCI Express Address
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Library/BaseLib.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.inf
> index 24cae56d04..8ae40a0c9e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiDxeSmmMmPciLib/PeiDxeSmm
> MmPciLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> index b7db139ded..813b868fcf 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> @@ -3,13 +3,7 @@
>    Policy and installs RC Policy PPI.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> index 134f60be5e..1d992cfbbd 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> index 3f80b990e9..e0d83cb467 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> @@ -3,13 +3,7 @@
>    Policy and installs RC Policy PPI.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> index 4c6ba6309d..f090e58868 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> @@ -2,13 +2,7 @@
>    Header file for the PeiSiPolicyLib library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.c
> index c3a96e5ad2..0de415ad19 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.c
> @@ -2,13 +2,7 @@
>    This file is SampleCode for Intel PEI Platform Policy initialization.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.h
> index e85724411a..c38294cfbe 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> t.h
> @@ -2,13 +2,7 @@
>    Header file for the PolicyInitPei PEIM.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> tPreMem.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> tPreMem.c
> index c402dee3a4..fd76b4fac3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> tPreMem.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPolicyIni
> tPreMem.c
> @@ -2,13 +2,7 @@
>    This file is SampleCode for Intel PEI Platform Policy initialization.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyI
> nit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyI
> nit.h
> index 4f4a80b9ae..47ede26b05 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyI
> nit.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiPolicyI
> nit.h
> @@ -2,13 +2,7 @@
>    Header file for the PeiSiPolicyInit
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconP
> olicyInitLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconP
> olicyInitLib.inf
> index ac37f17eae..7982a5d87f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconP
> olicyInitLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiSiliconP
> olicyInitLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiPostMemSiliconPolicyInitLibDependency.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiPostMemSiliconPolicyInitLibDependency.inf
> index 243a70f30d..2bca431712 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiPostMemSiliconPolicyInitLibDependency.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiPreMemSiliconPolicyInitLibDependency.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiPreMemSiliconPolicyInitLibDependency.inf
> index fd54b0bf7d..45a30da9ac 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiPreMemSiliconPolicyInitLibDependency.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiSiliconPolicyInitLibDependency.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiSiliconPolicyInitLibDependency.c
> index 1db1582ff2..4c3be83c21 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiSiliconPolicyInitLibDependency.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibDependency
> /PeiSiliconPolicyInitLibDependency.c
> @@ -1,13 +1,7 @@
>  /** @file
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspC
> puPolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspC
> puPolicyInitLib.c
> index 282f774831..72a797a0ea 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspC
> puPolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspC
> puPolicyInitLib.c
> @@ -2,13 +2,7 @@
>    Implementation of Fsp PCH Policy Initialization.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> ePolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> ePolicyInitLib.c
> index d97bf8be57..e72a06f5d3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> ePolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> ePolicyInitLib.c
> @@ -2,13 +2,7 @@
>    Implementation of Fsp Me Policy Initialization.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> iscUpdInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> iscUpdInitLib.c
> index b9329e4c8a..6d1a982bfb 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> iscUpdInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> iscUpdInitLib.c
> @@ -2,13 +2,7 @@
>    Implementation of Fsp Misc UPD Initialization.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPc
> hPolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPc
> hPolicyInitLib.c
> index 3f7e297c0b..46c143553c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPc
> hPolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPc
> hPolicyInitLib.c
> @@ -2,13 +2,7 @@
>    Implementation of Fsp PCH Policy Initialization.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.c
> index 4e82a0cc31..1136996684 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.c
> @@ -2,13 +2,7 @@
>    Instance of Fsp Policy Initialization Library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.h
> index a17b642a1d..52f20777ec 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.h
> @@ -2,13 +2,7 @@
>    Internal header file for Fsp Policy Initialization Library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSa
> PolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSa
> PolicyInitLib.c
> index 3d218f8ba9..51b72c360a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSa
> PolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSa
> PolicyInitLib.c
> @@ -2,13 +2,7 @@
>    Implementation of Fsp SA Policy Initialization.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSi
> PolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSi
> PolicyInitLib.c
> index 49601b1496..bffabe61d0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSi
> PolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspSi
> PolicyInitLib.c
> @@ -2,13 +2,7 @@
>    Implementation of Fsp SI Policy Initialization.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.c
> index abed092c46..06210927d4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.c
> @@ -2,13 +2,7 @@
>    This file is SampleCode for Intel PEI Platform Policy initialization.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.h
> index e85724411a..c38294cfbe 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInit.h
> @@ -2,13 +2,7 @@
>    Header file for the PolicyInitPei PEIM.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitLib.h
> index b5a7f4eef3..ae289f884e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitLib.h
> @@ -2,13 +2,7 @@
>    Header file for the PolicyInitPei Library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitPreMem.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitPreMem.c
> index 35baba3183..ed391db583 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitPreMem.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiPolic
> yInitPreMem.c
> @@ -2,13 +2,7 @@
>    This file is SampleCode for Intel PEI Platform Policy initialization.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPoli
> cyInit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPoli
> cyInit.h
> index 4f4a80b9ae..47ede26b05 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPoli
> cyInit.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiPoli
> cyInit.h
> @@ -2,13 +2,7 @@
>    Header file for the PeiSiPolicyInit
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFsp.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFsp.inf
> index 7f0d7a5dec..9ffb84fa1e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFsp.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFsp.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInit.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
> index f26eea6be6..9007f299bb 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitLib.inf
> @@ -2,13 +2,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
> index bb21872e1e..65a67a6795 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/SiliconInitLib/SiliconInitPreMem.c
> @@ -2,13 +2,7 @@
>    Source code file for Platform Init Pre-Memory PEI module
> 
>  Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/ConfigBlock/MePeiConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _ME_PEI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PEI_ME_POLICY_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/MeChipset.h
> b/Silicon/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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _ME_POLICY_COMMON_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.c
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.c
> index 94a84a0478..31c7d59d1d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.c
> @@ -2,13 +2,7 @@
>    This file is PeiMePolicy library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiMePolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.inf
> index 3c6e325772..ea247181a4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> 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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> brary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> brary.h
> index 85e8e2b154..a908bb6c24 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> brary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> brary.h
> @@ -2,13 +2,7 @@
>    Header file for the PeiMePolicy library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PEI_ME_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioAcpiDefines.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLib.asl
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  include("GpioLibObjects.asl")
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
> index 1468aedba4..ba1bf8cb93 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/GpioLibObjects.asl
> @@ -1,13 +1,7 @@
>  /**@file
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/IrqLink.asl
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchAcpiTables.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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHda.asl
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchHeci.asl
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchIsh.asl
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchNvs.asl
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchPcie.asl
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.a
> sl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.a
> sl
> index 701cf6891a..a9d3756a74 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.a
> sl
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchRstPcieStorage.a
> sl
> @@ -1,13 +1,7 @@
>  /**@file
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSata.asl
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchScs.asl
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchSerialIo.asl
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXdci.asl
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/PchXhci.asl
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.asl
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/TraceHubDebug.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/AcpiTables/Dsdt/usbsbd.asl
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Cio2Config.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _CIO2_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DciConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _DCI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/DmiConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _DMI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/EspiConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _ESPI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtection
> Config.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtection
> Config.h
> index b55aaa705a..77f43a80fc 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtection
> Config.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/FlashProtection
> Config.h
> @@ -2,13 +2,7 @@
>    FlashProtection policy
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _FLASH_PROTECTION_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.
> h
> index a0ebbbd84d..6498d84646 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HdAudioConfig.
> h
> @@ -2,13 +2,7 @@
>    HDAUDIO policy
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _HDAUDIO_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HpetConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _HPET_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _HSIO_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.
> h
> index cf7bd6251a..c4043bee3e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioPcieConfig.
> h
> @@ -2,13 +2,7 @@
>    HSIO pcie policy
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _HSIO_PCIE_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.
> h
> index 53c1a01a17..fb1c2fa279 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/HsioSataConfig.
> h
> @@ -2,13 +2,7 @@
>    Hsio Sata policy
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _HSIO_SATA_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.
> h
> index 3b8e247a31..6a032dbe0b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/InterruptConfig.
> h
> @@ -2,13 +2,7 @@
>    Interrupt policy
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _INTERRUPT_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IoApicConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _IOAPIC_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/IshConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _ISH_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LanConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _LAN_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfi
> g.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfi
> g.h
> index f083b3b50c..4f7526f3eb 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfi
> g.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LockDownConfi
> g.h
> @@ -2,13 +2,7 @@
>    Lock down policy
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _LOCK_DOWN_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/LpcConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _LPC_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/P2sbConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _P2SB_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConf
> ig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConf
> ig.h
> index c946e9a116..9873061049 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConf
> ig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PchGeneralConf
> ig.h
> @@ -2,13 +2,7 @@
>    PCH General policy
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_GENERAL_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PcieRpConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_PCIE_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/PmConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PM_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/Port61Config.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PORT_61_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SataConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _SATA_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ScsConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _SCS_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
> index 5caa24310a..529c89f3bf 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIoConfig.h
> @@ -2,13 +2,7 @@
>    Serial IO policy
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _SERIAL_IO_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.
> h
> index b64579cd92..38ab7ca013 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SerialIrqConfig.
> h
> @@ -2,13 +2,7 @@
>    Serial IRQ policy
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _SERIAL_IRQ_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SmbusConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _SMBUS_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/SpiConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _SPI_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.
> h
> index 8963da6ee7..b64948ac05 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/ThermalConfig.
> h
> @@ -2,13 +2,7 @@
>    Thermal policy
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _THERMAL_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig
> .h
> index 5455c40514..a284dd3840 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/TraceHubConfig
> .h
> @@ -2,13 +2,7 @@
>    Trace Hub policy
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _TRACEHUB_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/UsbConfig.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _USB_CONFIG_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfi
> g.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfi
> g.h
> index 610c1092fb..a01481af64 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfi
> g.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/ConfigBlock/WatchDogConfi
> g.h
> @@ -2,13 +2,7 @@
>    WatchDog policy
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _WATCH_DOG_CONFIG_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/GpioConfig.h
> b/Silicon/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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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,
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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,
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _GPIO_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/GpioNativeLib.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,
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _OC_WDT_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib
> .h
> index 8247f8f3c8..1b24e94f74 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchCycleDecodingLib
> .h
> @@ -2,13 +2,7 @@
>    Header file for PchCycleDecodingLib.
> 
>  Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_CYCLE_DECODING_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchEspiLib.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,
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_GBE_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchHsioLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_HSIO_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchInfoLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_INFO_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchP2sbLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_P2SB_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPcieRpLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_PMC_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchPolicyLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_PSF_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchResetLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_RESET_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSbiAccessLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_SBI_ACCESS_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_SERIAL_IO_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
> index 66c5945a7b..ac729c2bcf 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSerialIoUartLib.h
> @@ -2,13 +2,7 @@
>    Header file for PCH Serial IO UART Lib implementation.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_SERIAL_IO_UART_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchSmmControlLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_SMM_CONTROL_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/PchWdtCommonLib.
> 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
> standalone module.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _SEC_PCH_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.
> h
> index 12dfaeb440..0c5e72258c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/SpiFlashCommonLib.
> h
> @@ -3,13 +3,7 @@
>    internal structure and functions used by SpiFlashCommonLib.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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.
> 
>  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Library/TraceHubInitLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _TRACE_HUB_INIT_LIB_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchAccess.h
> b/Silicon/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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_ACCESS_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchLimits.h
> b/Silicon/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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_LIMITS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPcieStorageDetectHob.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_POLICY_COMMON_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchPreMemPolicyCommon.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_PREMEM_POLICY_COMMON_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchReservedResources.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_PRESERVED_RESOURCES_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/PchResetPlatformSpecific.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Spi.h
> b/Silicon/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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_SPI_PPI_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Ppi/Wdt.h
> b/Silicon/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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PEI_WDT_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatc
> h.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatc
> h.h
> index eb08a89f00..68f76fc411 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatc
> h.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchAcpiSmiDispatc
> h.h
> @@ -2,13 +2,7 @@
>    APIs of PCH ACPI SMI Dispatch Protocol.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_ACPI_SMI_DISPATCH_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEmmcTuning.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_EMMC_TUNING_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch
> .h
> index 7d7d3a5339..f3e2e05eda 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchEspiSmiDispatch
> .h
> @@ -2,13 +2,7 @@
>    SmmEspiDispatch Protocol
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_ESPI_SMI_DISPATCH_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmi
> Dispatch.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmi
> Dispatch.h
> index 392733117b..4df549ec31 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmi
> Dispatch.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchGpioUnlockSmi
> Dispatch.h
> @@ -2,13 +2,7 @@
>    APIs of PCH GPIO UNLOCK SMI Dispatch Protocol.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_INFO_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch
> .h
> index b80597ae9b..cff66f4366 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchPcieSmiDispatch
> .h
> @@ -2,13 +2,7 @@
>    APIs of PCH PCIE SMI Dispatch Protocol.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_RESET_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmiDispatch.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_SMI_DISPATCH_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapCont
> rol.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapCont
> rol.h
> index 5d0a4d34cf..d94dc2c480 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapCont
> rol.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmIoTrapCont
> rol.h
> @@ -2,13 +2,7 @@
>    PCH SMM IO Trap Control Protocol
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_SMM_IO_TRAP_CONTROL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTi
> merControl.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTi
> merControl.h
> index 95c680e75c..4e2c73e28d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTi
> merControl.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchSmmPeriodicTi
> merControl.h
> @@ -2,13 +2,7 @@
>    PCH SMM Periodic Timer Control Protocol
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_SMM_PERIODIC_TIMER_CONTROL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch
> .h
> index 457cdb682c..60c627f778 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/PchTcoSmiDispatch
> .h
> @@ -2,13 +2,7 @@
>    APIs of PCH TCO SMI Dispatch Protocol.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_TCO_SMI_DISPATCH_PROTOCOL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Protocol/SerialGpio.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _DXE_WDT_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsCam.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_CAM_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDci.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_DCI_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsDmi.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_DMI_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsFia.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_FIA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsGpio.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_GPIO_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHda.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_HDA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsHsio.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_HSIO_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsIsh.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_ISH_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsItss.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_ITSS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLan.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_LAN_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsLpc.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_LPC_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsP2sb.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_P2SB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcie.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_PCIE_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPcr.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_PCR_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPmc.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_PMC_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsf.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_PSF_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsPsth.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_PSTH_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSata.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_SATA_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsScs.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_SCS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSerialIo.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_SERIAL_IO_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSmbus.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_SMBUS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsSpi.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_SPI_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsThermal.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_THERMAL_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsTraceHub.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Include/Register/PchRegsUsb.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_REGS_USB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNh
> lt.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNh
> lt.h
> index 5e7674a412..366b9d6707 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNh
> lt.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/DxePchHdaNh
> lt.h
> @@ -2,13 +2,7 @@
>    Header file for DxePchHdaLib - NHLT structure definitions.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib
> .h
> index f555182bc4..395d009adf 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib
> .h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/GpioPrivateLib
> .h
> @@ -3,13 +3,7 @@
>    All function in this library is available for PEI, DXE, and SMM,
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _GPIO_PRIVATE_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCo
> mmonLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCo
> mmonLib.h
> index 8f0a1adf38..9c8335861d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCo
> mmonLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/I2cMasterCo
> mmonLib.h
> @@ -2,13 +2,7 @@
>   Implement the I2C port control.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchHdaLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitComm
> onLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitComm
> onLib.h
> index 8c016c624f..449b38f111 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitComm
> onLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchInitComm
> onLib.h
> @@ -2,13 +2,7 @@
>    Header file for PCH Init Common Lib
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_INIT_COMMON_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpress
> HelpersLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpress
> HelpersLib.h
> index 49c89a2fcc..2c800ca8e0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpress
> HelpersLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPciExpress
> HelpersLib.h
> @@ -2,13 +2,7 @@
>    Header file for PCH PCI Express helpers library
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_PCI_EXPRESS_HELPERS_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateL
> ib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateL
> ib.h
> index ad390103ce..e72cc87a27 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateL
> ib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchPsfPrivateL
> ib.h
> @@ -2,13 +2,7 @@
>    Header file for PchPsfPrivateLib.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_PSF_PRIVATE_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCom
> monLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCom
> monLib.h
> index 5c2a6c30e2..e6494a1a38 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCom
> monLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSmbusCom
> monLib.h
> @@ -2,13 +2,7 @@
>    PCH Smbus Protocol
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_SMBUS_COMMON_LIB_H
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommo
> nLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommo
> nLib.h
> index 8b6b6a6c97..d408289ea2 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommo
> nLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PchSpiCommo
> nLib.h
> @@ -2,13 +2,7 @@
>    Header file for the PCH SPI Common Driver.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_SPI_COMMON_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterL
> ib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterL
> ib.h
> index da4cfc6d19..78c07f20c6 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterL
> ib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/PeiI2cMasterL
> ib.h
> @@ -2,13 +2,7 @@
>    PEI I2C Master module
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.
> h
> index 2301c9fc0f..28edfda991 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Library/RstPrivateLib.
> h
> @@ -2,13 +2,7 @@
>    Header file for Rst Library
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchConfigHob.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_CONFIG_HOB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/PchHdaEndpoints.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvs.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_NVS_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.
> h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.
> h
> index 66c119f577..c82498bde5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.
> h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PchNvsArea.
> h
> @@ -1,13 +1,7 @@
>  /**@file
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
> index 26d13b7a7d..8e05dd2c0a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/IncludePrivate/Protocol/PcieIoTrap.h
> @@ -2,13 +2,7 @@
>    This file defines the PCH PCIE IoTrap Protocol.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_PCIE_IOTRAP_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.c
> index f6f708172e..0fddff71a1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.c
> @@ -2,13 +2,7 @@
>    System reset library services.
> 
>  Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Uefi.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.inf
> index 2af43b5091..4c46216b44 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> etSystemLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseResetSystemLib/BaseRes
> 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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> c
> index 17e42dfd0b..5d09e18613 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> c
> @@ -2,13 +2,7 @@
>    PCH SMBUS library implementation built upon I/O library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> inf
> index a737f7105f..2894d137b9 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/BaseSmbusLib/BaseSmbusLib.
> inf
> @@ -6,13 +6,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.c
> index c591bdddef..51facacf08 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.c
> @@ -2,13 +2,7 @@
>    System reset library services.
> 
>  Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.inf
> index 1736c3189e..aa8877140a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeResetSystemLib/DxeReset
> SystemLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/
> DxeRuntimeResetSystemLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/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.
> 
>  Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/DxeRuntimeResetSystemLib/
> 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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/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/GpioInit.
> c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioInit.
> c
> @@ -2,13 +2,7 @@
>    This file contains routines for GPIO initialization
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "GpioLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLib.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "GpioLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibra
> ry.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibra
> ry.h
> index 97a5287067..ed4f2f8023 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibra
> ry.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioLibra
> ry.h
> @@ -2,13 +2,7 @@
>    Header file for GPIO Lib implementation.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _GPIO_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNati
> veLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNati
> veLib.c
> index e57e3ecbfa..a4f6466ed4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNati
> veLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/GpioNati
> veLib.c
> @@ -2,13 +2,7 @@
>    This file contains routines for GPIO native and chipset specific usage
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "GpioLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpi
> oData.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpi
> oData.c
> index c36792139c..42f57df921 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpi
> oData.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PchSklGpi
> oData.c
> @@ -2,13 +2,7 @@
>    This file contains SKL specific GPIO information
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "GpioLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeS
> mmGpioLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmGpioLib/PeiDxeS
> mmGpioLib.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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin
> gLib/PchCycleDecodingLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin
> gLib/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.
> 
>  Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin
> gLib/PeiDxeSmmPchCycleDecodingLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchCycleDecodin
> gLib/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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGb
> eLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PchGb
> eLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDx
> eSmmPchGbeLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchGbeLib/PeiDx
> eSmmPchGbeLib.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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHs
> ioLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHs
> ioLib.c
> index d3e6094954..d7483ebd97 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHs
> ioLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PchHs
> ioLib.c
> @@ -4,13 +4,7 @@
>    But do not support UEFI RUNTIME environment call.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDx
> eSmmPchHsioLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDx
> eSmmPchHsioLib.inf
> index f233f3e673..11a32ad78e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDx
> eSmmPchHsioLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchHsioLib/PeiDx
> eSmmPchHsioLib.inf
> @@ -6,13 +6,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oLib.c
> index 3f72e006c8..a1c20ba04f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oLib.c
> @@ -5,13 +5,7 @@
>    But do not support UEFI RUNTIME environment call.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oStrLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oStrLib.c
> index 6fb06eac2f..05b8587263 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oStrLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PchInf
> oStrLib.c
> @@ -5,13 +5,7 @@
>    But do not support UEFI RUNTIME environment call.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDx
> eSmmPchInfoLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDx
> eSmmPchInfoLib.inf
> index 35566d8243..44d56ea838 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDx
> eSmmPchInfoLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchInfoLib/PeiDx
> eSmmPchInfoLib.inf
> @@ -6,13 +6,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2
> sbLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2
> sbLib.c
> index dba89d3edc..ca3a222979 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2
> sbLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PchP2
> sbLib.c
> @@ -4,13 +4,7 @@
>    But do not support UEFI RUNTIME environment call.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDx
> eSmmPchP2sbLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDx
> eSmmPchP2sbLib.inf
> index 115175f8a2..da3390c4ca 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDx
> eSmmPchP2sbLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchP2sbLib/PeiDx
> eSmmPchP2sbLib.inf
> @@ -6,13 +6,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pch
> PcieRpLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pch
> PcieRpLib.c
> index 6b8a51d8d2..43caf3e9bd 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pch
> PcieRpLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pch
> PcieRpLib.c
> @@ -4,13 +4,7 @@
>    But do not support UEFI RUNTIME environment call.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pei
> DxeSmmPchPcieRpLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pei
> DxeSmmPchPcieRpLib.inf
> index 79ddb969ae..6b22411162 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pei
> DxeSmmPchPcieRpLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcieRpLib/Pei
> DxeSmmPchPcieRpLib.inf
> @@ -6,13 +6,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcr
> Lib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcr
> Lib.c
> index e2585c36e0..b07a903d44 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcr
> Lib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PchPcr
> Lib.c
> @@ -4,13 +4,7 @@
>    But do not support UEFI RUNTIME environment call.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxe
> SmmPchPcrLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxe
> SmmPchPcrLib.inf
> index fdc523143f..2de45d5240 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxe
> SmmPchPcrLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPcrLib/PeiDxe
> SmmPchPcrLib.inf
> @@ -6,13 +6,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchP
> mcLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchP
> mcLib.c
> index 1985d5d133..790af0a7a1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchP
> mcLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PchP
> mcLib.c
> @@ -4,13 +4,7 @@
>    But do not support UEFI RUNTIME environment call.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDx
> eSmmPchPmcLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPmcLib/PeiDx
> eSmmPchPmcLib.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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfL
> ib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfL
> ib.c
> index 08a28f7e6d..a6f484f47b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfL
> ib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PchPsfL
> ib.c
> @@ -2,13 +2,7 @@
>    This file contains PSF routines
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxe
> SmmPchPsfLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxe
> SmmPchPsfLib.inf
> index 941f5a72dd..82db84c539 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxe
> SmmPchPsfLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchPsfLib/PeiDxe
> SmmPchPsfLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/
> PchSbiAccessLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/
> 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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSbiAccessLib/
> 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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.c
> index 7d24ed1269..03e2c60a5e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.c
> @@ -4,13 +4,7 @@
>    But do not support UEFI RUNTIME environment call.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.inf
> index 28ee07ee15..fc25c3001d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchSerialIoLib/Pei
> DxeSmmPchSerialIoLib.inf
> @@ -6,13 +6,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/PeiDxeSmmPchWdtCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/PeiDxeSmmPchWdtCommonLib.inf
> index 723ad14ced..95e4893d6c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/PeiDxeSmmPchWdtCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/WdtCommon.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/WdtCommon.c
> index 00a2fef78d..50d2dd638e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/WdtCommon.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiDxeSmmPchWdtCommonL
> ib/WdtCommon.c
> @@ -2,13 +2,7 @@
>    Library that contains common parts of WdtPei and WdtDxe. Not a
> standalone module.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Uefi/UefiBaseType.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.in
> f
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.in
> f
> index a2b8f71784..32a1df1b64 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.in
> f
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLib/PeiOcWdtLib.in
> f
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.c
> index fdde6803c3..ccd6c73599 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.c
> @@ -2,13 +2,7 @@
>    The Null PEI Library Implements OcWdt Support.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.inf
> index 93c951d49c..dbe58c6acd 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiOcWdtLibNull/PeiOcWdtLi
> bNull.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemP
> rintPolicy.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemP
> rintPolicy.c
> index 650d414247..b7fcb0944e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemP
> rintPolicy.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemP
> rintPolicy.c
> @@ -2,13 +2,7 @@
>    Print whole PCH_PREMEM_POLICY_PPI
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolic
> y.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolic
> y.c
> index 13a8f9fbd6..72a78e5faf 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolic
> y.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolic
> y.c
> @@ -2,13 +2,7 @@
>    Print whole PCH_POLICY_PPI
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePo
> licyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePo
> licyLib.c
> index 4e57b72d6e..62b621ce2f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePo
> licyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePo
> licyLib.c
> @@ -2,13 +2,7 @@
>    This file is to load sample board policy.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePr
> eMemPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePr
> eMemPolicyLib.c
> index fcefd76e8e..6cf9d9069e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePr
> eMemPolicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePr
> eMemPolicyLib.c
> @@ -2,13 +2,7 @@
>    This file is to load sample board policy.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.c
> index f0f9f33f71..201c49b3a8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.c
> @@ -2,13 +2,7 @@
>    This file is PeiPchPolicy library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.inf
> index d4d4ac1e54..39004319aa 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ibrary.h
> index 9be618d38a..f8d01614ac 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ibrary.h
> @@ -2,13 +2,7 @@
>    Header file for the PeiPchPolicy library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PEI_PCH_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMe
> mPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMe
> mPolicyLib.c
> index 5480cf3d5c..b5c1a39399 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMe
> mPolicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMe
> mPolicyLib.c
> @@ -2,13 +2,7 @@
>    This file is PeiPchPreMemPolicy library.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiPchPolicyLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PchReset.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.
> 
>  Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <PiPei.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLi
> b.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLi
> b.inf
> index b03a986313..b04f4006ef 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLi
> b.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchResetLib/PeiPchResetLi
> 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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.c
> index 9429b0ecf4..6f12abf111 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.c
> @@ -2,13 +2,7 @@
>    System reset library services.
> 
>  Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.inf
> index a259bdf6ec..18a92a6f18 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLibFsp.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLibFsp.inf
> index 9abb7c2107..e7284e6668 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLibFsp.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiResetSystemLib/PeiResetS
> ystemLibFsp.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.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.
> 
>  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiSpiLib/PeiSpiLib.inf
> 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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
> mSpiFlashCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
> mSpiFlashCommonLib.inf
> index c7b3e864eb..d712b9e5f7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
> mSpiFlashCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/Sm
> mSpiFlashCommonLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ###
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommon.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommon.c
> index d95f51af41..7ee7ffab50 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommon.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommon.c
> @@ -3,13 +3,7 @@
>    for module use.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommonSmmLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommonSmmLib.c
> index 8d2238dbf1..11133163d2 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommonSmmLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/SmmSpiFlashCommonLib/SpiF
> lashCommonSmmLib.c
> @@ -2,13 +2,7 @@
>    SMM Library instance of SPI Flash Common Library Class
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/BasePchSpiCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/BasePchSpiCommonLib.inf
> index 128f7adcea..599b07d3d3 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/BasePchSpiCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/SpiCommon.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/SpiCommon.c
> index 0b708d4aad..58757a8cba 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/SpiCommon.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/SpiCommon.c
> @@ -2,13 +2,7 @@
>    PCH SPI Common Driver implements the SPI Host Controller Compatibility
> Interface.
> 
>  Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Uefi/UefiBaseType.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePch
> HdaLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePch
> HdaLib.inf
> index 52d7c8bbaf..04940c75c1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePch
> HdaLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePch
> HdaLib.inf
> @@ -3,13 +3,7 @@
>  #
>  # Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
>  #
> -# This program and the accompanying materials are licensed and made
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Endpoints.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Endpoints.c
> index 11c6ec0269..31ea72bc55 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Endpoints.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Endpoints.c
> @@ -2,13 +2,7 @@
>    This file contains HD Audio NHLT Endpoints definitions
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Lib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Lib.c
> index e577cd9038..2e93507a8a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Lib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> Lib.c
> @@ -2,13 +2,7 @@
>    PCH HD Audio Library implementation.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> NhltConfig.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> NhltConfig.c
> index 46096a0ac3..6e56d357f5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> NhltConfig.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/PchHda
> NhltConfig.c
> @@ -2,13 +2,7 @@
>    This file contains HD Audio NHLT Configuration BLOBs
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/I2cMasterCommonLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/I2cMasterCommonLib.c
> index 32814bf773..16a2c73a77 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/I2cMasterCommonLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/I2cMasterCommonLib.c
> @@ -2,13 +2,7 @@
>   Implement the I2C controller driver.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/PeiDxeI2cMasterCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/PeiDxeI2cMasterCommonLib.inf
> index a6af85a4a0..5218191d8a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/PeiDxeI2cMasterCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioNativePrivateLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioNativePrivateLib.c
> index 89bf0a73ee..d47ae6fd55 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioNativePrivateLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioNativePrivateLib.c
> @@ -3,13 +3,7 @@
>    used by Reference Code only.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioPrivateLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioPrivateLib.c
> index b386e071f7..bc660b0906 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioPrivateLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/GpioPrivateLib.c
> @@ -2,13 +2,7 @@
>    This file contains GPIO routines for RC usage
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PchSklGpioPrivateData.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PchSklGpioPrivateData.c
> index 3d8b128a1c..6cf855d692 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PchSklGpioPrivateData.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PchSklGpioPrivateData.c
> @@ -2,13 +2,7 @@
>    This file contains SKL specific GPIO information
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PeiDxeSmmGpioPrivateLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PeiDxeSmmGpioPrivateLib.inf
> index d2542a1673..7986358ce1 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PeiDxeSmmGpioPrivateLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchInitCommon.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchInitCommon.c
> index a49bbc5c18..ed088bd642 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchInitCommon.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchInitCommon.c
> @@ -2,13 +2,7 @@
>    Pch common library for PCH INIT PEI/DXE/SMM modules
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchRpfn.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchRpfn.c
> index 77dd285430..1cd4884bc9 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchRpfn.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PchRpfn.c
> @@ -2,13 +2,7 @@
>    This file contains functions that configures PCI Express Root Ports function
> swapping.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Uefi/UefiBaseType.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PeiDxeSmmPchInitCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PeiDxeSmmPchInitCommonLib.inf
> index df4900d964..52ab228442 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PeiDxeSmmPchInitCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.c
> index 815b800db7..04145d8373 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.c
> @@ -2,13 +2,7 @@
>    This file contains routines that support PCI Express initialization
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchPciExpressHelpersLibrary.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.h
> index bd59b5346e..7fe8985946 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PchPciExpressHelpersLibrary.h
> @@ -2,13 +2,7 @@
>    Header file for PCH Pci Express helps library implementation.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _PCH_PCI_EXPRESS_HELPERS_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> index b02f311f02..39dc89670a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PchPsfPrivateLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PchPsfPrivateLib.c
> index ef579c825d..55124c0cb9 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PchPsfPrivateLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PchPsfPrivateLib.c
> @@ -2,13 +2,7 @@
>    This file contains PSF routines for RC usage
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Base.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PeiDxeSmmPchPsfPrivateLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PeiDxeSmmPchPsfPrivateLib.inf
> index 6995171b10..0d7050500a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PeiDxeSmmPchPsfPrivateLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PchSmbusExec.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/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)
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <Uefi/UefiBaseType.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PeiDxeSmmPchSmbusCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PeiDxeSmmPchSmbusCommonLib.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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.c
> index 7436a76ec1..e97d48f777 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.c
> @@ -2,13 +2,7 @@
>   Routines for Rst remapping
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.inf
> index 1bbcc7eda7..413d0c86f8 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
> b/Silicon/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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.c
> b/Silicon/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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchInit.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
> b/Silicon/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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchInit.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
> 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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git a/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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchInit.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchRstPcieStorage.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchInit.h"
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSata.c
> b/Silicon/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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <PchInit.h>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchScs.c
> b/Silicon/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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <PchInit.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchSerialIoDxe.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <PchInit.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchBiosWriteProtect.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchInitSmm.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSm
> m.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchGpioSxIsolationSm
> m.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> 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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> 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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/IoTrap.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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef _IO_TRAP_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tch.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tch.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tcher.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tcher.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
> available under
> -# the terms and conditions of the BSD License which accompanies this
> distribution.
> -# The full text of the license may be found at
> -# http://opensource.org/licenses/bsd-license.php
> -#
> -# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +# SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
>  ##
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmm.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef PCH_SMM_H
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCor
> e.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCor
> e.c
> index 77f0561ce4..0c494bffef 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCor
> e.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmCor
> e.c
> @@ -3,13 +3,7 @@
>    and the abstraction of the PCH SMI sources.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchSmm.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi
> .c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi
> .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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi
> .h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmEspi
> .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
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmGpi.
> 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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.c
> index fea1ac9165..24bdf6a6e5 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.c
> @@ -2,13 +2,7 @@
>    Helper functions for PCH SMM dispatcher.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.h
> index 44a8936790..dffd0e3944 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmHelp
> ers.h
> @@ -2,13 +2,7 @@
>    Helper functions for PCH SMM
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #ifndef PCH_SMM_HELPERS_H
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeri
> odicTimer.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeri
> odicTimer.c
> index 324eaeb7e8..29afe30817 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeri
> odicTimer.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPeri
> odicTimer.c
> @@ -2,13 +2,7 @@
>    File to contain all the hardware specific stuff for the Periodical Timer
> dispatch protocol.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPow
> erButton.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPow
> erButton.c
> index 404d2a31bc..82f0f6ffb2 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPow
> erButton.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmPow
> erButton.c
> @@ -2,13 +2,7 @@
>    File to contain all the hardware specific stuff for the Smm Power Button
> dispatch protocol.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include <PchSmmHelpers.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSw.
> 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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmSx.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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.
> c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmmUsb.
> 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.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PchSmmHelpers.h"
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHel
> pers.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHel
> pers.c
> index d4f4603eea..4d2a926491 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHel
> pers.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchxSmmHel
> pers.c
> @@ -3,13 +3,7 @@
>    and the abstraction of the PCH SMI sources.
> 
>  Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -This program and the accompanying materials are licensed and made
> available under
> -the terms and conditions of the BSD License that accompanies this
> distribution.
> -The full text of the license may be found at
> -http://opensource.org/licenses/bsd-license.php.
> -
> -THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS"
> BASIS,
> -WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER
> EXPRESS OR IMPLIED.
> +SPDX-License-Identifier: BSD-2-Clause-Patent
> 
&