REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2318

1. Add ConfigBlockLib.h and ConfigBlock.h to InstelSiliconPkg and remove all other ConfigBlockLib.h.
2. Change reference path of ConfigBlockLib to IntelSiliconPkg

Signed-off-by: Ethan Tsao <ethan.tsao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
---
 Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf                                                            |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h                                    |  3 +--
 Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c                |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf              |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c     |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf   |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h               |  3 +--
 Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf   |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf                                    |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf                                     |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf                               |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf                                |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c                       |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf             |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h             |  3 +--
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf |  2 +-
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf                                  |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf                                   |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf                             |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf                              |  3 ++-
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c                     |  5 +++--
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf           |  4 +++-
 Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSiliconPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf           |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf                                                         |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf                                   |  4 +++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h                                 |  3 +--
 Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspMePolicyInitLib.c                             |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPchPolicyInitLib.c                            |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.h                               |  3 +--
 Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf                             |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspSaPolicyInitLib.c                             |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspSiPolicyInitLib.c                             |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h                       |  3 +--
 Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf           |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/PeiHdaVerbTableLib.inf                                          |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxeMePolicyUpdate.h                                      |  3 +--
 Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxePchPolicyUpdate.c                                     |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxePolicyUpdateLib.inf                                   |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxeSaPolicyUpdate.c                                      |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/PeiPolicyInitLib.inf                                       |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/PeiSaPolicyInit.c                                          |  4 ++--
 Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdate.c                                     |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdate.h                                     |  3 +--
 Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdatePreMem.c                               |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf                                   |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSaPolicyUpdate.c                                      |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSaPolicyUpdatePreMem.c                                |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSiPolicyUpdate.c                                      |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSiPolicyUpdate.h                                      |  3 +--
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPostMemLib.inf                            |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPreMemLib.inf                             |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf                       |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf                        |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPostMemLib.c                    |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxePolicyBoardConfig.h                     |  3 +--
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxePolicyBoardConfigLib.inf                |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxeSaPolicyBoardConfig.c                   |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPlatformHookLib/PeiPlatformHooklib.inf                          |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiCpuPolicyBoardConfig.c                  |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiMePolicyBoardConfig.c                   |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiMePolicyBoardConfigPreMem.c             |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPchPolicyBoardConfig.c                  |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPchPolicyBoardConfigPreMem.c            |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPolicyBoardConfig.h                     |  3 +--
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPolicyBoardConfigLib.inf                |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiSaPolicyBoardConfig.c                   |  3 ++-
 Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiSaPolicyBoardConfigPreMem.c             |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf                                                |  4 +++-
 Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibPreMem.c                                            |  3 +--
 Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibPreMem.inf                                          |  4 +++-
 Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf                                          |  4 ++--
 Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c                                                        |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf                                                      |  4 ++--
 Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c                                                  |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h                                                    |  3 +--
 Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c                                                         |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h                                                            |  3 +--
 Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c                                                     |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf                                                   |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h                                                 |  3 +--
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Protocol/PchPolicy.h                                                               |  3 +--
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/DxePchPolicyLib/DxePchPolicyLib.inf                                                |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c                                             |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c                                                   |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c                                                  |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibCnl.inf                                             |  4 ++--
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h                                              |  3 +--
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c                                            |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLib/PeiDxeSmmPchDmiLib.inf                                  |  4 ++--
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLib/PeiDxeSmmPchDmiWithS3Lib.inf                            |  4 ++--
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf                    |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf      |  4 ++--
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiDxeSmmPmcPrivateLibCnl.inf                       |  4 ++--
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiDxeSmmPmcPrivateLibWithS3.inf                    |  4 ++--
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiPmcPrivateLibCnl.inf                             |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c                                                                      |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c                                                                   |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeCnl.inf                                                              |  4 ++--
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFspCnl.inf                                                           |  4 ++--
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h                                                                   |  3 +--
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf                                                                 |  4 ++--
 Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf                                                  |  4 ++--
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h                                                   |  3 +--
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h                                                        |  3 +--
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h                                                           |  3 +--
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c                                            |  4 ++--
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf                                          |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h                                        |  3 +--
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c                                            |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf                                          |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c                                      |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h                                        |  3 +--
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c                                             |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c                                                          |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionInit.c                                                       |  3 ++-
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionInit.h                                                       |  3 +--
 Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/PciExpressInit.c                                                        |  3 ++-
 Silicon/Intel/{CoffeelakeSiliconPkg => IntelSiliconPkg}/Include/ConfigBlock.h                                                     |  2 +-
 Silicon/Intel/{CoffeelakeSiliconPkg => IntelSiliconPkg}/Include/Library/ConfigBlockLib.h                                          |  2 +-
 Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf                                                   |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf                                                  |  4 +++-
 Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf                                      |  4 +++-
 Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h                                                                            | 53 -----------------------------------------------------
 Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h                                                                 | 64 ----------------------------------------------------------------
 Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf                                            |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf                                      |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c                                                          |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf                                                        |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c                                                    |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h                                                      |  3 +--
 Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c                                                           |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconInitLib/PeiSiliconInitLib.inf                                                  |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPostMemSiliconPolicyInitLib.inf                               |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPreMemSiliconPolicyInitLib.inf                                |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c                                       |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c                                      |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h                                         |  3 +--
 Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFsp.inf                                |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFspAml.inf                             |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h                                                              |  3 +--
 Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c                                                       |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf                                                     |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h                                                   |  3 +--
 Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c                                               |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c                                                     |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c                                                 |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c                                           |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf                                                  |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h                                                |  3 +--
 Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/BasePchSpiCommonLib.inf                                   |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf                                                 |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/PeiDxeI2cMasterCommonLib.inf                         |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf                           |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf                       |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf         |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PeiDxeSmmPchPsfPrivateLib.inf                       |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PeiDxeSmmPchSmbusCommonLib.inf                     |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf                             |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h                                                                        |  3 +--
 Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf                                                                   |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf                                                                |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h                                                                     |  3 +--
 Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf                                                                   |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf                                                    |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h                                                     |  3 +--
 Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h                                                          |  3 +--
 Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h                                                             |  3 +--
 Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c                                              |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf                                            |  4 ++--
 Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h                                          |  3 +--
 Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c                                              |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf                                            |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c                                        |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h                                          |  3 +--
 Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c                                               |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c                                                            |  3 ++-
 Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf                                                             |  4 ++--
 177 files changed, 318 insertions(+), 362 deletions(-)

diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
index 92e1425a3a..3e00545f56 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
@@ -2,7 +2,7 @@
 # This module will perform specific PCI-Express devices
 # resource configuration.
 #
-# Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2018 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -40,6 +40,7 @@
   MinPlatformPkg/MinPlatformPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PciHotPlug.c
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
index 5e79dc2862..2974c41f1a 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for the DxeTBTPolicy library.
 
-Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2018 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -16,7 +16,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/BaseMemoryLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <ConfigBlock.h>
-#include <Library/ConfigBlockLib.h>
 #include <Guid/EventGroup.h>
 
 #endif // _DXE_TBT_POLICY_LIBRARY_H_
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
index 0fedd81cd0..70a6b7e5d2 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
@@ -2,7 +2,7 @@
   This library implements constructor function to register notify call back
   when policy PPI installed.
 
-Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/SiPolicyLib.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   Callback function to update policy when policy PPI installed.
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
index d2929118e5..0fc857c412 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
@@ -3,7 +3,7 @@
 # This library implements constructor function to register notify call back
 # when policy PPI installed.
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -25,6 +25,7 @@
   MdePkg/MdePkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiPreMemSiliconPolicyNotifyLib.c
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
index 0fedd81cd0..70a6b7e5d2 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
@@ -2,7 +2,7 @@
   This library implements constructor function to register notify call back
   when policy PPI installed.
 
-Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/SiPolicyLib.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   Callback function to update policy when policy PPI installed.
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
index d2929118e5..0fc857c412 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
@@ -3,7 +3,7 @@
 # This library implements constructor function to register notify call back
 # when policy PPI installed.
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -25,6 +25,7 @@
   MdePkg/MdePkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiPreMemSiliconPolicyNotifyLib.c
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
index 9f6b236e42..4299e96d32 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -19,7 +19,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PciLib.h>
 #include <Ppi/SiPolicy.h>
 #include <Library/MmPciLib.h>
-#include <Library/ConfigBlockLib.h>
 
 #include <FspEas.h>
 #include <FspmUpd.h>
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
index eb7fb82361..463455c90b 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
@@ -1,7 +1,7 @@
 ## @file
 #  FSP wrapper silicon policy update library.
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -59,6 +59,7 @@
   KabylakeFspBinPkg/KabylakeFspBinPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses.IA32]
   FspWrapperApiLib
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
index 0e7249bb13..c96bf76179 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component information file for GalagoPro3InitLib in PEI post memory phase.
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -30,6 +30,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiGalagoPro3InitPostMemLib.c
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
index cad057b416..e4b783684f 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component information file for PEI GalagoPro3 Board Init Pre-Mem Library
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -29,6 +29,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiGalagoPro3Detect.c
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
index 2ea8b2fdb3..04673ee6fc 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component information file for GalagoPro3InitLib in PEI post memory phase.
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -32,6 +32,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiGalagoPro3InitPostMemLib.c
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
index ccd385b354..d866f59338 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component information file for PEI GalagoPro3 Board Init Pre-Mem Library
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -31,6 +31,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiGalagoPro3InitPreMemLib.c
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
index d140237576..be1ecf1205 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
@@ -1,12 +1,13 @@
 /** @file
   This file is the library for SA DXE Policy initialization.
 
-Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
 #include "DxeSaPolicyInit.h"
+#include <Library/ConfigBlockLib.h>
 
 #define SA_VTD_RMRR_USB_LENGTH  0x20000
 
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
index d53641ceb7..b5491bcd99 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component information file for DXE silicon policy update library
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -25,6 +25,7 @@
   KabylakeSiliconPkg/SiPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   DxeSiliconPolicyUpdateLib.c
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
index e1df30951f..30d2f99e1d 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -19,7 +19,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PciLib.h>
 #include <Ppi/SiPolicy.h>
 #include <Library/MmPciLib.h>
-#include <Library/ConfigBlockLib.h>
 
 #include <FspEas.h>
 #include <FspmUpd.h>
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
index 5391bbfde0..f8bec0c852 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Provide FSP wrapper platform related function.
 #
-# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
index 165ed97c7b..bdf481b980 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component information file for KabylakeRvp3InitLib in PEI post memory phase.
 #
-# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -30,6 +30,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiKabylakeRvp3InitPostMemLib.c
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
index dd7f3c4fbb..d0cdba666f 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component information file for PEI KabylakeRvp3 Board Init Pre-Mem Library
 #
-# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -30,6 +30,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiKabylakeRvp3Detect.c
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
index 43336d237f..f955dd4ea9 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component information file for KabylakeRvp3InitLib in PEI post memory phase.
 #
-# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -32,6 +32,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiKabylakeRvp3InitPostMemLib.c
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
index eee617e138..a51712ac34 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component information file for PEI KabylakeRvp3 Board Init Pre-Mem Library
 #
-# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -32,6 +32,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiKabylakeRvp3InitPreMemLib.c
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
index 733cc9d4fc..fcd248fdf5 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
@@ -1,12 +1,13 @@
 /** @file
   This file is the library for SA DXE Policy initialization.
-  
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
 #include "DxeSaPolicyInit.h"
+#include <Library/ConfigBlockLib.h>
 
 #define SA_VTD_RMRR_USB_LENGTH  0x20000
 
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
index 4b4f4c4288..2abf1aef80 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component information file for Silicon Update Library
 #
-# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -19,12 +19,14 @@
   BaseLib
   PcdLib
   DebugLib
+  ConfigBlockLib
 
 [Packages]
   MdePkg/MdePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   DxeSiliconPolicyUpdateLib.c
diff --git a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSiliconPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSiliconPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf
index a9d01c46bb..97ec70f611 100644
--- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSiliconPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf
+++ b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSiliconPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf
@@ -1,7 +1,7 @@
 ### @file
 # Component information file for silicon policy update library
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -36,6 +36,7 @@
   UefiCpuPkg/UefiCpuPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiSiliconPolicyUpdateLib.c
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
index dd4e41a409..1711f73064 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
@@ -3,7 +3,7 @@
 # resource configuration.
 #
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -42,6 +42,7 @@
   MinPlatformPkg/MinPlatformPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PciHotPlug.c
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf
index 0d2a6cceeb..726868a217 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf
@@ -2,7 +2,7 @@
 # Component description file for Tbt functionality
 #
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -30,6 +30,8 @@ HobLib
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
+
 [Sources]
 DxeTbtPolicyLib.c
 
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
index a88385f36f..a23d9a5f40 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
@@ -2,7 +2,7 @@
   Header file for the DxeTBTPolicy library.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -17,7 +17,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <ConfigBlock.h>
-#include <Library/ConfigBlockLib.h>
 //#include <SetupVariable.h>
 #include <Guid/EventGroup.h>
 
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspMePolicyInitLib.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspMePolicyInitLib.c
index 97d9842aff..c873a522a4 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspMePolicyInitLib.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspMePolicyInitLib.c
@@ -2,13 +2,14 @@
   Implementation of Fsp Me Policy Initialization.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include <PeiFspPolicyInitLib.h>
 #include <ConfigBlock/MePeiConfig.h>
 #include <Ppi/SiPolicy.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   Performs FSP ME PEI Policy pre mem initialization.
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPchPolicyInitLib.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPchPolicyInitLib.c
index e2022929cd..4b6a3e3c7d 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPchPolicyInitLib.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPchPolicyInitLib.c
@@ -2,7 +2,7 @@
   Implementation of Fsp PCH Policy Initialization.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -12,6 +12,7 @@
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/PchInfoLib.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   Performs FSP PCH PEI Policy pre mem initialization.
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.h b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.h
index 52f9fbed8b..094f4ce7ec 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.h
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.h
@@ -2,7 +2,7 @@
   Internal header file for Fsp Policy Initialization Library.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -13,7 +13,6 @@
 
 #include <Library/DebugLib.h>
 #include <Library/PeiServicesLib.h>
-#include <Library/ConfigBlockLib.h>
 
 #include <FspEas.h>
 #include <FspmUpd.h>
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf
index 8146d0fa03..799a3dda6c 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf
@@ -2,7 +2,7 @@
 # Library functions for Fsp Policy Initialization Library.
 #
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -59,6 +59,7 @@
   CoffeeLakeFspBinPkg/CoffeeLakeFspBinPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   UefiCpuPkg/UefiCpuPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses]
   BaseMemoryLib
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspSaPolicyInitLib.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspSaPolicyInitLib.c
index 0bfc379386..36a0d251b8 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspSaPolicyInitLib.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspSaPolicyInitLib.c
@@ -2,7 +2,7 @@
   Implementation of Fsp SA Policy Initialization.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -22,6 +22,7 @@
 #include <Pi/PiFirmwareFile.h>
 #include <Pi/PiPeiCis.h>
 #include <Core/Pei/PeiMain.h>
+#include <Library/ConfigBlockLib.h>
 
 #define MAX_SPD_PAGE_COUNT           (2)
 #define MAX_SPD_PAGE_SIZE            (256)
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspSiPolicyInitLib.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspSiPolicyInitLib.c
index 98658782aa..fa9bef4821 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspSiPolicyInitLib.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspSiPolicyInitLib.c
@@ -2,12 +2,13 @@
   Implementation of Fsp SI Policy Initialization.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include <PeiFspPolicyInitLib.h>
 #include <Ppi/SiPolicy.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   Performs FSP SI PEI Policy pre mem initialization.
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
index 1ff16e2f32..6fea1e2c7d 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -18,7 +18,6 @@
 #include <Library/PciLib.h>
 #include <Ppi/SiPolicy.h>
 #include <Library/MmPciLib.h>
-#include <Library/ConfigBlockLib.h>
 
 #include <FspEas.h>
 #include <FspmUpd.h>
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
index c6dea37402..2c90d0cb94 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
@@ -2,7 +2,7 @@
 #  Provide FSP wrapper platform related function.
 #
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -60,6 +60,7 @@
   CoffeeLakeFspBinPkg/CoffeeLakeFspBinPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses.IA32]
   FspWrapperApiLib
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/PeiHdaVerbTableLib.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/PeiHdaVerbTableLib.inf
index 31b42bf4ab..e4833aee2b 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/PeiHdaVerbTableLib.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/PeiHdaVerbTableLib.inf
@@ -2,7 +2,7 @@
 #  PEI Intel HD Audio Verb Table library.
 #
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -50,6 +50,7 @@
   MdeModulePkg/MdeModulePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses]
   BaseLib
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxeMePolicyUpdate.h b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxeMePolicyUpdate.h
index 8cbcace075..c717196e48 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxeMePolicyUpdate.h
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxeMePolicyUpdate.h
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -16,7 +16,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Protocol/MePolicy.h>
 #include <Library/HobLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <ConfigBlock/MePeiConfig.h>
 
 #define PLATFORM_BOOT_TABLE_PTR_TYPE   0x1001
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxePchPolicyUpdate.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxePchPolicyUpdate.c
index 7945986aaa..0357f33f26 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxePchPolicyUpdate.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxePchPolicyUpdate.c
@@ -2,7 +2,7 @@
   This file is the library for PCH DXE Policy initialization.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -13,6 +13,7 @@
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Protocol/PchPolicy.h>
 #include <ConfigBlock/HdAudioConfig.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   Get data for PCH policy from setup options.
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxePolicyUpdateLib.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxePolicyUpdateLib.inf
index 16653f38bd..08761a4582 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxePolicyUpdateLib.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxePolicyUpdateLib.inf
@@ -2,7 +2,7 @@
 #  Component description file for DXE DxePolicyUpdateLib Library
 #
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -31,6 +31,7 @@
   MdePkg/MdePkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses]
   UefiBootServicesTableLib
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxeSaPolicyUpdate.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxeSaPolicyUpdate.c
index af4c76bcd0..0cc273fd2e 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxeSaPolicyUpdate.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxeSaPolicyUpdate.c
@@ -2,11 +2,12 @@
   This file is the library for SA DXE Policy initialization.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include <DxeSaPolicyUpdate.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   Get data for platform policy from setup options.
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/PeiPolicyInitLib.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/PeiPolicyInitLib.inf
index 293abf1904..4eb5afa0d2 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/PeiPolicyInitLib.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/PeiPolicyInitLib.inf
@@ -2,7 +2,7 @@
 # Component description file for PeiPolicyInit library.
 #
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -39,6 +39,7 @@
   MdePkg/MdePkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress  ## CONSUMES
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/PeiSaPolicyInit.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/PeiSaPolicyInit.c
index 922bcd135f..15ecba0462 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/PeiSaPolicyInit.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/PeiSaPolicyInit.c
@@ -2,12 +2,12 @@
   This file is SampleCode for Intel SA PEI Policy initialization.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiSaPolicyInit.h"
-
+#include <Library/ConfigBlockLib.h>
 
 /**
   PcieCardResetWorkAround performs PCIe Card reset on root port
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdate.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdate.c
index e7e5ff5b1a..ebce9b271a 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdate.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdate.c
@@ -2,7 +2,7 @@
   This file is SampleCode of the library for Intel PCH PEI Policy initialization.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -25,6 +25,7 @@
 #include <Library/CnviLib.h>
 #include <Register/PchRegsLpcCnl.h>
 #include <PcieDeviceOverrideTable.h>
+#include <Library/ConfigBlockLib.h>
 
 VOID
 UpdatePcieClockInfo (
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdate.h b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdate.h
index 5a69852801..3d732e6828 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdate.h
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdate.h
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -18,7 +18,6 @@
 #include <Library/IoLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Ppi/SiPolicy.h>
-#include <Library/ConfigBlockLib.h>
 #include <PlatformBoardConfig.h>
 
 #endif
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdatePreMem.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdatePreMem.c
index 968df0f55c..2d48b09175 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdatePreMem.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdatePreMem.c
@@ -2,7 +2,7 @@
   This file is SampleCode of the library for Intel PCH PEI Policy initialization.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -16,6 +16,7 @@
 #include <Library/PchPcieRpLib.h>
 #include <Library/DebugLib.h>
 #include <Library/PchPolicyLib.h>
+#include <Library/ConfigBlockLib.h>
 
 //
 // Sawtooth Peak
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf
index ad3146dc7b..e95c1b15c5 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf
@@ -2,7 +2,7 @@
 # Module Information file for PEI PolicyUpdateLib Library
 #
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -52,6 +52,7 @@
   SecurityPkg/SecurityPkg.dec
   IntelSiliconPkg/IntelSiliconPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [FixedPcd]
   gSiPkgTokenSpaceGuid.PcdTsegSize                             ## CONSUMES
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSaPolicyUpdate.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSaPolicyUpdate.c
index c1ac7d890f..b62b27d76d 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSaPolicyUpdate.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSaPolicyUpdate.c
@@ -2,7 +2,7 @@
 Do Platform Stage System Agent initialization.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -21,6 +21,7 @@ Do Platform Stage System Agent initialization.
 #include <Library/PeiSaPolicyLib.h>
 #include <GpioPinsCnlLp.h>
 #include <GpioPinsCnlH.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   UpdatePeiSaPolicy performs SA PEI Policy initialization
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSaPolicyUpdatePreMem.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSaPolicyUpdatePreMem.c
index 0bdd503e2c..7c022c35f1 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSaPolicyUpdatePreMem.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSaPolicyUpdatePreMem.c
@@ -2,7 +2,7 @@
   Platform Stage System Agent initialization.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -22,6 +22,7 @@
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PeiSaPolicyLib.h>
 #include <Library/GpioLib.h>
+#include <Library/ConfigBlockLib.h>
 
 ///
 /// Memory Reserved should be between 125% to 150% of the Current required memory
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSiPolicyUpdate.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSiPolicyUpdate.c
index 3efbe2ccbd..4db3c215f3 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSiPolicyUpdate.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSiPolicyUpdate.c
@@ -3,7 +3,7 @@
   Platform Policy initialization.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -13,6 +13,7 @@
 #include <Library/PeiServicesLib.h>
 #include <Library/SiPolicyLib.h>
 #include <Library/MemoryAllocationLib.h>
+#include <Library/ConfigBlockLib.h>
 
 STATIC SVID_SID_INIT_ENTRY mCdfSsidTablePtr[] = {
   //
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSiPolicyUpdate.h b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSiPolicyUpdate.h
index 38ea081166..92222d216f 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSiPolicyUpdate.h
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSiPolicyUpdate.h
@@ -2,7 +2,7 @@
    Header file for PEI SiPolicyUpdate.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -12,7 +12,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/PeiPlatformLib.h>
 #include <Library/DebugLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Ppi/SiPolicy.h>
 
 #endif
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPostMemLib.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
index affc5c56ad..9bfa8652d3 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
@@ -2,7 +2,7 @@
 # Component information file for WhiskeylakeURvpInitLib in PEI post memory phase.
 #
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -35,6 +35,7 @@
   MdeModulePkg/MdeModulePkg.dec
   SecurityPkg/SecurityPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiWhiskeylakeURvpInitPostMemLib.c
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPreMemLib.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
index 40e20285e0..d771d55c4f 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
@@ -2,7 +2,7 @@
 # Component information file for PEI WhiskeylakeURvp Board Init Pre-Mem Library
 #
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -31,6 +31,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiWhiskeylakeURvpDetect.c
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
index 21dc2f70c0..436314a6a3 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
@@ -2,7 +2,7 @@
 # Component information file for WhiskeylakeURvpInitLib in PEI post memory phase.
 #
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -39,6 +39,7 @@
   MdeModulePkg/MdeModulePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   SecurityPkg/SecurityPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiWhiskeylakeURvpInitPostMemLib.c
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
index 7389f1dfcd..d7b06ca2bd 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
@@ -2,7 +2,7 @@
 # Component information file for PEI WhiskeylakeURvp Board Init Pre-Mem Library
 #
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -40,6 +40,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PeiWhiskeylakeURvpInitPreMemLib.c
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPostMemLib.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPostMemLib.c
index 827af6bb57..f704c42f2d 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPostMemLib.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPostMemLib.c
@@ -1,6 +1,6 @@
 /** @file
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -31,6 +31,7 @@
 #include <Library/PchInfoLib.h>
 #include <FirwmareConfigurations.h>
 #include "WhiskeylakeURvpInit.h"
+#include <Library/ConfigBlockLib.h>
 
 EFI_STATUS
 BoardFunctionInit (
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxePolicyBoardConfig.h b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxePolicyBoardConfig.h
index a6d48e906d..0ab1ac88f7 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxePolicyBoardConfig.h
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxePolicyBoardConfig.h
@@ -2,7 +2,7 @@
  Header file for DxePolicyBoardConfig library instance.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -12,7 +12,6 @@
 #include <PiDxe.h>
 #include <Library/DebugLib.h>
 #include <Library/HobLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Library/DxePolicyBoardConfigLib.h>
 
 
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxePolicyBoardConfigLib.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxePolicyBoardConfigLib.inf
index 2c9af5b9a3..31708a1727 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxePolicyBoardConfigLib.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxePolicyBoardConfigLib.inf
@@ -2,7 +2,7 @@
 # Module Information file for DxePolicyBoardConfigLib Library
 #
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -28,6 +28,7 @@
   MdePkg/MdePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses]
   UefiBootServicesTableLib
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxeSaPolicyBoardConfig.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxeSaPolicyBoardConfig.c
index d2c26eb163..a6dcdf827e 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxeSaPolicyBoardConfig.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxeSaPolicyBoardConfig.c
@@ -2,11 +2,12 @@
  Intel DXE SA Policy update by board configuration
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "DxePolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   This function performs DXE SA Policy update by board configuration.
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPlatformHookLib/PeiPlatformHooklib.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPlatformHookLib/PeiPlatformHooklib.inf
index d66290e79b..fbcc84930e 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPlatformHookLib/PeiPlatformHooklib.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPlatformHookLib/PeiPlatformHooklib.inf
@@ -1,6 +1,6 @@
 ## @file
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -38,6 +38,7 @@
   MdePkg/MdePkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress                        ## CONSUMES
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiCpuPolicyBoardConfig.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiCpuPolicyBoardConfig.c
index e437814b10..7134cdec21 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiCpuPolicyBoardConfig.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiCpuPolicyBoardConfig.c
@@ -2,11 +2,12 @@
  Intel PEI CPU Policy update by board configuration
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiPolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   This function performs PEI CPU Policy update by board configuration.
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiMePolicyBoardConfig.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiMePolicyBoardConfig.c
index 843fe4accd..1b903d5c94 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiMePolicyBoardConfig.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiMePolicyBoardConfig.c
@@ -2,11 +2,12 @@
  Intel PEI ME Policy update by board configuration
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiPolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   This function performs PEI ME Policy update by board configuration.
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiMePolicyBoardConfigPreMem.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiMePolicyBoardConfigPreMem.c
index 79c93455a6..2e51cc631d 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiMePolicyBoardConfigPreMem.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiMePolicyBoardConfigPreMem.c
@@ -2,11 +2,12 @@
  Intel PEI ME Pre-Memory Policy update by board configuration
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiPolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   This function performs PEI ME Pre-Memory Policy update by board configuration.
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPchPolicyBoardConfig.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPchPolicyBoardConfig.c
index 5dbc412879..8d2bfe41db 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPchPolicyBoardConfig.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPchPolicyBoardConfig.c
@@ -2,11 +2,12 @@
  Intel PEI PCH Policy update by board configuration
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiPolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   This function performs PEI PCH Policy update by board configuration.
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPchPolicyBoardConfigPreMem.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPchPolicyBoardConfigPreMem.c
index 1080015029..00cf73dfd9 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPchPolicyBoardConfigPreMem.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPchPolicyBoardConfigPreMem.c
@@ -2,11 +2,12 @@
  Intel PEI PCH Pre-Memory Policy update by board configuration
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiPolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   This function performs PEI PCH Pre-Memory Policy update by board configuration.
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPolicyBoardConfig.h b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPolicyBoardConfig.h
index 03c27f2a41..63e961d980 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPolicyBoardConfig.h
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPolicyBoardConfig.h
@@ -2,7 +2,7 @@
  Header file for PeiPolicyBoardConfig library instance.
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
@@ -14,7 +14,6 @@
 #include <Library/PeiServicesLib.h>
 #include <Library/DebugLib.h>
 #include <Library/HobLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Library/PeiPolicyBoardConfigLib.h>
 #include <Library/IoLib.h>
 #include <Library/BaseMemoryLib.h>
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPolicyBoardConfigLib.inf b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPolicyBoardConfigLib.inf
index 65e66ccb62..15ef223050 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPolicyBoardConfigLib.inf
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPolicyBoardConfigLib.inf
@@ -2,7 +2,7 @@
 # Module Information file for PeiPolicyBoardConfigLib Library
 #
 #
-#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -34,6 +34,7 @@
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   SecurityPkg/SecurityPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses]
   PcdLib
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiSaPolicyBoardConfig.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiSaPolicyBoardConfig.c
index d1d964aea7..8487761d18 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiSaPolicyBoardConfig.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiSaPolicyBoardConfig.c
@@ -2,11 +2,12 @@
  Intel PEI SA Policy update by board configuration
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiPolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   This function performs PEI SA Policy update by board configuration.
diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiSaPolicyBoardConfigPreMem.c b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiSaPolicyBoardConfigPreMem.c
index 34fca7fac3..af2b884cfd 100644
--- a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiSaPolicyBoardConfigPreMem.c
+++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiSaPolicyBoardConfigPreMem.c
@@ -2,11 +2,12 @@
  Intel PEI SA Pre-Memory Policy update by board configuration
 
 
-  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiPolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   This function performs PEI SA Pre-Memory Policy update by board configuration.
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf
index c986e35360..f793432bf0 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiCpuPolicyLib library.
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -28,11 +28,13 @@ SaPlatformLib
 SiConfigBlockLib
 PostCodeLib
 PcdLib
+ConfigBlockLib
 
 [Packages]
 MdePkg/MdePkg.dec
 UefiCpuPkg/UefiCpuPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 PeiCpuPolicyLib.c
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibPreMem.c b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibPreMem.c
index 7d45e10236..35a13684db 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibPreMem.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibPreMem.c
@@ -1,14 +1,13 @@
 /** @file
   This file is PeiCpuPolicyLibPreMem library.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiCpuPolicyLibrary.h"
 #include <Library/PciSegmentLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Library/PostCodeLib.h>
 #include <Library/SaPlatformLib.h>
 
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibPreMem.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibPreMem.inf
index 52dc989f74..25f1e84c33 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibPreMem.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibPreMem.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiCpuPolicyLibPreMem library.
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -24,11 +24,13 @@ MemoryAllocationLib
 CpuPlatformLib
 SiConfigBlockLib
 PostCodeLib
+ConfigBlockLib
 
 [Packages]
 MdePkg/MdePkg.dec
 UefiCpuPkg/UefiCpuPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 PeiCpuPolicyLib.c
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf
index b04dc3cfa4..6037fe2a07 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the BaseSiConfigBlockLib library.
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -25,7 +25,7 @@ ConfigBlockLib
 [Packages]
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 BaseSiConfigBlockLib.c
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
index de8d9745d3..24da4bdc77 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
@@ -2,13 +2,14 @@
   This file is PeiSiPolicyLib library creates default settings of RC
   Policy and installs RC Policy PPI.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiSiPolicyLibrary.h"
 #include <Library/PcdLib.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   Get Si config block table total size.
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
index c5945c3129..002d998523 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiSiPolicyLib library.
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -32,7 +32,7 @@ PcdLib
 [Packages]
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 PeiSiPolicyLib.c
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c
index 499f895e8e..fda56e7e76 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c
@@ -2,13 +2,14 @@
   This file is PeiSiPolicyLib library creates default settings of RC
   Policy and installs RC Policy PPI.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiSiPolicyLibrary.h"
 #include <Base.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   SiCreatePreMemConfigBlocks creates the config blocksg of Silicon PREMEM Policy.
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
index cb6b14fdd1..9778ae4dd4 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for the PeiSiPolicyLib library.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -14,7 +14,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Ppi/SiPolicy.h>
 #include <Library/SiPolicyLib.h>
 #include <Library/PchPolicyLib.h>
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
index cf7e1b2308..0b5e48d337 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
@@ -1,12 +1,13 @@
 /** @file
   This file is PeiSiPolicyLib library for printing Policy settings.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiSiPolicyLibrary.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   Print whole SI_POLICY_PPI and serial out.
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
index 5db4714346..4ada50d0ea 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
@@ -1,7 +1,7 @@
 /** @file
   Prototype of the MePolicyLibPei library.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -10,7 +10,6 @@
 #define _PEI_ME_POLICY_LIB_H_
 
 #include <Ppi/SiPolicy.h>
-#include <Library/ConfigBlockLib.h>
 
 /**
   This function prints the PEI phase PreMem policy.
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c
index 6f3d70b841..a39e0d95cf 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c
@@ -1,12 +1,13 @@
 /** @file
   This file is PeiMePolicy library.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiMePolicyLibrary.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   Load default settings for ME config block in pre-mem phase.
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf
index 85a227f950..440de11c5c 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiMePolicyLib libbrary.
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -28,6 +28,7 @@ ConfigBlockLib
 [Packages]
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 PeiMePolicyLib.c
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h
index 3ac6a639e9..18db7e3c5d 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for the PeiMePolicy library.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -18,7 +18,6 @@
 #include <Library/PeiMePolicyLib.h>
 #include <ConfigBlock.h>
 #include <ConfigBlock/MePeiConfig.h>
-#include <Library/ConfigBlockLib.h>
 #include <Library/SiConfigBlockLib.h>
 #include <MkhiMsgs.h>
 
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Protocol/PchPolicy.h b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Protocol/PchPolicy.h
index ff35b43b61..0f7b02808b 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Protocol/PchPolicy.h
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Protocol/PchPolicy.h
@@ -1,7 +1,7 @@
 /** @file
   Interface definition details between Pch and platform drivers during DXE phase.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -10,7 +10,6 @@
 #define _PCH_POLICY_H_
 
 #include <ConfigBlock.h>
-#include <Library/ConfigBlockLib.h>
 #include <Private/PchConfigHob.h>
 #include <Library/HobLib.h>
 
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/DxePchPolicyLib/DxePchPolicyLib.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/DxePchPolicyLib/DxePchPolicyLib.inf
index 8845ab796c..a7c6efb6f1 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/DxePchPolicyLib/DxePchPolicyLib.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/DxePchPolicyLib/DxePchPolicyLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiPchPolicy library.
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -28,6 +28,7 @@ PchInfoLib
 [Packages]
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 DxePchPolicyLib.c
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c
index bd1e2711da..a9077cb77c 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c
@@ -1,12 +1,13 @@
 /** @file
   Print whole PCH_PREMEM_POLICY_PPI
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiPchPolicyLibrary.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   Print PCH_GENERAL_PREMEM_CONFIG and serial out.
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c
index d9005b50ef..a5a830f3da 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c
@@ -1,13 +1,14 @@
 /** @file
   Print whole PCH_POLICY_PPI
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiPchPolicyLibrary.h"
 #include <Private/PchHsio.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   Print USB_CONFIG and serial out.
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
index ece0be8158..2f7a791444 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
@@ -1,7 +1,7 @@
 /** @file
   This file is PeiPchPolicy library.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -10,6 +10,7 @@
 #include <Library/PchPcieRpLib.h>
 #include <Library/CpuPlatformLib.h>
 #include <Register/PchRegsLpcCnl.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   mPxRcConfig[] table contains data for 8259 routing (how PIRQx is mapped to IRQy).
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibCnl.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibCnl.inf
index 49e63cfc51..ce90cdd047 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibCnl.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibCnl.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiPchPolicy libbrary.
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -33,7 +33,7 @@ CpuPlatformLib
 [Packages]
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
 gSiPkgTokenSpaceGuid.PcdSmbusBaseAddress
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
index abd7e63365..d1f8337e5a 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for the PeiPchPolicy library.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -14,7 +14,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Library/SiConfigBlockLib.h>
 #include <Library/PchInfoLib.h>
 #include <Library/SataLib.h>
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c
index dfab5d29c2..4fe4da7155 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c
@@ -1,13 +1,14 @@
 /** @file
   This file is PeiPchPreMemPolicy library.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiPchPolicyLibrary.h"
 #include <Library/CpuPlatformLib.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   Load Config block default
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLib/PeiDxeSmmPchDmiLib.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLib/PeiDxeSmmPchDmiLib.inf
index b36fc15901..1655e10e55 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLib/PeiDxeSmmPchDmiLib.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLib/PeiDxeSmmPchDmiLib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Component description file for the PeiDxeSmmPchDmiLib
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -31,7 +31,7 @@ LIBRARY_CLASS                  = PchDmiLib
 [Packages]
   MdePkg/MdePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
-
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PchDmiLib.c
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLib/PeiDxeSmmPchDmiWithS3Lib.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLib/PeiDxeSmmPchDmiWithS3Lib.inf
index 1eda7cdba8..8c58313999 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLib/PeiDxeSmmPchDmiWithS3Lib.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLib/PeiDxeSmmPchDmiWithS3Lib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Component description file for the PeiDxeSmmPchDmiWithS3Lib
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -33,7 +33,7 @@ LIBRARY_CLASS                  = PchDmiWithS3Lib
 [Packages]
   MdePkg/MdePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
-
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PchDmiWithS3Lib.c
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf
index d81c428a1c..bb79ab3f39 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Component description file for the PchInitCommonLib
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -21,6 +21,7 @@
 [Packages]
   MdePkg/MdePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses]
   IoLib
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
index 16b1c019b8..e613a8a2df 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiDxeSmmPchPciExpressHelpersLib
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -35,7 +35,7 @@ PchInitCommonLib
 [Packages]
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 PchPciExpressHelpersLibrary.c
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiDxeSmmPmcPrivateLibCnl.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiDxeSmmPmcPrivateLibCnl.inf
index adb154dd14..573acfc25e 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiDxeSmmPmcPrivateLibCnl.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiDxeSmmPmcPrivateLibCnl.inf
@@ -4,7 +4,7 @@
 # All function in this library is available for PEI, DXE, and SMM,
 # But do not support UEFI RUNTIME environment call.
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -36,7 +36,7 @@ BaseMemoryLib
 [Packages]
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
 gSiPkgTokenSpaceGuid.PcdAcpiBaseAddress
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiDxeSmmPmcPrivateLibWithS3.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiDxeSmmPmcPrivateLibWithS3.inf
index cd1380dc43..c6aa2f6b31 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiDxeSmmPmcPrivateLibWithS3.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiDxeSmmPmcPrivateLibWithS3.inf
@@ -5,7 +5,7 @@
 # All function in this library is available for PEI, DXE, and SMM,
 # But do not support UEFI RUNTIME environment call.
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -33,7 +33,7 @@ S3BootScriptLib
 [Packages]
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 PmcPrivateLibWithS3.c
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiPmcPrivateLibCnl.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiPmcPrivateLibCnl.inf
index ab3645c61d..d889e03b5a 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiPmcPrivateLibCnl.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiPmcPrivateLibCnl.inf
@@ -1,7 +1,7 @@
 ## @file
 # PEI PCH PMC Private Lib for Cannon Lake PCH.
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -35,6 +35,7 @@ PeiItssLib
 [Packages]
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 PeiPmcPrivateLib.c
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
index bcbdb12dc3..12f1a7f4fe 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
@@ -1,7 +1,7 @@
 /** @file
   This is the driver that initializes the Intel PCH.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -34,6 +34,7 @@
 #include <TraceHubCommonConfig.h>
 #include <PchReservedResources.h>
 #include <Register/PchRegsTraceHub.h>
+#include <Library/ConfigBlockLib.h>
 
 //
 // Module variables
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
index 57f2e1dca0..b8a1be2dcc 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
@@ -1,7 +1,7 @@
 /** @file
   Initializes the PCH HD Audio ACPI Tables.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -13,6 +13,7 @@
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiLib.h>
 #include <Protocol/AcpiTable.h>
+#include <Library/ConfigBlockLib.h>
 
 #include "PchInit.h"
 #include <Protocol/PchPolicy.h>
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeCnl.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeCnl.inf
index 5e0cf06cb6..858bbc47ed 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeCnl.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeCnl.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for Pch Initialization driver
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -55,7 +55,7 @@ DxeSaPolicyLib
 [Packages]
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFspCnl.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFspCnl.inf
index 528cfd0296..7c92561256 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFspCnl.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFspCnl.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Component description file for Pch Initialization driver for FSP package
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -48,7 +48,7 @@ BiosLockLib
 [Packages]
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
index 693c5d3f50..e9f734006f 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for PCH Init SMM Handler
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -34,7 +34,6 @@
 #include <Library/GpioNativeLib.h>
 #include <Library/PchEspiLib.h>
 #include <Library/PciSegmentLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Private/Library/PchPciExpressHelpersLib.h>
 #include <Protocol/PchPcieSmiDispatch.h>
 #include <Protocol/PchTcoSmiDispatch.h>
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
index 308da65385..267c45872d 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for PchInitSmm driver
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -50,7 +50,7 @@ SataLib
 [Packages]
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf
index 38d5dbeebf..f51afa518c 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the Pch SMI Dispatch Handlers module
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -47,7 +47,7 @@ SmiHandlerProfileLib
 [Packages]
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
 # Progress Code for S3 Suspend end.
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h
index c29d67a305..6c7500cd89 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h
@@ -1,7 +1,7 @@
 /** @file
   Prototype of the PeiSaPolicy library.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -10,7 +10,6 @@
 #define _PEI_SA_POLICY_LIB_H_
 
 #include <Ppi/SiPolicy.h>
-#include <Library/ConfigBlockLib.h>
 
 /**
   This function prints the PEI phase PreMem policy.
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
index 7b68f3072b..93872d6806 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
@@ -1,7 +1,7 @@
 /** @file
   Interface definition details between System Agent and platform drivers during DXE phase.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -11,7 +11,6 @@
 
 #include <SaAccess.h>
 #include <ConfigBlock.h>
-#include <Library/ConfigBlockLib.h>
 #include <ConfigBlock/GraphicsDxeConfig.h>
 #include <ConfigBlock/MemoryDxeConfig.h>
 #include <ConfigBlock/MiscDxeConfig.h>
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
index 086c60bfed..20fdd2b734 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
@@ -1,7 +1,7 @@
 /** @file
   Main System Agent Policy structure definition which will contain several config blocks during runtime.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -13,7 +13,6 @@
 #include <Library/SmbusLib.h>
 #include <SaAccess.h>
 #include <ConfigBlock.h>
-#include <Library/ConfigBlockLib.h>
 #include <ConfigBlock/SwitchableGraphicsConfig.h>
 #include <ConfigBlock/MemoryConfig.h>
 #include <ConfigBlock/GraphicsPeiPreMemConfig.h>
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c
index 0e8d518fe7..a9ae787215 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c
@@ -1,13 +1,13 @@
 /** @file
   This file provide services for DXE phase policy default initialization
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "DxeSaPolicyLibrary.h"
-
+#include <Library/ConfigBlockLib.h>
 
 GLOBAL_REMOVE_IF_UNREFERENCED PCIE_ASPM_OVERRIDE_LIST mPcieAspmDevsOverride[] = {
   {0x8086, 0x108b, 0xff, 2, 2},           ///< Tekoa w/o iAMT
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf
index 8a5092e199..f45ee35e35 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiSaPolicy library.
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -27,6 +27,7 @@ HobLib
 [Packages]
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 DxeSaPolicyLib.c
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h
index 449b67798c..0c0702985e 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for the DxeSaPolicy library.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -15,7 +15,6 @@
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Base.h>
 #include <ConfigBlock.h>
 #include <Library/HobLib.h>
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c
index b7aec77842..0f46fd6f0e 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c
@@ -1,7 +1,7 @@
 /** @file
   This file is SampleCode for Intel SA PEI Policy initialization.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -16,6 +16,7 @@
 #include <Library/PeiSaPolicyLib.h>
 #include <Library/PchCycleDecodingLib.h>
 #include <Private/Library/PmcPrivateLib.h>
+#include <Library/ConfigBlockLib.h>
 
 #pragma pack (push, 1)
 typedef union {
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf
index 22d0f0c945..a77f9a8441 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiSaPolicy library.
 #
-# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -34,6 +34,7 @@ PchInfoLib
 MdePkg/MdePkg.dec
 UefiCpuPkg/UefiCpuPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c
index 463e75702d..90a5634272 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c
@@ -1,7 +1,7 @@
 /** @file
   This file provides services for Sample PEI policy default initialization.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -21,6 +21,7 @@
 #include <Library/CpuPlatformLib.h>
 #include <Library/RngLib.h>
 #include <Library/CpuMailboxLib.h>
+#include <Library/ConfigBlockLib.h>
 
 //
 // DQ byte mapping to CMD/CTL/CLK, from the CPU side
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h
index 124ca6a57f..37d4a8e6a2 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for the PeiSaPolicy library.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -21,7 +21,6 @@
 #include <Library/PciSegmentLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/CpuPlatformLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Ppi/SiPolicy.h>
 #include <Library/PeiSaPolicyLib.h>
 #include <Library/SiConfigBlockLib.h>
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c
index ce3ef52733..9a267745d1 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c
@@ -1,13 +1,14 @@
 /** @file
   This file provides service for PEI phase policy printing
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PeiSaPolicyLibrary.h"
 #include <Library/GpioNativeLib.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   This function prints the PEI phase PreMem policy.
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
index 5daa2367e6..c335beca3e 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
@@ -1,7 +1,7 @@
 /** @file
   DXE driver for Initializing SystemAgent Graphics ACPI table initialization.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -11,6 +11,7 @@
 #include <Protocol/LegacyBios.h>
 #include <Protocol/GopComponentName2.h>
 #include <SiConfigHob.h>
+#include <Library/ConfigBlockLib.h>
 
 typedef union {
   struct {
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionInit.c b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionInit.c
index 6ec0691074..07b8c4ef90 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionInit.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionInit.c
@@ -3,12 +3,13 @@
   Software SCI interface between system BIOS, ASL code, and Graphics drivers.
   The code in this file will load the driver and initialize the interface
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "IgdOpRegionInit.h"
+#include <Library/ConfigBlockLib.h>
 
 GLOBAL_REMOVE_IF_UNREFERENCED IGD_OPREGION_PROTOCOL           mIgdOpRegion;
 
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionInit.h b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionInit.h
index 0e95db3d02..0f73afeb0e 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionInit.h
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionInit.h
@@ -2,7 +2,7 @@
   This is part of the implementation of an Intel Graphics drivers OpRegion /
   Software SCI interface between system BIOS, ASL code, and Graphics drivers.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
@@ -30,7 +30,6 @@
 #include <SaInit.h>
 #include <Library/CpuPlatformLib.h>
 #include <Library/HobLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <SiConfigHob.h>
 
 ///
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/PciExpressInit.c b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/PciExpressInit.c
index bbdf0d0fab..715c5a89a1 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/PciExpressInit.c
+++ b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/PciExpressInit.c
@@ -1,12 +1,13 @@
 /** @file
   This driver does SA PCI Express ACPI table initialization.
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 
 #include "PciExpressInit.h"
+#include <Library/ConfigBlockLib.h>
 
 extern SYSTEM_AGENT_NVS_AREA_PROTOCOL   mSaNvsAreaProtocol;
 extern SA_CONFIG_HOB                    *mSaConfigHob;
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Include/ConfigBlock.h b/Silicon/Intel/IntelSiliconPkg/Include/ConfigBlock.h
similarity index 92%
rename from Silicon/Intel/CoffeelakeSiliconPkg/Include/ConfigBlock.h
rename to Silicon/Intel/IntelSiliconPkg/Include/ConfigBlock.h
index d0e3d94418..e14c3df962 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Include/ConfigBlock.h
+++ b/Silicon/Intel/IntelSiliconPkg/Include/ConfigBlock.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for Config Block Lib implementation
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/ConfigBlockLib.h b/Silicon/Intel/IntelSiliconPkg/Include/Library/ConfigBlockLib.h
similarity index 94%
rename from Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/ConfigBlockLib.h
rename to Silicon/Intel/IntelSiliconPkg/Include/Library/ConfigBlockLib.h
index 9a3bf373a6..99b8ae4b5a 100644
--- a/Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/ConfigBlockLib.h
+++ b/Silicon/Intel/IntelSiliconPkg/Include/Library/ConfigBlockLib.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for Config Block Lib implementation
 
-  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
+  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
 
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
diff --git a/Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf b/Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf
index 37b4faaf65..a0c263d475 100644
--- a/Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf
+++ b/Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component INF file for the BaseConfigBlock library.
 #
-# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -18,7 +18,7 @@ LIBRARY_CLASS  = ConfigBlockLib
 
 [Packages]
 MdePkg/MdePkg.dec
-KabylakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 BaseConfigBlockLib.c
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf
index e0f4ee03ee..d3b4d9e318 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiCpuPolicyLib library.
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -28,11 +28,13 @@ MmPciLib
 SaPlatformLib
 SiConfigBlockLib
 PostCodeLib
+ConfigBlockLib
 
 [Packages]
 MdePkg/MdePkg.dec
 UefiCpuPkg/UefiCpuPkg.dec
 KabylakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 PeiCpuPolicyLib.c
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf
index a18ea79147..dbd8c4082d 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCpuPolicyLibPreMem.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiCpuPolicyLibPreMem library.
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -24,11 +24,13 @@ MemoryAllocationLib
 CpuPlatformLib
 SiConfigBlockLib
 PostCodeLib
+ConfigBlockLib
 
 [Packages]
 MdePkg/MdePkg.dec
 UefiCpuPkg/UefiCpuPkg.dec
 KabylakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 PeiCpuPolicyLib.c
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h b/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
deleted file mode 100644
index dd91a55e79..0000000000
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/** @file
-  Header file for Config Block Lib implementation
-
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#ifndef _CONFIG_BLOCK_H_
-#define _CONFIG_BLOCK_H_
-
-#include <Uefi/UefiBaseType.h>
-#include <Uefi/UefiMultiPhase.h>
-#include <Pi/PiBootMode.h>
-#include <Pi/PiHob.h>
-
-#pragma pack (push,1)
-
-///
-/// Config Block Header
-///
-typedef struct _CONFIG_BLOCK_HEADER {
-  EFI_HOB_GUID_TYPE GuidHob;                      ///< Offset 0-23  GUID extension HOB header
-  UINT8             Revision;                     ///< Offset 24    Revision of this config block
-  UINT8             Attributes;                   ///< Offset 25    The main revision for config block
-  UINT8             Reserved[2];                  ///< Offset 26-27 Reserved for future use
-} CONFIG_BLOCK_HEADER;
-
-///
-/// Config Block
-///
-typedef struct _CONFIG_BLOCK {
-  CONFIG_BLOCK_HEADER            Header;          ///< Offset 0-27  Header of config block
-  //
-  // Config Block Data
-  //
-} CONFIG_BLOCK;
-
-///
-/// Config Block Table Header
-///
-typedef struct _CONFIG_BLOCK_TABLE_STRUCT {
-  CONFIG_BLOCK_HEADER            Header;          ///< Offset 0-27  GUID number for main entry of config block
-  UINT8                          Rsvd0[2];        ///< Offset 28-29 Reserved for future use
-  UINT16                         NumberOfBlocks;  ///< Offset 30-31 Number of config blocks (N)
-  UINT32                         AvailableSize;   ///< Offset 32-35 Current config block table size
-///
-/// Individual Config Block Structures are added here in memory as part of AddConfigBlock()
-///
-} CONFIG_BLOCK_TABLE_HEADER;
-#pragma pack (pop)
-
-#endif // _CONFIG_BLOCK_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
deleted file mode 100644
index 04c8ec5cca..0000000000
--- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/** @file
-  Header file for Config Block Lib implementation
-
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
-SPDX-License-Identifier: BSD-2-Clause-Patent
-
-**/
-
-#ifndef _CONFIG_BLOCK_LIB_H_
-#define _CONFIG_BLOCK_LIB_H_
-
-/**
-  Create config block table
-
-  @param[in]     TotalSize                    - Max size to be allocated for the Config Block Table
-  @param[out]    ConfigBlockTableAddress      - On return, points to a pointer to the beginning of Config Block Table Address
-
-  @retval EFI_INVALID_PARAMETER - Invalid Parameter
-  @retval EFI_OUT_OF_RESOURCES  - Out of resources
-  @retval EFI_SUCCESS           - Successfully created Config Block Table at ConfigBlockTableAddress
-**/
-EFI_STATUS
-EFIAPI
-CreateConfigBlockTable (
-  IN     UINT16    TotalSize,
-  OUT    VOID      **ConfigBlockTableAddress
-  );
-
-/**
-  Add config block into config block table structure
-
-  @param[in]     ConfigBlockTableAddress      - A pointer to the beginning of Config Block Table Address
-  @param[out]    ConfigBlockAddress           - On return, points to a pointer to the beginning of Config Block Address
-
-  @retval EFI_OUT_OF_RESOURCES - Config Block Table is full and cannot add new Config Block or
-                                 Config Block Offset Table is full and cannot add new Config Block.
-  @retval EFI_SUCCESS          - Successfully added Config Block
-**/
-EFI_STATUS
-EFIAPI
-AddConfigBlock (
-  IN     VOID      *ConfigBlockTableAddress,
-  OUT    VOID      **ConfigBlockAddress
-  );
-
-/**
-  Retrieve a specific Config Block data by GUID
-
-  @param[in]      ConfigBlockTableAddress      - A pointer to the beginning of Config Block Table Address
-  @param[in]      ConfigBlockGuid              - A pointer to the GUID uses to search specific Config Block
-  @param[out]     ConfigBlockAddress           - On return, points to a pointer to the beginning of Config Block Address
-
-  @retval EFI_NOT_FOUND         - Could not find the Config Block
-  @retval EFI_SUCCESS           - Config Block found and return
-**/
-EFI_STATUS
-EFIAPI
-GetConfigBlock (
-  IN     VOID      *ConfigBlockTableAddress,
-  IN     EFI_GUID  *ConfigBlockGuid,
-  OUT    VOID      **ConfigBlockAddress
-  );
-
-#endif // _CONFIG_BLOCK_LIB_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf
index c9a70c10c8..86a778c079 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the BaseSiConfigBlockLib library.
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -26,7 +26,7 @@ ConfigBlockLib
 [Packages]
 MdePkg/MdePkg.dec
 KabylakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 BaseSiConfigBlockLib.c
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf
index 1997f43ab4..56360918ce 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPolicyInitLib.inf
@@ -1,7 +1,7 @@
 ### @file
 # Library functions for Fsp Policy Initialization Library.
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -47,6 +47,7 @@
   KabylakeSiliconPkg/SiPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses]
   BaseMemoryLib
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
index c3a8bbf539..baa2beea37 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
@@ -2,13 +2,14 @@
   This file is PeiSiPolicyLib library creates default settings of RC
   Policy and installs RC Policy PPI.
 
-Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
 #include "PeiSiPolicyLibrary.h"
 #include <Library/PcdLib.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   Get Si config block table total size.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
index 47f58d16e9..ec33fa50a3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiSiPolicyLib library.
 #
-# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -35,7 +35,7 @@ PcdLib
 [Packages]
 MdePkg/MdePkg.dec
 KabylakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 PeiSiPolicyLib.c
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c
index e6506a0445..7b20d6c8af 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c
@@ -2,13 +2,13 @@
   This file is PeiSiPolicyLib library creates default settings of RC
   Policy and installs RC Policy PPI.
 
-Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
 #include "PeiSiPolicyLibrary.h"
-
+#include <Library/ConfigBlockLib.h>
 
 /**
   SiCreatePreMemConfigBlocks creates the config blocksg of Silicon PREMEM Policy.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
index f090e58868..6c55bda920 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for the PeiSiPolicyLib library.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/BaseMemoryLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Ppi/SiPolicy.h>
 #include <Library/SiPolicyLib.h>
 #include <Library/PchPolicyLib.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
index 623f30de45..d12ab2de36 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
@@ -1,12 +1,13 @@
 /** @file
   This file is PeiSiPolicyLib library for printing Policy settings.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
 #include "PeiSiPolicyLibrary.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   Print whole SI_POLICY_PPI and serial out.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconInitLib/PeiSiliconInitLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconInitLib/PeiSiliconInitLib.inf
index bd77b081e5..3b94a02e6b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconInitLib/PeiSiliconInitLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconInitLib/PeiSiliconInitLib.inf
@@ -1,6 +1,6 @@
 ### @file
 #
-# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -39,6 +39,7 @@
   MdePkg/MdePkg.dec
   SecurityPkg/SecurityPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   SiliconInit.c
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPostMemSiliconPolicyInitLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPostMemSiliconPolicyInitLib.inf
index 83c909e681..0fc7c2aa13 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPostMemSiliconPolicyInitLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPostMemSiliconPolicyInitLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Library functions for Policy Initialization Library.
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -48,6 +48,7 @@
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   UefiCpuPkg/UefiCpuPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses]
   SiPolicyLib
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPreMemSiliconPolicyInitLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPreMemSiliconPolicyInitLib.inf
index 782e04a476..bf9dbfb22f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPreMemSiliconPolicyInitLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPreMemSiliconPolicyInitLib.inf
@@ -1,7 +1,7 @@
 ### @file
 # Library functions for Policy Initialization Library.
 #
-# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -47,6 +47,7 @@
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses]
   SiPolicyLib
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c
index e72a06f5d3..80981f8dba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMePolicyInitLib.c
@@ -1,13 +1,13 @@
 /** @file
   Implementation of Fsp Me Policy Initialization.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
 #include <PeiFspPolicyInitLib.h>
-
+#include <Library/ConfigBlockLib.h>
 #include <Ppi/SiPolicy.h>
 
 /**
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c
index 46c143553c..9348cd6042 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPchPolicyInitLib.c
@@ -1,7 +1,7 @@
 /** @file
   Implementation of Fsp PCH Policy Initialization.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Ppi/SiPolicy.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PeiServicesLib.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   Performs FSP PCH PEI Policy pre mem initialization.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h
index 52f20777ec..824494ad07 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolicyInitLib.h
@@ -1,7 +1,7 @@
 /** @file
   Internal header file for Fsp Policy Initialization Library.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -13,7 +13,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include <Library/DebugLib.h>
 #include <Library/PeiServicesLib.h>
-#include <Library/ConfigBlockLib.h>
 #include "PeiPolicyInitLib.h"
 
 #include <FspEas.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFsp.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFsp.inf
index c11680656d..0db8fcce66 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFsp.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFsp.inf
@@ -1,7 +1,7 @@
 ### @file
 # Library functions for Fsp Policy Initialization Library.
 #
-# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -59,6 +59,7 @@
   IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeFspBinPkg/KabylakeFspBinPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses]
   BaseMemoryLib
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFspAml.inf b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFspAml.inf
index 1ace9aeb52..72dd7b8d34 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFspAml.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconPolicyInitLibFspAml.inf
@@ -1,7 +1,7 @@
 ### @file
 # Library functions for Fsp Policy Initialization Library.
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -59,6 +59,7 @@
   IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   AmberLakeFspBinPkg/AmberLakeFspBinPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses]
   BaseMemoryLib
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
index bca35e19d3..72ca0b33e0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
@@ -1,7 +1,7 @@
 /** @file
   Prototype of the MePolicyLibPei library.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define _PEI_ME_POLICY_LIB_H_
 
 #include <Ppi/SiPolicy.h>
-#include <Library/ConfigBlockLib.h>
 
 /**
   This function prints the PEI phase PreMem policy.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c
index 803de0999e..62e4232d59 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c
@@ -1,11 +1,12 @@
 /** @file
   This file is PeiMePolicy library.
 
-Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiMePolicyLibrary.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   Load default settings for ME config block in pre-mem phase.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf
index ea247181a4..6895f17f7c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiMePolicyLib libbrary.
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -29,7 +29,7 @@ ConfigBlockLib
 [Packages]
 MdePkg/MdePkg.dec
 KabylakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 PeiMePolicyLib.c
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h
index a908bb6c24..c57d226231 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for the PeiMePolicy library.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -16,7 +16,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Ppi/SiPolicy.h>
 #include <Library/PeiMePolicyLib.h>
 #include <ConfigBlock.h>
-#include <Library/ConfigBlockLib.h>
 #include <Library/SiConfigBlockLib.h>
 
 #endif // _PEI_ME_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c
index b7fcb0944e..43d0484713 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c
@@ -1,11 +1,12 @@
 /** @file
   Print whole PCH_PREMEM_POLICY_PPI
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiPchPolicyLibrary.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   Print PCH_GENERAL_PREMEM_CONFIG and serial out.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c
index 72a78e5faf..e540dc95b0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c
@@ -1,11 +1,12 @@
 /** @file
   Print whole PCH_POLICY_PPI
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiPchPolicyLibrary.h"
+#include <Library/ConfigBlockLib.h>
 
 /**
   Print PCH_USB_CONFIG and serial out.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c
index 62b621ce2f..9a27327032 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePolicyLib.c
@@ -1,11 +1,12 @@
 /** @file
   This file is to load sample board policy.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiPchPolicyLibrary.h"
+#include <Library/ConfigBlockLib.h>
 
 /*
   Apply sample board PCH specific default settings
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c
index 6cf9d9069e..5c2727acba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePreMemPolicyLib.c
@@ -1,11 +1,12 @@
 /** @file
   This file is to load sample board policy.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiPchPolicyLibrary.h"
+#include <Library/ConfigBlockLib.h>
 
 /*
   Apply sample board PCH specific default settings
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
index 39004319aa..a5ccf4698b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiPchPolicy libbrary.
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -32,7 +32,7 @@ SiConfigBlockLib
 [Packages]
 MdePkg/MdePkg.dec
 KabylakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
 gSiPkgTokenSpaceGuid.PcdAcpiBaseAddress
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
index f8d01614ac..4a21cbbc10 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for the PeiPchPolicy library.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -13,7 +13,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/BaseMemoryLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Library/SiConfigBlockLib.h>
 #include <Library/PchInfoLib.h>
 #include <Ppi/SiPolicy.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/BasePchSpiCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/BasePchSpiCommonLib.inf
index 599b07d3d3..51e2d25a7f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/BasePchSpiCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/BasePchSpiCommonLib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Component description file for the PchSpiCommonLib
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -22,6 +22,7 @@
   MdePkg/MdePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses]
   IoLib
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf
index 04940c75c1..7982327af7 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchHdaLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component information file for PCH HD Audio Library
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -29,7 +29,7 @@ PchInfoLib
 MdePkg/MdePkg.dec
 KabylakeSiliconPkg/SiPkg.dec
 KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
   gSiPkgTokenSpaceGuid.PcdAcpiDefaultOemId
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/PeiDxeI2cMasterCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/PeiDxeI2cMasterCommonLib.inf
index 5218191d8a..bcb28a6a0c 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/PeiDxeI2cMasterCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommonLib/PeiDxeI2cMasterCommonLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the I2C port driver.
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -31,7 +31,7 @@ PchInfoLib
 KabylakeSiliconPkg/SiPkg.dec
 KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
 MdePkg/MdePkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 I2cMasterCommonLib.c
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf
index 7986358ce1..075e5c7f3f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateLib/PeiDxeSmmGpioPrivateLib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Component description file for the PeiDxeSmmGpioPrivateLib
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -34,7 +34,7 @@ LIBRARY_CLASS                  = GpioPrivateLib
   MdePkg/MdePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
-
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   GpioPrivateLib.c
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf
index 52ab228442..b13295416f 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Component description file for the PchInitCommonLib
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -23,6 +23,7 @@
   MdePkg/MdePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses]
   IoLib
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
index 39dc89670a..1cbfe21a87 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiDxeSmmPchPciExpressHelpersLib
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -39,7 +39,7 @@ PchInitCommonLib
 MdePkg/MdePkg.dec
 KabylakeSiliconPkg/SiPkg.dec
 KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 PchPciExpressHelpersLibrary.c
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PeiDxeSmmPchPsfPrivateLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PeiDxeSmmPchPsfPrivateLib.inf
index 0d7050500a..094aa498fd 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PeiDxeSmmPchPsfPrivateLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivateLib/PeiDxeSmmPchPsfPrivateLib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Component description file for the PeiDxeSmmPchPsfPrivateLib
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -34,7 +34,7 @@ LIBRARY_CLASS                  = PchPsfPrivateLib
   MdePkg/MdePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
-
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
   PchPsfPrivateLib.c
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PeiDxeSmmPchSmbusCommonLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PeiDxeSmmPchSmbusCommonLib.inf
index 78324e1fef..286b9f566b 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PeiDxeSmmPchSmbusCommonLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCommonLib/PeiDxeSmmPchSmbusCommonLib.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Component description file for the PchSmbusCommonLib
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -22,6 +22,7 @@
   MdePkg/MdePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 [LibraryClasses]
   IoLib
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf
index 413d0c86f8..cfcd23d332 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib/PeiDxeSmmRstPrivateLib.inf
@@ -4,7 +4,7 @@
 # All function in this library is available for PEI, DXE, and SMM,
 # But do not support UEFI RUNTIME environment call.
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -31,6 +31,7 @@ PchInitCommonLib
 MdePkg/MdePkg.dec
 KabylakeSiliconPkg/SiPkg.dec
 KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 PeiDxeSmmRstPrivateLib.c
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
index 516606e604..2bed548f60 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for PCH Initialization Driver.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -17,7 +17,6 @@ typedef UINT16                    STRING_REF;
 #include <Library/BaseMemoryLib.h>
 #include <Library/IoLib.h>
 #include <Library/TimerLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Protocol/DriverSupportedEfiVersion.h>
 #include <Library/PchCycleDecodingLib.h>
 #include <Library/PchPcieRpLib.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
index 49ede590e8..62a0fb30e0 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for Pch Initialization driver
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -51,7 +51,7 @@ RstPrivateLib
 MdePkg/MdePkg.dec
 KabylakeSiliconPkg/SiPkg.dec
 KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
 gSiPkgTokenSpaceGuid.PcdEfiGcdAllocateType
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
index 68c1bca40c..44dbb75de3 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
@@ -1,7 +1,7 @@
 ## @file
 #  Component description file for Pch Initialization driver for FSP package
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -45,7 +45,7 @@ PchPsfPrivateLib
 MdePkg/MdePkg.dec
 KabylakeSiliconPkg/SiPkg.dec
 KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
 gSiPkgTokenSpaceGuid.PcdEfiGcdAllocateType
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
index 666340e9b1..08261a5355 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for PCH Init SMM Handler
 
-Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -34,7 +34,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/GpioNativeLib.h>
 #include <Library/PchEspiLib.h>
 #include <Library/MmPciLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Library/PchPciExpressHelpersLib.h>
 #include <Protocol/PchPcieSmiDispatch.h>
 #include <Protocol/PchTcoSmiDispatch.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
index ea6692f6d9..942d1f48c9 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for PchInitSmm driver
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -51,7 +51,7 @@ ConfigBlockLib
 MdePkg/MdePkg.dec
 KabylakeSiliconPkg/SiPkg.dec
 KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
 gSiPkgTokenSpaceGuid.PcdEfiGcdAllocateType
diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf
index 46c4c72617..f14787bbe4 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatcher.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the Pch SMI Dispatch Handlers module
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -46,7 +46,7 @@ SmiHandlerProfileLib
 MdePkg/MdePkg.dec
 KabylakeSiliconPkg/SiPkg.dec
 KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
 # Progress Code for S3 Suspend end.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h
index 28e648f4a0..e8849580db 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib.h
@@ -1,7 +1,7 @@
 /** @file
   Prototype of the PeiSaPolicy library.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define _PEI_SA_POLICY_LIB_H_
 
 #include <Ppi/SiPolicy.h>
-#include <Library/ConfigBlockLib.h>
 
 /**
   This function prints the PEI phase PreMem policy.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
index 40a0ab884d..5a1534b7bc 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
@@ -1,7 +1,7 @@
 /** @file
   Interface definition details between System Agent and platform drivers during DXE phase.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -10,7 +10,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #include <SaAccess.h>
 #include <ConfigBlock.h>
-#include <Library/ConfigBlockLib.h>
 #include <ConfigBlock/GraphicsDxeConfig.h>
 #include <ConfigBlock/MiscDxeConfig.h>
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
index dccd4c9b3b..35b5793c9e 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
@@ -1,7 +1,7 @@
 /** @file
   Main System Agent Policy structure definition which will contain several config blocks during runtime.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -12,7 +12,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/SmbusLib.h>
 #include <SaAccess.h>
 #include <ConfigBlock.h>
-#include <Library/ConfigBlockLib.h>
 #include <ConfigBlock/MemoryConfig.h>
 #include <ConfigBlock/SaMiscPeiPreMemConfig.h>
 #include <ConfigBlock/GraphicsPeiConfig.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c
index be36468b1e..1c656f0595 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.c
@@ -1,13 +1,13 @@
 /** @file
   This file provide services for DXE phase policy default initialization
 
-Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
 #include "DxeSaPolicyLibrary.h"
-
+#include <Library/ConfigBlockLib.h>
 
 extern EFI_GUID gGraphicsDxeConfigGuid;
 extern EFI_GUID gMiscDxeConfigGuid;
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf
index 9eb389b14f..2ba7b6af3a 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiSaPolicy library.
 #
-# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -30,7 +30,7 @@ ConfigBlockLib
 [Packages]
 MdePkg/MdePkg.dec
 KabylakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Sources]
 DxeSaPolicyLib.c
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h
index ec1b7d10e8..24637bccfe 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSaPolicyLibrary.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for the DxeSaPolicy library.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/ConfigBlockLib.h>
 
 #include <Protocol/SaPolicy.h>
 #endif // _DXE_SA_POLICY_LIBRARY_H_
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c
index f62651796a..82091415cb 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOemPlatform.c
@@ -1,7 +1,7 @@
 /** @file
   This file is SampleCode for Intel SA PEI Policy initialization.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -15,6 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <PchAccess.h>
 #include <Library/PeiSaPolicyLib.h>
 #include <Library/PchCycleDecodingLib.h>
+#include <Library/ConfigBlockLib.h>
 
 #pragma pack (push, 1)
 typedef union {
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf
index 88734d672c..38dd8c7947 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLib.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for the PeiSaPolicy library.
 #
-# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -34,6 +34,7 @@ PchCycleDecodingLib
 MdePkg/MdePkg.dec
 UefiCpuPkg/UefiCpuPkg.dec
 KabylakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
 gSiPkgTokenSpaceGuid.PcdTsegSize
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c
index 63e93094e1..d2686760af 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibSample.c
@@ -1,7 +1,7 @@
 /** @file
   This file provides services for Sample PEI policy default initialization.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -22,6 +22,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/CpuPlatformLib.h>
 #include <Library/RngLib.h>
 #include <Library/CpuMailboxLib.h>
+#include <Library/ConfigBlockLib.h>
 
 //
 // DQ byte mapping to CMD/CTL/CLK, from the CPU side - for SKL RVP, SKL SDS.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h
index a44f7343dd..805ed18a81 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaPolicyLibrary.h
@@ -1,7 +1,7 @@
 /** @file
   Header file for the PeiSaPolicy library.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
@@ -20,7 +20,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/MmPciLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/CpuPlatformLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Ppi/SiPolicy.h>
 #include <Library/PeiSaPolicyLib.h>
 #include <Library/SiConfigBlockLib.h>
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c
index 5c80fca88e..7a674fb641 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrintPolicy.c
@@ -1,12 +1,13 @@
 /** @file
   This file provides service for PEI phase policy printing
 
-Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "PeiSaPolicyLibrary.h"
 #include <Library/GpioNativeLib.h>
+#include <Library/ConfigBlockLib.h>
 
 /**
   This function prints the PEI phase PreMem policy.
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
index 045f82a31d..3cae466aba 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
@@ -1,11 +1,12 @@
 /** @file
   DXE driver for Initializing SystemAgent Graphics ACPI table initialization.
 
-Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 #include "GraphicsInit.h"
+#include <Library/ConfigBlockLib.h>
 
 extern SYSTEM_AGENT_GLOBAL_NVS_AREA_PROTOCOL  mSaGlobalNvsAreaProtocol;
 
diff --git a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
index 3c4c79affb..0bbd1c4b34 100644
--- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
+++ b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
@@ -1,7 +1,7 @@
 ## @file
 # Component description file for SystemAgent Initialization driver
 #
-# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
 #
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
@@ -50,7 +50,7 @@ MdePkg/MdePkg.dec
 UefiCpuPkg/UefiCpuPkg.dec
 KabylakeSiliconPkg/SiPkg.dec
 KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
 gSiPkgTokenSpaceGuid.PcdAcpiDefaultOemId
-- 
2.16.2.windows.1


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

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

Reviewed-by: Ray Ni <ray.ni@intel.com>
And pushed.

> -----Original Message-----
> From: Tsao, Ethan <ethan.tsao@intel.com>
> Sent: Monday, January 13, 2020 1:47 PM
> To: devel@edk2.groups.io
> Cc: Ni, Ray <ray.ni@intel.com>; Chaganty, Rangasai V
> <rangasai.v.chaganty@intel.com>
> Subject: [Patch V8] IntelSiliconPkg/Include/Library:Add ConfigBlockLib.h
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2318
> 
> 1. Add ConfigBlockLib.h and ConfigBlock.h to InstelSiliconPkg and remove all
> other ConfigBlockLib.h.
> 2. Change reference path of ConfigBlockLib to IntelSiliconPkg
> 
> Signed-off-by: Ethan Tsao <ethan.tsao@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
> ---
>  Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
> |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLi
> b/DxeTbtPolicyLibrary.h                                    |  3 +--
> 
> Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> NotifyLib/PeiPreMemSiliconPolicyNotifyLib.c                |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicy
> NotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf              |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/Pei
> SiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c     |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/Pei
> SiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf   |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/Pei
> SiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h               |  3 +--
> 
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/Pei
> SiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf   |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/Pei
> BoardInitPostMemLib.inf                                    |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/Pei
> BoardInitPreMemLib.inf                                     |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/Pei
> MultiBoardInitPostMemLib.inf                               |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/Pei
> MultiBoardInitPreMemLib.inf                                |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilico
> nPolicyUpdateLib/DxeSaPolicyUpdate.c                       |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilico
> nPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf             |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h             |  3 +--
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf |  2 +-
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPostMemLib.inf                                  |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPreMemLib.inf                                   |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPostMemLib.inf                             |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPreMemLib.inf                              |  3 ++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSili
> conPolicyUpdateLib/DxeSaPolicyUpdate.c                     |  5 +++--
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSili
> conPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf           |  4 +++-
> 
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSilic
> onPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf           |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.
> inf                                                         |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPoli
> cyLib/DxeTbtPolicyLib.inf                                   |  4 +++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPoli
> cyLib/DxeTbtPolicyLibrary.h                                 |  3 +--
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolic
> yInitLib/PeiFspMePolicyInitLib.c                             |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolic
> yInitLib/PeiFspPchPolicyInitLib.c                            |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolic
> yInitLib/PeiFspPolicyInitLib.h                               |  3 +--
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolic
> yInitLib/PeiFspPolicyInitLib.inf                             |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolic
> yInitLib/PeiFspSaPolicyInitLib.c                             |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolic
> yInitLib/PeiFspSiPolicyInitLib.c                             |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPo
> licyUpdateLibFsp/PeiPchPolicyUpdate.h                       |  3 +--
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPo
> licyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf           |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/Pei
> HdaVerbTableLib.inf                                          |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLi
> b/DxeMePolicyUpdate.h                                      |  3 +--
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLi
> b/DxePchPolicyUpdate.c                                     |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLi
> b/DxePolicyUpdateLib.inf                                   |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLi
> b/DxeSaPolicyUpdate.c                                      |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/Pe
> iPolicyInitLib.inf                                       |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/Pe
> iSaPolicyInit.c                                          |  4 ++--
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLi
> b/PeiPchPolicyUpdate.c                                     |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLi
> b/PeiPchPolicyUpdate.h                                     |  3 +--
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLi
> b/PeiPchPolicyUpdatePreMem.c                               |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLi
> b/PeiPolicyUpdateLib.inf                                   |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLi
> b/PeiSaPolicyUpdate.c                                      |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLi
> b/PeiSaPolicyUpdatePreMem.c                                |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLi
> b/PeiSiPolicyUpdate.c                                      |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLi
> b/PeiSiPolicyUpdate.h                                      |  3 +--
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Board
> InitLib/PeiBoardInitPostMemLib.inf                            |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Board
> InitLib/PeiBoardInitPreMemLib.inf                             |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Board
> InitLib/PeiMultiBoardInitPostMemLib.inf                       |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Board
> InitLib/PeiMultiBoardInitPreMemLib.inf                        |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Board
> InitLib/PeiWhiskeylakeURvpInitPostMemLib.c                    |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxeP
> olicyBoardConfigLib/DxePolicyBoardConfig.h                     |  3 +--
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxeP
> olicyBoardConfigLib/DxePolicyBoardConfigLib.inf                |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxeP
> olicyBoardConfigLib/DxeSaPolicyBoardConfig.c                   |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPla
> tformHookLib/PeiPlatformHooklib.inf                          |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPol
> icyBoardConfigLib/PeiCpuPolicyBoardConfig.c                  |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPol
> icyBoardConfigLib/PeiMePolicyBoardConfig.c                   |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPol
> icyBoardConfigLib/PeiMePolicyBoardConfigPreMem.c             |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPol
> icyBoardConfigLib/PeiPchPolicyBoardConfig.c                  |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPol
> icyBoardConfigLib/PeiPchPolicyBoardConfigPreMem.c            |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPol
> icyBoardConfigLib/PeiPolicyBoardConfig.h                     |  3 +--
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPol
> icyBoardConfigLib/PeiPolicyBoardConfigLib.inf                |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPol
> icyBoardConfigLib/PeiSaPolicyBoardConfig.c                   |  3 ++-
> 
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPol
> icyBoardConfigLib/PeiSaPolicyBoardConfigPreMem.c             |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.inf                                                |  4 +++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> LibPreMem.c                                            |  3 +--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> LibPreMem.inf                                          |  4 +++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfig
> BlockLib.inf                                          |  4 ++--
>  Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> |  3 ++-
>  Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> |  4 ++--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c                                                  |  3 ++-
>  Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> |  3 +--
>  Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> |  3 ++-
>  Silicon/Intel/CoffeelakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> |  3 +--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.c                                                     |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.inf                                                   |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> brary.h                                                 |  3 +--
>  Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Protocol/PchPolicy.h
> |  3 +--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/DxePchPolicyLib/DxePchPolic
> yLib.inf                                                |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemP
> rintPolicy.c                                             |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolic
> y.c                                                   |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLi
> b.c                                                  |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLi
> bCnl.inf                                             |  4 ++--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLi
> brary.h                                              |  3 +--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMe
> mPolicyLib.c                                            |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLi
> b/PeiDxeSmmPchDmiLib.inf                                  |  4 ++--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLi
> b/PeiDxeSmmPchDmiWithS3Lib.inf                            |  4 ++--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchInitCo
> mmonLib/PeiDxeSmmPchInitCommonLib.inf                    |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExp
> ressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf      |  4 ++--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivat
> eLib/PeiDxeSmmPmcPrivateLibCnl.inf                       |  4 ++--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivat
> eLib/PeiDxeSmmPmcPrivateLibWithS3.inf                    |  4 ++--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivat
> eLib/PeiPmcPrivateLibCnl.inf                             |  3 ++-
>  Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
> |  3 ++-
>  Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
> |  3 ++-
>  Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeCnl.inf
> |  4 ++--
>  Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFspCnl.inf
> |  4 ++--
>  Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> |  3 +--
>  Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> |  4 ++--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tcher.inf                                                  |  4 ++--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicy
> Lib.h                                                   |  3 +--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
> |  3 +--
>  Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
> |  3 +--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.c                                            |  4 ++--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.inf                                          |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLibrary.h                                        |  3 +--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mrc
> OemPlatform.c                                            |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLib.inf                                          |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLibSample.c                                      |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSa
> PolicyLibrary.h                                        |  3 +--
> 
> Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPri
> ntPolicy.c                                             |  3 ++-
>  Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionInit
> .c                                                       |  3 ++-
> 
> Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionInit
> .h                                                       |  3 +--
>  Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/PciExpressInit.c
> |  3 ++-
>  Silicon/Intel/{CoffeelakeSiliconPkg => IntelSiliconPkg}/Include/ConfigBlock.h
> |  2 +-
>  Silicon/Intel/{CoffeelakeSiliconPkg =>
> IntelSiliconPkg}/Include/Library/ConfigBlockLib.h                                          |  2 +-
> 
> Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLib.i
> nf                                                   |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLi
> b.inf                                                  |  4 +++-
> 
> Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/PeiCp
> uPolicyLibPreMem.inf                                      |  4 +++-
>  Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
> | 53 -----------------------------------------------------
>  Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
> | 64 ----------------------------------------------------------------
> 
> Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBl
> ockLib.inf                                            |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconPoli
> cyInitLib.inf                                      |  3 ++-
>  Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> |  3 ++-
>  Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem
> .c                                                    |  4 ++--
>  Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> |  3 +--
>  Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> |  3 ++-
>  Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconInitLib/PeiSiliconInitLib.inf
> |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPostMemSi
> liconPolicyInitLib.inf                               |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPreMemSili
> conPolicyInitLib.inf                                |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspMe
> PolicyInitLib.c                                       |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPch
> PolicyInitLib.c                                      |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPolic
> yInitLib.h                                         |  3 +--
> 
> Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconP
> olicyInitLibFsp.inf                                |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSiliconP
> olicyInitLibFspAml.inf                             |  3 ++-
>  Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> |  3 +--
> 
> Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.
> c                                                       |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.i
> nf                                                     |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibr
> ary.h                                                   |  3 +--
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPri
> ntPolicy.c                                               |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c
> |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePolic
> yLib.c                                                 |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePre
> MemPolicyLib.c                                           |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.
> inf                                                  |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib
> rary.h                                                |  3 +--
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLib/
> BasePchSpiCommonLib.inf                                   |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePchH
> daLib.inf                                                 |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCommo
> nLib/PeiDxeI2cMasterCommonLib.inf                         |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivateL
> ib/PeiDxeSmmGpioPrivateLib.inf                           |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCom
> monLib/PeiDxeSmmPchInitCommonLib.inf                       |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpre
> ssHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf         |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPrivat
> eLib/PeiDxeSmmPchPsfPrivateLib.inf                       |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbusCo
> mmonLib/PeiDxeSmmPchSmbusCommonLib.inf                     |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivateLib
> /PeiDxeSmmRstPrivateLib.inf                             |  3 ++-
>  Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
> |  3 +--
>  Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
> |  4 ++--
>  Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
> |  4 ++--
>  Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> |  3 +--
>  Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispatc
> her.inf                                                    |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicyLib
> .h                                                     |  3 +--
>  Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
> |  3 +--
>  Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
> |  3 +--
> 
> Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLib.c                                              |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLib.inf                                            |  4 ++--
> 
> Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/DxeSa
> PolicyLibrary.h                                          |  3 +--
> 
> Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/MrcOe
> mPlatform.c                                              |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLib.inf                                            |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLibSample.c                                        |  3 ++-
> 
> Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiSaP
> olicyLibrary.h                                          |  3 +--
> 
> Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPrint
> Policy.c                                               |  3 ++-
>  Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> |  3 ++-
>  Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
> |  4 ++--
>  177 files changed, 318 insertions(+), 362 deletions(-)
> 
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.in
> f
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.i
> nf
> index 92e1425a3a..3e00545f56 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.in
> f
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.i
> nf
> @@ -2,7 +2,7 @@
>  # This module will perform specific PCI-Express devices
>  # resource configuration.
>  #
> -# Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2018 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -40,6 +40,7 @@
>    MinPlatformPkg/MinPlatformPkg.dec
>    KabylakeOpenBoardPkg/OpenBoardPkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PciHotPlug.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolic
> yLib/DxeTbtPolicyLibrary.h
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolic
> yLib/DxeTbtPolicyLibrary.h
> index 5e79dc2862..2974c41f1a 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolic
> yLib/DxeTbtPolicyLibrary.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolic
> yLib/DxeTbtPolicyLibrary.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for the DxeTBTPolicy library.
> 
> -Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2018 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -16,7 +16,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/MemoryAllocationLib.h>
>  #include <ConfigBlock.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Guid/EventGroup.h>
> 
>  #endif // _DXE_TBT_POLICY_LIBRARY_H_
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
> index 0fedd81cd0..70a6b7e5d2 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
> @@ -2,7 +2,7 @@
>    This library implements constructor function to register notify call back
>    when policy PPI installed.
> 
> -Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <Library/MemoryAllocationLib.h>
>  #include <Library/PeiServicesLib.h>
>  #include <Library/SiPolicyLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Callback function to update policy when policy PPI installed.
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> index d2929118e5..0fc857c412 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> @@ -3,7 +3,7 @@
>  # This library implements constructor function to register notify call back
>  # when policy PPI installed.
>  #
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -25,6 +25,7 @@
>    MdePkg/MdePkg.dec
>    KabylakeOpenBoardPkg/OpenBoardPkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiPreMemSiliconPolicyNotifyLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
> index 0fedd81cd0..70a6b7e5d2 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
> @@ -2,7 +2,7 @@
>    This library implements constructor function to register notify call back
>    when policy PPI installed.
> 
> -Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <Library/MemoryAllocationLib.h>
>  #include <Library/PeiServicesLib.h>
>  #include <Library/SiPolicyLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Callback function to update policy when policy PPI installed.
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> index d2929118e5..0fc857c412 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> @@ -3,7 +3,7 @@
>  # This library implements constructor function to register notify call back
>  # when policy PPI installed.
>  #
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -25,6 +25,7 @@
>    MdePkg/MdePkg.dec
>    KabylakeOpenBoardPkg/OpenBoardPkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiPreMemSiliconPolicyNotifyLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> index 9f6b236e42..4299e96d32 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> @@ -1,6 +1,6 @@
>  /** @file
> 
> -Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -19,7 +19,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <Library/PciLib.h>
>  #include <Ppi/SiPolicy.h>
>  #include <Library/MmPciLib.h>
> -#include <Library/ConfigBlockLib.h>
> 
>  #include <FspEas.h>
>  #include <FspmUpd.h>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> index eb7fb82361..463455c90b 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  FSP wrapper silicon policy update library.
>  #
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -59,6 +59,7 @@
>    KabylakeFspBinPkg/KabylakeFspBinPkg.dec
>    KabylakeOpenBoardPkg/OpenBoardPkg.dec
>    MinPlatformPkg/MinPlatformPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses.IA32]
>    FspWrapperApiLib
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPostMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPostMemLib.inf
> index 0e7249bb13..c96bf76179 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPostMemLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component information file for GalagoPro3InitLib in PEI post memory
> phase.
>  #
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -30,6 +30,7 @@
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiGalagoPro3InitPostMemLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPreMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPreMemLib.inf
> index cad057b416..e4b783684f 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPreMemLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component information file for PEI GalagoPro3 Board Init Pre-Mem Library
>  #
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -29,6 +29,7 @@
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiGalagoPro3Detect.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPostMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPostMemLib.inf
> index 2ea8b2fdb3..04673ee6fc 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPostMemLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component information file for GalagoPro3InitLib in PEI post memory
> phase.
>  #
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -32,6 +32,7 @@
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiGalagoPro3InitPostMemLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPreMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPreMemLib.inf
> index ccd385b354..d866f59338 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPreMemLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component information file for PEI GalagoPro3 Board Init Pre-Mem Library
>  #
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -31,6 +31,7 @@
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiGalagoPro3InitPreMemLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilic
> onPolicyUpdateLib/DxeSaPolicyUpdate.c
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilic
> onPolicyUpdateLib/DxeSaPolicyUpdate.c
> index d140237576..be1ecf1205 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilic
> onPolicyUpdateLib/DxeSaPolicyUpdate.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilic
> onPolicyUpdateLib/DxeSaPolicyUpdate.c
> @@ -1,12 +1,13 @@
>  /** @file
>    This file is the library for SA DXE Policy initialization.
> 
> -Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
>  #include "DxeSaPolicyInit.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  #define SA_VTD_RMRR_USB_LENGTH  0x20000
> 
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilic
> onPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilic
> onPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> index d53641ceb7..b5491bcd99 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilic
> onPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilic
> onPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component information file for DXE silicon policy update library
>  #
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -25,6 +25,7 @@
>    KabylakeSiliconPkg/SiPkg.dec
>    MinPlatformPkg/MinPlatformPkg.dec
>    KabylakeOpenBoardPkg/OpenBoardPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    DxeSiliconPolicyUpdateLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Librar
> y/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Librar
> y/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> index e1df30951f..30d2f99e1d 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Librar
> y/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Librar
> y/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> @@ -1,6 +1,6 @@
>  /** @file
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -19,7 +19,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <Library/PciLib.h>
>  #include <Ppi/SiPolicy.h>
>  #include <Library/MmPciLib.h>
> -#include <Library/ConfigBlockLib.h>
> 
>  #include <FspEas.h>
>  #include <FspmUpd.h>
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Librar
> y/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Librar
> y/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> index 5391bbfde0..f8bec0c852 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Librar
> y/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Librar
> y/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Provide FSP wrapper platform related function.
>  #
> -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPostMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLi
> b/PeiBoardInitPostMemLib.inf
> index 165ed97c7b..bdf481b980 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLi
> b/PeiBoardInitPostMemLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component information file for KabylakeRvp3InitLib in PEI post memory
> phase.
>  #
> -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -30,6 +30,7 @@
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiKabylakeRvp3InitPostMemLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPreMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLi
> b/PeiBoardInitPreMemLib.inf
> index dd7f3c4fbb..d0cdba666f 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLi
> b/PeiBoardInitPreMemLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component information file for PEI KabylakeRvp3 Board Init Pre-Mem
> Library
>  #
> -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -30,6 +30,7 @@
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiKabylakeRvp3Detect.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPostMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLi
> b/PeiMultiBoardInitPostMemLib.inf
> index 43336d237f..f955dd4ea9 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLi
> b/PeiMultiBoardInitPostMemLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component information file for KabylakeRvp3InitLib in PEI post memory
> phase.
>  #
> -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -32,6 +32,7 @@
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiKabylakeRvp3InitPostMemLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPreMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLi
> b/PeiMultiBoardInitPreMemLib.inf
> index eee617e138..a51712ac34 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLi
> b/PeiMultiBoardInitPreMemLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component information file for PEI KabylakeRvp3 Board Init Pre-Mem
> Library
>  #
> -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -32,6 +32,7 @@
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiKabylakeRvp3InitPreMemLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeS
> iliconPolicyUpdateLib/DxeSaPolicyUpdate.c
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeS
> iliconPolicyUpdateLib/DxeSaPolicyUpdate.c
> index 733cc9d4fc..fcd248fdf5 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeS
> iliconPolicyUpdateLib/DxeSaPolicyUpdate.c
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeS
> iliconPolicyUpdateLib/DxeSaPolicyUpdate.c
> @@ -1,12 +1,13 @@
>  /** @file
>    This file is the library for SA DXE Policy initialization.
> -
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
>  #include "DxeSaPolicyInit.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  #define SA_VTD_RMRR_USB_LENGTH  0x20000
> 
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeS
> iliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeS
> iliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> index 4b4f4c4288..2abf1aef80 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeS
> iliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeS
> iliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component information file for Silicon Update Library
>  #
> -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -19,12 +19,14 @@
>    BaseLib
>    PcdLib
>    DebugLib
> +  ConfigBlockLib
> 
>  [Packages]
>    MdePkg/MdePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
>    MinPlatformPkg/MinPlatformPkg.dec
>    KabylakeOpenBoardPkg/OpenBoardPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    DxeSiliconPolicyUpdateLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSil
> iconPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSi
> liconPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf
> index a9d01c46bb..97ec70f611 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSil
> iconPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSi
> liconPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf
> @@ -1,7 +1,7 @@
>  ### @file
>  # Component information file for silicon policy update library
>  #
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -36,6 +36,7 @@
>    UefiCpuPkg/UefiCpuPkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
>    KabylakeOpenBoardPkg/OpenBoardPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiSiliconPolicyUpdateLib.c
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlu
> g.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/PciHotPlug/PciHotPl
> ug.inf
> index dd4e41a409..1711f73064 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlu
> g.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/PciHotPlug/PciHotPl
> ug.inf
> @@ -3,7 +3,7 @@
>  # resource configuration.
>  #
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -42,6 +42,7 @@
>    MinPlatformPkg/MinPlatformPkg.dec
>    WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
>    CoffeelakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PciHotPlug.c
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtP
> olicyLib/DxeTbtPolicyLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtP
> olicyLib/DxeTbtPolicyLib.inf
> index 0d2a6cceeb..726868a217 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtP
> olicyLib/DxeTbtPolicyLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtP
> olicyLib/DxeTbtPolicyLib.inf
> @@ -2,7 +2,7 @@
>  # Component description file for Tbt functionality
>  #
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -30,6 +30,8 @@ HobLib
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
>  WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
> +IntelSiliconPkg/IntelSiliconPkg.dec
> +
>  [Sources]
>  DxeTbtPolicyLib.c
> 
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtP
> olicyLib/DxeTbtPolicyLibrary.h
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtP
> olicyLib/DxeTbtPolicyLibrary.h
> index a88385f36f..a23d9a5f40 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtP
> olicyLib/DxeTbtPolicyLibrary.h
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtP
> olicyLib/DxeTbtPolicyLibrary.h
> @@ -2,7 +2,7 @@
>    Header file for the DxeTBTPolicy library.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -17,7 +17,6 @@
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/MemoryAllocationLib.h>
>  #include <ConfigBlock.h>
> -#include <Library/ConfigBlockLib.h>
>  //#include <SetupVariable.h>
>  #include <Guid/EventGroup.h>
> 
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspMePolicyInitLib.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspMePolicyInitLib.c
> index 97d9842aff..c873a522a4 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspMePolicyInitLib.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspMePolicyInitLib.c
> @@ -2,13 +2,14 @@
>    Implementation of Fsp Me Policy Initialization.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include <PeiFspPolicyInitLib.h>
>  #include <ConfigBlock/MePeiConfig.h>
>  #include <Ppi/SiPolicy.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Performs FSP ME PEI Policy pre mem initialization.
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspPchPolicyInitLib.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspPchPolicyInitLib.c
> index e2022929cd..4b6a3e3c7d 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspPchPolicyInitLib.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspPchPolicyInitLib.c
> @@ -2,7 +2,7 @@
>    Implementation of Fsp PCH Policy Initialization.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -12,6 +12,7 @@
>  #include <Library/MemoryAllocationLib.h>
>  #include <Library/PeiServicesLib.h>
>  #include <Library/PchInfoLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Performs FSP PCH PEI Policy pre mem initialization.
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspPolicyInitLib.h
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspPolicyInitLib.h
> index 52f9fbed8b..094f4ce7ec 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspPolicyInitLib.h
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspPolicyInitLib.h
> @@ -2,7 +2,7 @@
>    Internal header file for Fsp Policy Initialization Library.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -13,7 +13,6 @@
> 
>  #include <Library/DebugLib.h>
>  #include <Library/PeiServicesLib.h>
> -#include <Library/ConfigBlockLib.h>
> 
>  #include <FspEas.h>
>  #include <FspmUpd.h>
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspPolicyInitLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspPolicyInitLib.inf
> index 8146d0fa03..799a3dda6c 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspPolicyInitLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspPolicyInitLib.inf
> @@ -2,7 +2,7 @@
>  # Library functions for Fsp Policy Initialization Library.
>  #
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -59,6 +59,7 @@
>    CoffeeLakeFspBinPkg/CoffeeLakeFspBinPkg.dec
>    WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
>    UefiCpuPkg/UefiCpuPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses]
>    BaseMemoryLib
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspSaPolicyInitLib.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspSaPolicyInitLib.c
> index 0bfc379386..36a0d251b8 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspSaPolicyInitLib.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspSaPolicyInitLib.c
> @@ -2,7 +2,7 @@
>    Implementation of Fsp SA Policy Initialization.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -22,6 +22,7 @@
>  #include <Pi/PiFirmwareFile.h>
>  #include <Pi/PiPeiCis.h>
>  #include <Core/Pei/PeiMain.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  #define MAX_SPD_PAGE_COUNT           (2)
>  #define MAX_SPD_PAGE_SIZE            (256)
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspSiPolicyInitLib.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspSiPolicyInitLib.c
> index 98658782aa..fa9bef4821 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspSiPolicyInitLib.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPol
> icyInitLib/PeiFspSiPolicyInitLib.c
> @@ -2,12 +2,13 @@
>    Implementation of Fsp SI Policy Initialization.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include <PeiFspPolicyInitLib.h>
>  #include <Ppi/SiPolicy.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Performs FSP SI PEI Policy pre mem initialization.
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSilicon
> PolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSilicon
> PolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> index 1ff16e2f32..6fea1e2c7d 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSilicon
> PolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSilicon
> PolicyUpdateLibFsp/PeiPchPolicyUpdate.h
> @@ -1,6 +1,6 @@
>  /** @file
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -18,7 +18,6 @@
>  #include <Library/PciLib.h>
>  #include <Ppi/SiPolicy.h>
>  #include <Library/MmPciLib.h>
> -#include <Library/ConfigBlockLib.h>
> 
>  #include <FspEas.h>
>  #include <FspmUpd.h>
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSilicon
> PolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSilicon
> PolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> index c6dea37402..2c90d0cb94 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSilicon
> PolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSilicon
> PolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> @@ -2,7 +2,7 @@
>  #  Provide FSP wrapper platform related function.
>  #
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -60,6 +60,7 @@
>    CoffeeLakeFspBinPkg/CoffeeLakeFspBinPkg.dec
>    WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
>    MinPlatformPkg/MinPlatformPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses.IA32]
>    FspWrapperApiLib
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/P
> eiHdaVerbTableLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/P
> eiHdaVerbTableLib.inf
> index 31b42bf4ab..e4833aee2b 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/P
> eiHdaVerbTableLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/P
> eiHdaVerbTableLib.inf
> @@ -2,7 +2,7 @@
>  #  PEI Intel HD Audio Verb Table library.
>  #
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -50,6 +50,7 @@
>    MdeModulePkg/MdeModulePkg.dec
>    CoffeelakeSiliconPkg/SiPkg.dec
>    WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses]
>    BaseLib
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxeMePolicyUpdate.h
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxeMePolicyUpdate.h
> index 8cbcace075..c717196e48 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxeMePolicyUpdate.h
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxeMePolicyUpdate.h
> @@ -1,6 +1,6 @@
>  /** @file
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -16,7 +16,6 @@
>  #include <Library/BaseMemoryLib.h>
>  #include <Protocol/MePolicy.h>
>  #include <Library/HobLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <ConfigBlock/MePeiConfig.h>
> 
>  #define PLATFORM_BOOT_TABLE_PTR_TYPE   0x1001
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxePchPolicyUpdate.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxePchPolicyUpdate.c
> index 7945986aaa..0357f33f26 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxePchPolicyUpdate.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxePchPolicyUpdate.c
> @@ -2,7 +2,7 @@
>    This file is the library for PCH DXE Policy initialization.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -13,6 +13,7 @@
>  #include <Library/UefiRuntimeServicesTableLib.h>
>  #include <Protocol/PchPolicy.h>
>  #include <ConfigBlock/HdAudioConfig.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Get data for PCH policy from setup options.
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxePolicyUpdateLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxePolicyUpdateLib.inf
> index 16653f38bd..08761a4582 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxePolicyUpdateLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxePolicyUpdateLib.inf
> @@ -2,7 +2,7 @@
>  #  Component description file for DXE DxePolicyUpdateLib Library
>  #
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -31,6 +31,7 @@
>    MdePkg/MdePkg.dec
>    WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
>    CoffeelakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses]
>    UefiBootServicesTableLib
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxeSaPolicyUpdate.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxeSaPolicyUpdate.c
> index af4c76bcd0..0cc273fd2e 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxeSaPolicyUpdate.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdat
> eLib/DxeSaPolicyUpdate.c
> @@ -2,11 +2,12 @@
>    This file is the library for SA DXE Policy initialization.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include <DxeSaPolicyUpdate.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Get data for platform policy from setup options.
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/
> PeiPolicyInitLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/
> PeiPolicyInitLib.inf
> index 293abf1904..4eb5afa0d2 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/
> PeiPolicyInitLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/
> PeiPolicyInitLib.inf
> @@ -2,7 +2,7 @@
>  # Component description file for PeiPolicyInit library.
>  #
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -39,6 +39,7 @@
>    MdePkg/MdePkg.dec
>    WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
>    CoffeelakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress  ## CONSUMES
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/
> PeiSaPolicyInit.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/
> PeiSaPolicyInit.c
> index 922bcd135f..15ecba0462 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/
> PeiSaPolicyInit.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/
> PeiSaPolicyInit.c
> @@ -2,12 +2,12 @@
>    This file is SampleCode for Intel SA PEI Policy initialization.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiSaPolicyInit.h"
> -
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    PcieCardResetWorkAround performs PCIe Card reset on root port
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPchPolicyUpdate.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPchPolicyUpdate.c
> index e7e5ff5b1a..ebce9b271a 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPchPolicyUpdate.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPchPolicyUpdate.c
> @@ -2,7 +2,7 @@
>    This file is SampleCode of the library for Intel PCH PEI Policy initialization.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -25,6 +25,7 @@
>  #include <Library/CnviLib.h>
>  #include <Register/PchRegsLpcCnl.h>
>  #include <PcieDeviceOverrideTable.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  VOID
>  UpdatePcieClockInfo (
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPchPolicyUpdate.h
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPchPolicyUpdate.h
> index 5a69852801..3d732e6828 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPchPolicyUpdate.h
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPchPolicyUpdate.h
> @@ -1,6 +1,6 @@
>  /** @file
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -18,7 +18,6 @@
>  #include <Library/IoLib.h>
>  #include <Library/PeiServicesLib.h>
>  #include <Ppi/SiPolicy.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <PlatformBoardConfig.h>
> 
>  #endif
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPchPolicyUpdatePreMem.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPchPolicyUpdatePreMem.c
> index 968df0f55c..2d48b09175 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPchPolicyUpdatePreMem.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPchPolicyUpdatePreMem.c
> @@ -2,7 +2,7 @@
>    This file is SampleCode of the library for Intel PCH PEI Policy initialization.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -16,6 +16,7 @@
>  #include <Library/PchPcieRpLib.h>
>  #include <Library/DebugLib.h>
>  #include <Library/PchPolicyLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  //
>  // Sawtooth Peak
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPolicyUpdateLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPolicyUpdateLib.inf
> index ad3146dc7b..e95c1b15c5 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPolicyUpdateLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiPolicyUpdateLib.inf
> @@ -2,7 +2,7 @@
>  # Module Information file for PEI PolicyUpdateLib Library
>  #
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -52,6 +52,7 @@
>    SecurityPkg/SecurityPkg.dec
>    IntelSiliconPkg/IntelSiliconPkg.dec
>    MinPlatformPkg/MinPlatformPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [FixedPcd]
>    gSiPkgTokenSpaceGuid.PcdTsegSize                             ## CONSUMES
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSaPolicyUpdate.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSaPolicyUpdate.c
> index c1ac7d890f..b62b27d76d 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSaPolicyUpdate.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSaPolicyUpdate.c
> @@ -2,7 +2,7 @@
>  Do Platform Stage System Agent initialization.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -21,6 +21,7 @@ Do Platform Stage System Agent initialization.
>  #include <Library/PeiSaPolicyLib.h>
>  #include <GpioPinsCnlLp.h>
>  #include <GpioPinsCnlH.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    UpdatePeiSaPolicy performs SA PEI Policy initialization
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSaPolicyUpdatePreMem.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSaPolicyUpdatePreMem.c
> index 0bdd503e2c..7c022c35f1 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSaPolicyUpdatePreMem.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSaPolicyUpdatePreMem.c
> @@ -2,7 +2,7 @@
>    Platform Stage System Agent initialization.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -22,6 +22,7 @@
>  #include <Library/MemoryAllocationLib.h>
>  #include <Library/PeiSaPolicyLib.h>
>  #include <Library/GpioLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  ///
>  /// Memory Reserved should be between 125% to 150% of the Current
> required memory
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSiPolicyUpdate.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSiPolicyUpdate.c
> index 3efbe2ccbd..4db3c215f3 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSiPolicyUpdate.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSiPolicyUpdate.c
> @@ -3,7 +3,7 @@
>    Platform Policy initialization.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -13,6 +13,7 @@
>  #include <Library/PeiServicesLib.h>
>  #include <Library/SiPolicyLib.h>
>  #include <Library/MemoryAllocationLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  STATIC SVID_SID_INIT_ENTRY mCdfSsidTablePtr[] = {
>    //
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSiPolicyUpdate.h
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSiPolicyUpdate.h
> index 38ea081166..92222d216f 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSiPolicyUpdate.h
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdate
> Lib/PeiSiPolicyUpdate.h
> @@ -2,7 +2,7 @@
>     Header file for PEI SiPolicyUpdate.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -12,7 +12,6 @@
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PeiPlatformLib.h>
>  #include <Library/DebugLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Ppi/SiPolicy.h>
> 
>  #endif
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiBoardInitPostMemLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiBoardInitPostMemLib.inf
> index affc5c56ad..9bfa8652d3 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiBoardInitPostMemLib.inf
> @@ -2,7 +2,7 @@
>  # Component information file for WhiskeylakeURvpInitLib in PEI post
> memory phase.
>  #
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -35,6 +35,7 @@
>    MdeModulePkg/MdeModulePkg.dec
>    SecurityPkg/SecurityPkg.dec
>    CoffeelakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiWhiskeylakeURvpInitPostMemLib.c
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiBoardInitPreMemLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiBoardInitPreMemLib.inf
> index 40e20285e0..d771d55c4f 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiBoardInitPreMemLib.inf
> @@ -2,7 +2,7 @@
>  # Component information file for PEI WhiskeylakeURvp Board Init Pre-Mem
> Library
>  #
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -31,6 +31,7 @@
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    CoffeelakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiWhiskeylakeURvpDetect.c
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiMultiBoardInitPostMemLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiMultiBoardInitPostMemLib.inf
> index 21dc2f70c0..436314a6a3 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiMultiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiMultiBoardInitPostMemLib.inf
> @@ -2,7 +2,7 @@
>  # Component information file for WhiskeylakeURvpInitLib in PEI post
> memory phase.
>  #
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -39,6 +39,7 @@
>    MdeModulePkg/MdeModulePkg.dec
>    CoffeelakeSiliconPkg/SiPkg.dec
>    SecurityPkg/SecurityPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiWhiskeylakeURvpInitPostMemLib.c
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiMultiBoardInitPreMemLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiMultiBoardInitPreMemLib.inf
> index 7389f1dfcd..d7b06ca2bd 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiMultiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiMultiBoardInitPreMemLib.inf
> @@ -2,7 +2,7 @@
>  # Component information file for PEI WhiskeylakeURvp Board Init Pre-Mem
> Library
>  #
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -40,6 +40,7 @@
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    CoffeelakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PeiWhiskeylakeURvpInitPreMemLib.c
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiWhiskeylakeURvpInitPostMemLib.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiWhiskeylakeURvpInitPostMemLib.c
> index 827af6bb57..f704c42f2d 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiWhiskeylakeURvpInitPostMemLib.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boa
> rdInitLib/PeiWhiskeylakeURvpInitPostMemLib.c
> @@ -1,6 +1,6 @@
>  /** @file
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -31,6 +31,7 @@
>  #include <Library/PchInfoLib.h>
>  #include <FirwmareConfigurations.h>
>  #include "WhiskeylakeURvpInit.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  EFI_STATUS
>  BoardFunctionInit (
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Dxe
> PolicyBoardConfigLib/DxePolicyBoardConfig.h
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Dxe
> PolicyBoardConfigLib/DxePolicyBoardConfig.h
> index a6d48e906d..0ab1ac88f7 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Dxe
> PolicyBoardConfigLib/DxePolicyBoardConfig.h
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Dxe
> PolicyBoardConfigLib/DxePolicyBoardConfig.h
> @@ -2,7 +2,7 @@
>   Header file for DxePolicyBoardConfig library instance.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -12,7 +12,6 @@
>  #include <PiDxe.h>
>  #include <Library/DebugLib.h>
>  #include <Library/HobLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Library/DxePolicyBoardConfigLib.h>
> 
> 
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Dxe
> PolicyBoardConfigLib/DxePolicyBoardConfigLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Dxe
> PolicyBoardConfigLib/DxePolicyBoardConfigLib.inf
> index 2c9af5b9a3..31708a1727 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Dxe
> PolicyBoardConfigLib/DxePolicyBoardConfigLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Dxe
> PolicyBoardConfigLib/DxePolicyBoardConfigLib.inf
> @@ -2,7 +2,7 @@
>  # Module Information file for DxePolicyBoardConfigLib Library
>  #
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -28,6 +28,7 @@
>    MdePkg/MdePkg.dec
>    CoffeelakeSiliconPkg/SiPkg.dec
>    WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses]
>    UefiBootServicesTableLib
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Dxe
> PolicyBoardConfigLib/DxeSaPolicyBoardConfig.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Dxe
> PolicyBoardConfigLib/DxeSaPolicyBoardConfig.c
> index d2c26eb163..a6dcdf827e 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Dxe
> PolicyBoardConfigLib/DxeSaPolicyBoardConfig.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Dxe
> PolicyBoardConfigLib/DxeSaPolicyBoardConfig.c
> @@ -2,11 +2,12 @@
>   Intel DXE SA Policy update by board configuration
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "DxePolicyBoardConfig.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    This function performs DXE SA Policy update by board configuration.
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PlatformHookLib/PeiPlatformHooklib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PlatformHookLib/PeiPlatformHooklib.inf
> index d66290e79b..fbcc84930e 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PlatformHookLib/PeiPlatformHooklib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PlatformHookLib/PeiPlatformHooklib.inf
> @@ -1,6 +1,6 @@
>  ## @file
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -38,6 +38,7 @@
>    MdePkg/MdePkg.dec
>    WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
>    CoffeelakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress                        ##
> CONSUMES
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiCpuPolicyBoardConfig.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiCpuPolicyBoardConfig.c
> index e437814b10..7134cdec21 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiCpuPolicyBoardConfig.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiCpuPolicyBoardConfig.c
> @@ -2,11 +2,12 @@
>   Intel PEI CPU Policy update by board configuration
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiPolicyBoardConfig.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    This function performs PEI CPU Policy update by board configuration.
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiMePolicyBoardConfig.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiMePolicyBoardConfig.c
> index 843fe4accd..1b903d5c94 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiMePolicyBoardConfig.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiMePolicyBoardConfig.c
> @@ -2,11 +2,12 @@
>   Intel PEI ME Policy update by board configuration
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiPolicyBoardConfig.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    This function performs PEI ME Policy update by board configuration.
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiMePolicyBoardConfigPreMem.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiMePolicyBoardConfigPreMem.c
> index 79c93455a6..2e51cc631d 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiMePolicyBoardConfigPreMem.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiMePolicyBoardConfigPreMem.c
> @@ -2,11 +2,12 @@
>   Intel PEI ME Pre-Memory Policy update by board configuration
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiPolicyBoardConfig.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    This function performs PEI ME Pre-Memory Policy update by board
> configuration.
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPchPolicyBoardConfig.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPchPolicyBoardConfig.c
> index 5dbc412879..8d2bfe41db 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPchPolicyBoardConfig.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPchPolicyBoardConfig.c
> @@ -2,11 +2,12 @@
>   Intel PEI PCH Policy update by board configuration
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiPolicyBoardConfig.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    This function performs PEI PCH Policy update by board configuration.
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPchPolicyBoardConfigPreMem.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPchPolicyBoardConfigPreMem.c
> index 1080015029..00cf73dfd9 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPchPolicyBoardConfigPreMem.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPchPolicyBoardConfigPreMem.c
> @@ -2,11 +2,12 @@
>   Intel PEI PCH Pre-Memory Policy update by board configuration
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiPolicyBoardConfig.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    This function performs PEI PCH Pre-Memory Policy update by board
> configuration.
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPolicyBoardConfig.h
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPolicyBoardConfig.h
> index 03c27f2a41..63e961d980 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPolicyBoardConfig.h
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPolicyBoardConfig.h
> @@ -2,7 +2,7 @@
>   Header file for PeiPolicyBoardConfig library instance.
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
> @@ -14,7 +14,6 @@
>  #include <Library/PeiServicesLib.h>
>  #include <Library/DebugLib.h>
>  #include <Library/HobLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Library/PeiPolicyBoardConfigLib.h>
>  #include <Library/IoLib.h>
>  #include <Library/BaseMemoryLib.h>
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPolicyBoardConfigLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPolicyBoardConfigLib.inf
> index 65e66ccb62..15ef223050 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPolicyBoardConfigLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiPolicyBoardConfigLib.inf
> @@ -2,7 +2,7 @@
>  # Module Information file for PeiPolicyBoardConfigLib Library
>  #
>  #
> -#  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -34,6 +34,7 @@
>    WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
>    SecurityPkg/SecurityPkg.dec
>    MinPlatformPkg/MinPlatformPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses]
>    PcdLib
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiSaPolicyBoardConfig.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiSaPolicyBoardConfig.c
> index d1d964aea7..8487761d18 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiSaPolicyBoardConfig.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiSaPolicyBoardConfig.c
> @@ -2,11 +2,12 @@
>   Intel PEI SA Policy update by board configuration
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiPolicyBoardConfig.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    This function performs PEI SA Policy update by board configuration.
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiSaPolicyBoardConfigPreMem.c
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiSaPolicyBoardConfigPreMem.c
> index 34fca7fac3..af2b884cfd 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiSaPolicyBoardConfigPreMem.c
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Pei
> PolicyBoardConfigLib/PeiSaPolicyBoardConfigPreMem.c
> @@ -2,11 +2,12 @@
>   Intel PEI SA Pre-Memory Policy update by board configuration
> 
> 
> -  Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiPolicyBoardConfig.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    This function performs PEI SA Pre-Memory Policy update by board
> configuration.
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPoli
> cyLib.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPoli
> cyLib.inf
> index c986e35360..f793432bf0 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPoli
> cyLib.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPoli
> cyLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiCpuPolicyLib library.
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -28,11 +28,13 @@ SaPlatformLib
>  SiConfigBlockLib
>  PostCodeLib
>  PcdLib
> +ConfigBlockLib
> 
>  [Packages]
>  MdePkg/MdePkg.dec
>  UefiCpuPkg/UefiCpuPkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  PeiCpuPolicyLib.c
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPoli
> cyLibPreMem.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPoli
> cyLibPreMem.c
> index 7d45e10236..35a13684db 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPoli
> cyLibPreMem.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPoli
> cyLibPreMem.c
> @@ -1,14 +1,13 @@
>  /** @file
>    This file is PeiCpuPolicyLibPreMem library.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiCpuPolicyLibrary.h"
>  #include <Library/PciSegmentLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Library/PostCodeLib.h>
>  #include <Library/SaPlatformLib.h>
> 
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPoli
> cyLibPreMem.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPoli
> cyLibPreMem.inf
> index 52dc989f74..25f1e84c33 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPoli
> cyLibPreMem.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPoli
> cyLibPreMem.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiCpuPolicyLibPreMem library.
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -24,11 +24,13 @@ MemoryAllocationLib
>  CpuPlatformLib
>  SiConfigBlockLib
>  PostCodeLib
> +ConfigBlockLib
> 
>  [Packages]
>  MdePkg/MdePkg.dec
>  UefiCpuPkg/UefiCpuPkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  PeiCpuPolicyLib.c
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiCon
> figBlockLib.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiCon
> figBlockLib.inf
> index b04dc3cfa4..6037fe2a07 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiCon
> figBlockLib.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiCon
> figBlockLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the BaseSiConfigBlockLib library.
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -25,7 +25,7 @@ ConfigBlockLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  BaseSiConfigBlockLib.c
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> index de8d9745d3..24da4bdc77 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> @@ -2,13 +2,14 @@
>    This file is PeiSiPolicyLib library creates default settings of RC
>    Policy and installs RC Policy PPI.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiSiPolicyLibrary.h"
>  #include <Library/PcdLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Get Si config block table total size.
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> index c5945c3129..002d998523 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiSiPolicyLib library.
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -32,7 +32,7 @@ PcdLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  PeiSiPolicyLib.c
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPre
> Mem.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPre
> Mem.c
> index 499f895e8e..fda56e7e76 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPre
> Mem.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPre
> Mem.c
> @@ -2,13 +2,14 @@
>    This file is PeiSiPolicyLib library creates default settings of RC
>    Policy and installs RC Policy PPI.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiSiPolicyLibrary.h"
>  #include <Base.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    SiCreatePreMemConfigBlocks creates the config blocksg of Silicon PREMEM
> Policy.
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.
> h
> b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.
> h
> index cb6b14fdd1..9778ae4dd4 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.
> h
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.
> h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for the PeiSiPolicyLib library.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -14,7 +14,6 @@
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PeiServicesLib.h>
>  #include <Library/MemoryAllocationLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Ppi/SiPolicy.h>
>  #include <Library/SiPolicyLib.h>
>  #include <Library/PchPolicyLib.h>
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> index cf7e1b2308..0b5e48d337 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> @@ -1,12 +1,13 @@
>  /** @file
>    This file is PeiSiPolicyLib library for printing Policy settings.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiSiPolicyLibrary.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Print whole SI_POLICY_PPI and serial out.
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> index 5db4714346..4ada50d0ea 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Prototype of the MePolicyLibPei library.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -10,7 +10,6 @@
>  #define _PEI_ME_POLICY_LIB_H_
> 
>  #include <Ppi/SiPolicy.h>
> -#include <Library/ConfigBlockLib.h>
> 
>  /**
>    This function prints the PEI phase PreMem policy.
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic
> yLib.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic
> yLib.c
> index 6f3d70b841..a39e0d95cf 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic
> yLib.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic
> yLib.c
> @@ -1,12 +1,13 @@
>  /** @file
>    This file is PeiMePolicy library.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiMePolicyLibrary.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Load default settings for ME config block in pre-mem phase.
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic
> yLib.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic
> yLib.inf
> index 85a227f950..440de11c5c 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic
> yLib.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic
> yLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiMePolicyLib libbrary.
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -28,6 +28,7 @@ ConfigBlockLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  PeiMePolicyLib.c
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic
> yLibrary.h
> b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic
> yLibrary.h
> index 3ac6a639e9..18db7e3c5d 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic
> yLibrary.h
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolic
> yLibrary.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for the PeiMePolicy library.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -18,7 +18,6 @@
>  #include <Library/PeiMePolicyLib.h>
>  #include <ConfigBlock.h>
>  #include <ConfigBlock/MePeiConfig.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Library/SiConfigBlockLib.h>
>  #include <MkhiMsgs.h>
> 
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Protocol/PchPolicy.h
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Protocol/PchPolicy.h
> index ff35b43b61..0f7b02808b 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Protocol/PchPolicy.h
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Protocol/PchPolicy.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Interface definition details between Pch and platform drivers during DXE
> phase.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -10,7 +10,6 @@
>  #define _PCH_POLICY_H_
> 
>  #include <ConfigBlock.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Private/PchConfigHob.h>
>  #include <Library/HobLib.h>
> 
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/DxePchPolicyLib/DxePchPol
> icyLib.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/DxePchPolicyLib/DxePchPol
> icyLib.inf
> index 8845ab796c..a7c6efb6f1 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/DxePchPolicyLib/DxePchPol
> icyLib.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/DxePchPolicyLib/DxePchPol
> icyLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiPchPolicy library.
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -28,6 +28,7 @@ PchInfoLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  DxePchPolicyLib.c
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMe
> mPrintPolicy.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMe
> mPrintPolicy.c
> index bd1e2711da..a9077cb77c 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMe
> mPrintPolicy.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMe
> mPrintPolicy.c
> @@ -1,12 +1,13 @@
>  /** @file
>    Print whole PCH_PREMEM_POLICY_PPI
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiPchPolicyLibrary.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Print PCH_GENERAL_PREMEM_CONFIG and serial out.
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPol
> icy.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPol
> icy.c
> index d9005b50ef..a5a830f3da 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPol
> icy.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPol
> icy.c
> @@ -1,13 +1,14 @@
>  /** @file
>    Print whole PCH_POLICY_PPI
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiPchPolicyLibrary.h"
>  #include <Private/PchHsio.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Print USB_CONFIG and serial out.
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolic
> yLib.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolic
> yLib.c
> index ece0be8158..2f7a791444 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolic
> yLib.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolic
> yLib.c
> @@ -1,7 +1,7 @@
>  /** @file
>    This file is PeiPchPolicy library.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -10,6 +10,7 @@
>  #include <Library/PchPcieRpLib.h>
>  #include <Library/CpuPlatformLib.h>
>  #include <Register/PchRegsLpcCnl.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    mPxRcConfig[] table contains data for 8259 routing (how PIRQx is mapped
> to IRQy).
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolic
> yLibCnl.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolic
> yLibCnl.inf
> index 49e63cfc51..ce90cdd047 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolic
> yLibCnl.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolic
> yLibCnl.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiPchPolicy libbrary.
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -33,7 +33,7 @@ CpuPlatformLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>  gSiPkgTokenSpaceGuid.PcdSmbusBaseAddress
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolic
> yLibrary.h
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolic
> yLibrary.h
> index abd7e63365..d1f8337e5a 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolic
> yLibrary.h
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolic
> yLibrary.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for the PeiPchPolicy library.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -14,7 +14,6 @@
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PeiServicesLib.h>
>  #include <Library/MemoryAllocationLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Library/SiConfigBlockLib.h>
>  #include <Library/PchInfoLib.h>
>  #include <Library/SataLib.h>
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPre
> MemPolicyLib.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPre
> MemPolicyLib.c
> index dfab5d29c2..4fe4da7155 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPre
> MemPolicyLib.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPre
> MemPolicyLib.c
> @@ -1,13 +1,14 @@
>  /** @file
>    This file is PeiPchPreMemPolicy library.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiPchPolicyLibrary.h"
>  #include <Library/CpuPlatformLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Load Config block default
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmi
> Lib/PeiDxeSmmPchDmiLib.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmi
> Lib/PeiDxeSmmPchDmiLib.inf
> index b36fc15901..1655e10e55 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmi
> Lib/PeiDxeSmmPchDmiLib.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmi
> Lib/PeiDxeSmmPchDmiLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Component description file for the PeiDxeSmmPchDmiLib
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -31,7 +31,7 @@ LIBRARY_CLASS                  = PchDmiLib
>  [Packages]
>    MdePkg/MdePkg.dec
>    CoffeelakeSiliconPkg/SiPkg.dec
> -
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PchDmiLib.c
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmi
> Lib/PeiDxeSmmPchDmiWithS3Lib.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmi
> Lib/PeiDxeSmmPchDmiWithS3Lib.inf
> index 1eda7cdba8..8c58313999 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmi
> Lib/PeiDxeSmmPchDmiWithS3Lib.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmi
> Lib/PeiDxeSmmPchDmiWithS3Lib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Component description file for the PeiDxeSmmPchDmiWithS3Lib
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -33,7 +33,7 @@ LIBRARY_CLASS                  = PchDmiWithS3Lib
>  [Packages]
>    MdePkg/MdePkg.dec
>    CoffeelakeSiliconPkg/SiPkg.dec
> -
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PchDmiWithS3Lib.c
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchInit
> CommonLib/PeiDxeSmmPchInitCommonLib.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchInit
> CommonLib/PeiDxeSmmPchInitCommonLib.inf
> index d81c428a1c..bb79ab3f39 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchInit
> CommonLib/PeiDxeSmmPchInitCommonLib.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchInit
> CommonLib/PeiDxeSmmPchInitCommonLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Component description file for the PchInitCommonLib
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -21,6 +21,7 @@
>  [Packages]
>    MdePkg/MdePkg.dec
>    CoffeelakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses]
>    IoLib
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciE
> xpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciE
> xpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> index 16b1c019b8..e613a8a2df 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciE
> xpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciE
> xpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiDxeSmmPchPciExpressHelpersLib
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -35,7 +35,7 @@ PchInitCommonLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  PchPciExpressHelpersLibrary.c
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPri
> vateLib/PeiDxeSmmPmcPrivateLibCnl.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPri
> vateLib/PeiDxeSmmPmcPrivateLibCnl.inf
> index adb154dd14..573acfc25e 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPri
> vateLib/PeiDxeSmmPmcPrivateLibCnl.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPri
> vateLib/PeiDxeSmmPmcPrivateLibCnl.inf
> @@ -4,7 +4,7 @@
>  # All function in this library is available for PEI, DXE, and SMM,
>  # But do not support UEFI RUNTIME environment call.
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -36,7 +36,7 @@ BaseMemoryLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>  gSiPkgTokenSpaceGuid.PcdAcpiBaseAddress
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPri
> vateLib/PeiDxeSmmPmcPrivateLibWithS3.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPri
> vateLib/PeiDxeSmmPmcPrivateLibWithS3.inf
> index cd1380dc43..c6aa2f6b31 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPri
> vateLib/PeiDxeSmmPmcPrivateLibWithS3.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPri
> vateLib/PeiDxeSmmPmcPrivateLibWithS3.inf
> @@ -5,7 +5,7 @@
>  # All function in this library is available for PEI, DXE, and SMM,
>  # But do not support UEFI RUNTIME environment call.
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -33,7 +33,7 @@ S3BootScriptLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  PmcPrivateLibWithS3.c
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPri
> vateLib/PeiPmcPrivateLibCnl.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPri
> vateLib/PeiPmcPrivateLibCnl.inf
> index ab3645c61d..d889e03b5a 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPri
> vateLib/PeiPmcPrivateLibCnl.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPri
> vateLib/PeiPmcPrivateLibCnl.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # PEI PCH PMC Private Lib for Cannon Lake PCH.
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -35,6 +35,7 @@ PeiItssLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  PeiPmcPrivateLib.c
> diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
> index bcbdb12dc3..12f1a7f4fe 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
> @@ -1,7 +1,7 @@
>  /** @file
>    This is the driver that initializes the Intel PCH.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -34,6 +34,7 @@
>  #include <TraceHubCommonConfig.h>
>  #include <PchReservedResources.h>
>  #include <Register/PchRegsTraceHub.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  //
>  // Module variables
> diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
> index 57f2e1dca0..b8a1be2dcc 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
> @@ -1,7 +1,7 @@
>  /** @file
>    Initializes the PCH HD Audio ACPI Tables.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -13,6 +13,7 @@
>  #include <Library/UefiBootServicesTableLib.h>
>  #include <Library/UefiLib.h>
>  #include <Protocol/AcpiTable.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  #include "PchInit.h"
>  #include <Protocol/PchPolicy.h>
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeCnl.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeCnl.inf
> index 5e0cf06cb6..858bbc47ed 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeCnl.inf
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeCnl.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for Pch Initialization driver
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -55,7 +55,7 @@ DxeSaPolicyLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFspCnl.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFspCnl.inf
> index 528cfd0296..7c92561256 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFspCnl.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFspCnl.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Component description file for Pch Initialization driver for FSP package
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -48,7 +48,7 @@ BiosLockLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> index 693c5d3f50..e9f734006f 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for PCH Init SMM Handler
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -34,7 +34,6 @@
>  #include <Library/GpioNativeLib.h>
>  #include <Library/PchEspiLib.h>
>  #include <Library/PciSegmentLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Private/Library/PchPciExpressHelpersLib.h>
>  #include <Protocol/PchPcieSmiDispatch.h>
>  #include <Protocol/PchTcoSmiDispatch.h>
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> index 308da65385..267c45872d 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> +++ b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for PchInitSmm driver
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -50,7 +50,7 @@ SataLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDis
> patcher.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDis
> patcher.inf
> index 38d5dbeebf..f51afa518c 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDis
> patcher.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDis
> patcher.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the Pch SMI Dispatch Handlers module
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -47,7 +47,7 @@ SmiHandlerProfileLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>  # Progress Code for S3 Suspend end.
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Library/PeiSaPoli
> cyLib.h
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Library/PeiSaPoli
> cyLib.h
> index c29d67a305..6c7500cd89 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Library/PeiSaPoli
> cyLib.h
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Library/PeiSaPoli
> cyLib.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Prototype of the PeiSaPolicy library.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -10,7 +10,6 @@
>  #define _PEI_SA_POLICY_LIB_H_
> 
>  #include <Ppi/SiPolicy.h>
> -#include <Library/ConfigBlockLib.h>
> 
>  /**
>    This function prints the PEI phase PreMem policy.
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy
> .h
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy
> .h
> index 7b68f3072b..93872d6806 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy
> .h
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy
> .h
> @@ -1,7 +1,7 @@
>  /** @file
>    Interface definition details between System Agent and platform drivers
> during DXE phase.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -11,7 +11,6 @@
> 
>  #include <SaAccess.h>
>  #include <ConfigBlock.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <ConfigBlock/GraphicsDxeConfig.h>
>  #include <ConfigBlock/MemoryDxeConfig.h>
>  #include <ConfigBlock/MiscDxeConfig.h>
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/SaPolicyCommon
> .h
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/SaPolicyCommon
> .h
> index 086c60bfed..20fdd2b734 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/SaPolicyCommon
> .h
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Include/SaPolicyCommon
> .h
> @@ -1,7 +1,7 @@
>  /** @file
>    Main System Agent Policy structure definition which will contain several
> config blocks during runtime.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -13,7 +13,6 @@
>  #include <Library/SmbusLib.h>
>  #include <SaAccess.h>
>  #include <ConfigBlock.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <ConfigBlock/SwitchableGraphicsConfig.h>
>  #include <ConfigBlock/MemoryConfig.h>
>  #include <ConfigBlock/GraphicsPeiPreMemConfig.h>
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D
> xeSaPolicyLib.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D
> xeSaPolicyLib.c
> index 0e8d518fe7..a9ae787215 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D
> xeSaPolicyLib.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D
> xeSaPolicyLib.c
> @@ -1,13 +1,13 @@
>  /** @file
>    This file provide services for DXE phase policy default initialization
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "DxeSaPolicyLibrary.h"
> -
> +#include <Library/ConfigBlockLib.h>
> 
>  GLOBAL_REMOVE_IF_UNREFERENCED PCIE_ASPM_OVERRIDE_LIST
> mPcieAspmDevsOverride[] = {
>    {0x8086, 0x108b, 0xff, 2, 2},           ///< Tekoa w/o iAMT
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D
> xeSaPolicyLib.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D
> xeSaPolicyLib.inf
> index 8a5092e199..f45ee35e35 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D
> xeSaPolicyLib.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D
> xeSaPolicyLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiSaPolicy library.
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -27,6 +27,7 @@ HobLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  DxeSaPolicyLib.c
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D
> xeSaPolicyLibrary.h
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D
> xeSaPolicyLibrary.h
> index 449b67798c..0c0702985e 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D
> xeSaPolicyLibrary.h
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/D
> xeSaPolicyLibrary.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for the DxeSaPolicy library.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -15,7 +15,6 @@
>  #include <Library/UefiBootServicesTableLib.h>
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/MemoryAllocationLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Base.h>
>  #include <ConfigBlock.h>
>  #include <Library/HobLib.h>
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mr
> cOemPlatform.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mr
> cOemPlatform.c
> index b7aec77842..0f46fd6f0e 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mr
> cOemPlatform.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mr
> cOemPlatform.c
> @@ -1,7 +1,7 @@
>  /** @file
>    This file is SampleCode for Intel SA PEI Policy initialization.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -16,6 +16,7 @@
>  #include <Library/PeiSaPolicyLib.h>
>  #include <Library/PchCycleDecodingLib.h>
>  #include <Private/Library/PmcPrivateLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  #pragma pack (push, 1)
>  typedef union {
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Pei
> SaPolicyLib.inf
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Pei
> SaPolicyLib.inf
> index 22d0f0c945..a77f9a8441 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Pei
> SaPolicyLib.inf
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Pei
> SaPolicyLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiSaPolicy library.
>  #
> -# Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -34,6 +34,7 @@ PchInfoLib
>  MdePkg/MdePkg.dec
>  UefiCpuPkg/UefiCpuPkg.dec
>  CoffeelakeSiliconPkg/SiPkg.dec
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Pei
> SaPolicyLibSample.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Pei
> SaPolicyLibSample.c
> index 463e75702d..90a5634272 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Pei
> SaPolicyLibSample.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Pei
> SaPolicyLibSample.c
> @@ -1,7 +1,7 @@
>  /** @file
>    This file provides services for Sample PEI policy default initialization.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -21,6 +21,7 @@
>  #include <Library/CpuPlatformLib.h>
>  #include <Library/RngLib.h>
>  #include <Library/CpuMailboxLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  //
>  // DQ byte mapping to CMD/CTL/CLK, from the CPU side
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Pei
> SaPolicyLibrary.h
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Pei
> SaPolicyLibrary.h
> index 124ca6a57f..37d4a8e6a2 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Pei
> SaPolicyLibrary.h
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Pei
> SaPolicyLibrary.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for the PeiSaPolicy library.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -21,7 +21,6 @@
>  #include <Library/PciSegmentLib.h>
>  #include <Library/MemoryAllocationLib.h>
>  #include <Library/CpuPlatformLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Ppi/SiPolicy.h>
>  #include <Library/PeiSaPolicyLib.h>
>  #include <Library/SiConfigBlockLib.h>
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Sa
> PrintPolicy.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Sa
> PrintPolicy.c
> index ce3ef52733..9a267745d1 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Sa
> PrintPolicy.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Sa
> PrintPolicy.c
> @@ -1,13 +1,14 @@
>  /** @file
>    This file provides service for PEI phase policy printing
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PeiSaPolicyLibrary.h"
>  #include <Library/GpioNativeLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    This function prints the PEI phase PreMem policy.
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> index 5daa2367e6..c335beca3e 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> @@ -1,7 +1,7 @@
>  /** @file
>    DXE driver for Initializing SystemAgent Graphics ACPI table initialization.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -11,6 +11,7 @@
>  #include <Protocol/LegacyBios.h>
>  #include <Protocol/GopComponentName2.h>
>  #include <SiConfigHob.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  typedef union {
>    struct {
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionI
> nit.c
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionI
> nit.c
> index 6ec0691074..07b8c4ef90 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionI
> nit.c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionI
> nit.c
> @@ -3,12 +3,13 @@
>    Software SCI interface between system BIOS, ASL code, and Graphics
> drivers.
>    The code in this file will load the driver and initialize the interface
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "IgdOpRegionInit.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  GLOBAL_REMOVE_IF_UNREFERENCED IGD_OPREGION_PROTOCOL
> mIgdOpRegion;
> 
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionI
> nit.h
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionI
> nit.h
> index 0e95db3d02..0f73afeb0e 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionI
> nit.h
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/IgdOpRegionI
> nit.h
> @@ -2,7 +2,7 @@
>    This is part of the implementation of an Intel Graphics drivers OpRegion /
>    Software SCI interface between system BIOS, ASL code, and Graphics
> drivers.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> @@ -30,7 +30,6 @@
>  #include <SaInit.h>
>  #include <Library/CpuPlatformLib.h>
>  #include <Library/HobLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <SiConfigHob.h>
> 
>  ///
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/PciExpressInit.
> c
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/PciExpressInit
> .c
> index bbdf0d0fab..715c5a89a1 100644
> ---
> a/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/PciExpressInit.
> c
> +++
> b/Silicon/Intel/CoffeelakeSiliconPkg/SystemAgent/SaInit/Dxe/PciExpressInit
> .c
> @@ -1,12 +1,13 @@
>  /** @file
>    This driver does SA PCI Express ACPI table initialization.
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> 
>  #include "PciExpressInit.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  extern SYSTEM_AGENT_NVS_AREA_PROTOCOL   mSaNvsAreaProtocol;
>  extern SA_CONFIG_HOB                    *mSaConfigHob;
> diff --git a/Silicon/Intel/CoffeelakeSiliconPkg/Include/ConfigBlock.h
> b/Silicon/Intel/IntelSiliconPkg/Include/ConfigBlock.h
> similarity index 92%
> rename from Silicon/Intel/CoffeelakeSiliconPkg/Include/ConfigBlock.h
> rename to Silicon/Intel/IntelSiliconPkg/Include/ConfigBlock.h
> index d0e3d94418..e14c3df962 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Include/ConfigBlock.h
> +++ b/Silicon/Intel/IntelSiliconPkg/Include/ConfigBlock.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for Config Block Lib implementation
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> diff --git
> a/Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/ConfigBlockLib.h
> b/Silicon/Intel/IntelSiliconPkg/Include/Library/ConfigBlockLib.h
> similarity index 94%
> rename from
> Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/ConfigBlockLib.h
> rename to Silicon/Intel/IntelSiliconPkg/Include/Library/ConfigBlockLib.h
> index 9a3bf373a6..99b8ae4b5a 100644
> --- a/Silicon/Intel/CoffeelakeSiliconPkg/Include/Library/ConfigBlockLib.h
> +++ b/Silicon/Intel/IntelSiliconPkg/Include/Library/ConfigBlockLib.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for Config Block Lib implementation
> 
> -  Copyright (c) 2019 Intel Corporation. All rights reserved. <BR>
> +  Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved. <BR>
> 
>    SPDX-License-Identifier: BSD-2-Clause-Patent
>  **/
> diff --git
> a/Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLi
> b.inf
> b/Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLi
> b.inf
> index 37b4faaf65..a0c263d475 100644
> ---
> a/Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLi
> b.inf
> +++
> b/Silicon/Intel/IntelSiliconPkg/Library/BaseConfigBlockLib/BaseConfigBlockLi
> b.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component INF file for the BaseConfigBlock library.
>  #
> -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2020, Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -18,7 +18,7 @@ LIBRARY_CLASS  = ConfigBlockLib
> 
>  [Packages]
>  MdePkg/MdePkg.dec
> -KabylakeSiliconPkg/SiPkg.dec
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  BaseConfigBlockLib.c
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.inf
> index e0f4ee03ee..d3b4d9e318 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicy
> Lib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiCpuPolicyLib library.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -28,11 +28,13 @@ MmPciLib
>  SaPlatformLib
>  SiConfigBlockLib
>  PostCodeLib
> +ConfigBlockLib
> 
>  [Packages]
>  MdePkg/MdePkg.dec
>  UefiCpuPkg/UefiCpuPkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  PeiCpuPolicyLib.c
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Pei
> CpuPolicyLibPreMem.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Pei
> CpuPolicyLibPreMem.inf
> index a18ea79147..dbd8c4082d 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Pei
> CpuPolicyLibPreMem.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Cpu/Library/PeiCpuPolicyLibPreMem/Pei
> CpuPolicyLibPreMem.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiCpuPolicyLibPreMem library.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -24,11 +24,13 @@ MemoryAllocationLib
>  CpuPlatformLib
>  SiConfigBlockLib
>  PostCodeLib
> +ConfigBlockLib
> 
>  [Packages]
>  MdePkg/MdePkg.dec
>  UefiCpuPkg/UefiCpuPkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  PeiCpuPolicyLib.c
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
> deleted file mode 100644
> index dd91a55e79..0000000000
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/ConfigBlock.h
> +++ /dev/null
> @@ -1,53 +0,0 @@
> -/** @file
> -  Header file for Config Block Lib implementation
> -
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -#ifndef _CONFIG_BLOCK_H_
> -#define _CONFIG_BLOCK_H_
> -
> -#include <Uefi/UefiBaseType.h>
> -#include <Uefi/UefiMultiPhase.h>
> -#include <Pi/PiBootMode.h>
> -#include <Pi/PiHob.h>
> -
> -#pragma pack (push,1)
> -
> -///
> -/// Config Block Header
> -///
> -typedef struct _CONFIG_BLOCK_HEADER {
> -  EFI_HOB_GUID_TYPE GuidHob;                      ///< Offset 0-23  GUID extension
> HOB header
> -  UINT8             Revision;                     ///< Offset 24    Revision of this config block
> -  UINT8             Attributes;                   ///< Offset 25    The main revision for
> config block
> -  UINT8             Reserved[2];                  ///< Offset 26-27 Reserved for future
> use
> -} CONFIG_BLOCK_HEADER;
> -
> -///
> -/// Config Block
> -///
> -typedef struct _CONFIG_BLOCK {
> -  CONFIG_BLOCK_HEADER            Header;          ///< Offset 0-27  Header of
> config block
> -  //
> -  // Config Block Data
> -  //
> -} CONFIG_BLOCK;
> -
> -///
> -/// Config Block Table Header
> -///
> -typedef struct _CONFIG_BLOCK_TABLE_STRUCT {
> -  CONFIG_BLOCK_HEADER            Header;          ///< Offset 0-27  GUID number
> for main entry of config block
> -  UINT8                          Rsvd0[2];        ///< Offset 28-29 Reserved for future use
> -  UINT16                         NumberOfBlocks;  ///< Offset 30-31 Number of config
> blocks (N)
> -  UINT32                         AvailableSize;   ///< Offset 32-35 Current config block
> table size
> -///
> -/// Individual Config Block Structures are added here in memory as part of
> AddConfigBlock()
> -///
> -} CONFIG_BLOCK_TABLE_HEADER;
> -#pragma pack (pop)
> -
> -#endif // _CONFIG_BLOCK_H_
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
> deleted file mode 100644
> index 04c8ec5cca..0000000000
> --- a/Silicon/Intel/KabylakeSiliconPkg/Include/Library/ConfigBlockLib.h
> +++ /dev/null
> @@ -1,64 +0,0 @@
> -/** @file
> -  Header file for Config Block Lib implementation
> -
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> -SPDX-License-Identifier: BSD-2-Clause-Patent
> -
> -**/
> -
> -#ifndef _CONFIG_BLOCK_LIB_H_
> -#define _CONFIG_BLOCK_LIB_H_
> -
> -/**
> -  Create config block table
> -
> -  @param[in]     TotalSize                    - Max size to be allocated for the Config
> Block Table
> -  @param[out]    ConfigBlockTableAddress      - On return, points to a pointer
> to the beginning of Config Block Table Address
> -
> -  @retval EFI_INVALID_PARAMETER - Invalid Parameter
> -  @retval EFI_OUT_OF_RESOURCES  - Out of resources
> -  @retval EFI_SUCCESS           - Successfully created Config Block Table at
> ConfigBlockTableAddress
> -**/
> -EFI_STATUS
> -EFIAPI
> -CreateConfigBlockTable (
> -  IN     UINT16    TotalSize,
> -  OUT    VOID      **ConfigBlockTableAddress
> -  );
> -
> -/**
> -  Add config block into config block table structure
> -
> -  @param[in]     ConfigBlockTableAddress      - A pointer to the beginning of
> Config Block Table Address
> -  @param[out]    ConfigBlockAddress           - On return, points to a pointer to
> the beginning of Config Block Address
> -
> -  @retval EFI_OUT_OF_RESOURCES - Config Block Table is full and cannot
> add new Config Block or
> -                                 Config Block Offset Table is full and cannot add new Config
> Block.
> -  @retval EFI_SUCCESS          - Successfully added Config Block
> -**/
> -EFI_STATUS
> -EFIAPI
> -AddConfigBlock (
> -  IN     VOID      *ConfigBlockTableAddress,
> -  OUT    VOID      **ConfigBlockAddress
> -  );
> -
> -/**
> -  Retrieve a specific Config Block data by GUID
> -
> -  @param[in]      ConfigBlockTableAddress      - A pointer to the beginning of
> Config Block Table Address
> -  @param[in]      ConfigBlockGuid              - A pointer to the GUID uses to
> search specific Config Block
> -  @param[out]     ConfigBlockAddress           - On return, points to a pointer to
> the beginning of Config Block Address
> -
> -  @retval EFI_NOT_FOUND         - Could not find the Config Block
> -  @retval EFI_SUCCESS           - Config Block found and return
> -**/
> -EFI_STATUS
> -EFIAPI
> -GetConfigBlock (
> -  IN     VOID      *ConfigBlockTableAddress,
> -  IN     EFI_GUID  *ConfigBlockGuid,
> -  OUT    VOID      **ConfigBlockAddress
> -  );
> -
> -#endif // _CONFIG_BLOCK_LIB_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfig
> BlockLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.inf
> index c9a70c10c8..86a778c079 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfig
> BlockLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfi
> gBlockLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the BaseSiConfigBlockLib library.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -26,7 +26,7 @@ ConfigBlockLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  BaseSiConfigBlockLib.c
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconP
> olicyInitLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconP
> olicyInitLib.inf
> index 1997f43ab4..56360918ce 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconP
> olicyInitLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/DxeSiliconPolicyInitLib/DxeSiliconP
> olicyInitLib.inf
> @@ -1,7 +1,7 @@
>  ### @file
>  # Library functions for Fsp Policy Initialization Library.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -47,6 +47,7 @@
>    KabylakeSiliconPkg/SiPkg.dec
>    MinPlatformPkg/MinPlatformPkg.dec
>    KabylakeOpenBoardPkg/OpenBoardPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses]
>    BaseMemoryLib
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> index c3a8bbf539..baa2beea37 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
> @@ -2,13 +2,14 @@
>    This file is PeiSiPolicyLib library creates default settings of RC
>    Policy and installs RC Policy PPI.
> 
> -Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
>  #include "PeiSiPolicyLibrary.h"
>  #include <Library/PcdLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Get Si config block table total size.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> index 47f58d16e9..ec33fa50a3 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiSiPolicyLib library.
>  #
> -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -35,7 +35,7 @@ PcdLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  PeiSiPolicyLib.c
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> index e6506a0445..7b20d6c8af 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMe
> m.c
> @@ -2,13 +2,13 @@
>    This file is PeiSiPolicyLib library creates default settings of RC
>    Policy and installs RC Policy PPI.
> 
> -Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
>  #include "PeiSiPolicyLibrary.h"
> -
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    SiCreatePreMemConfigBlocks creates the config blocksg of Silicon PREMEM
> Policy.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> index f090e58868..6c55bda920 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for the PeiSiPolicyLib library.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PeiServicesLib.h>
>  #include <Library/MemoryAllocationLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Ppi/SiPolicy.h>
>  #include <Library/SiPolicyLib.h>
>  #include <Library/PchPolicyLib.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> index 623f30de45..d12ab2de36 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
> @@ -1,12 +1,13 @@
>  /** @file
>    This file is PeiSiPolicyLib library for printing Policy settings.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
>  #include "PeiSiPolicyLibrary.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Print whole SI_POLICY_PPI and serial out.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconInitLib/PeiSiliconInitLib.in
> f
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconInitLib/PeiSiliconInitLib.in
> f
> index bd77b081e5..3b94a02e6b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconInitLib/PeiSiliconInitLib.in
> f
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconInitLib/PeiSiliconInitLib.in
> f
> @@ -1,6 +1,6 @@
>  ### @file
>  #
> -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -39,6 +39,7 @@
>    MdePkg/MdePkg.dec
>    SecurityPkg/SecurityPkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    SiliconInit.c
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPostMe
> mSiliconPolicyInitLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPostMe
> mSiliconPolicyInitLib.inf
> index 83c909e681..0fc7c2aa13 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPostMe
> mSiliconPolicyInitLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPostMe
> mSiliconPolicyInitLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Library functions for Policy Initialization Library.
>  #
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -48,6 +48,7 @@
>    MdeModulePkg/MdeModulePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
>    UefiCpuPkg/UefiCpuPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses]
>    SiPolicyLib
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPreMem
> SiliconPolicyInitLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPreMem
> SiliconPolicyInitLib.inf
> index 782e04a476..bf9dbfb22f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPreMem
> SiliconPolicyInitLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLib/PeiPreMem
> SiliconPolicyInitLib.inf
> @@ -1,7 +1,7 @@
>  ### @file
>  # Library functions for Policy Initialization Library.
>  #
> -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -47,6 +47,7 @@
>    MdePkg/MdePkg.dec
>    MdeModulePkg/MdeModulePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses]
>    SiPolicyLib
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> ePolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> ePolicyInitLib.c
> index e72a06f5d3..80981f8dba 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> ePolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspM
> ePolicyInitLib.c
> @@ -1,13 +1,13 @@
>  /** @file
>    Implementation of Fsp Me Policy Initialization.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
>  #include <PeiFspPolicyInitLib.h>
> -
> +#include <Library/ConfigBlockLib.h>
>  #include <Ppi/SiPolicy.h>
> 
>  /**
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPc
> hPolicyInitLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPc
> hPolicyInitLib.c
> index 46c143553c..9348cd6042 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPc
> hPolicyInitLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspPc
> hPolicyInitLib.c
> @@ -1,7 +1,7 @@
>  /** @file
>    Implementation of Fsp PCH Policy Initialization.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <Ppi/SiPolicy.h>
>  #include <Library/MemoryAllocationLib.h>
>  #include <Library/PeiServicesLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Performs FSP PCH PEI Policy pre mem initialization.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.h
> index 52f20777ec..824494ad07 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiFspP
> olicyInitLib.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Internal header file for Fsp Policy Initialization Library.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -13,7 +13,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #include <Library/DebugLib.h>
>  #include <Library/PeiServicesLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include "PeiPolicyInitLib.h"
> 
>  #include <FspEas.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFsp.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFsp.inf
> index c11680656d..0db8fcce66 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFsp.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFsp.inf
> @@ -1,7 +1,7 @@
>  ### @file
>  # Library functions for Fsp Policy Initialization Library.
>  #
> -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -59,6 +59,7 @@
>    IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
>    KabylakeFspBinPkg/KabylakeFspBinPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses]
>    BaseMemoryLib
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFspAml.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFspAml.inf
> index 1ace9aeb52..72dd7b8d34 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFspAml.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Library/PeiSiliconPolicyInitLibFsp/PeiSilico
> nPolicyInitLibFspAml.inf
> @@ -1,7 +1,7 @@
>  ### @file
>  # Library functions for Fsp Policy Initialization Library.
>  #
> -# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2019 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -59,6 +59,7 @@
>    IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
>    AmberLakeFspBinPkg/AmberLakeFspBinPkg.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses]
>    BaseMemoryLib
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> index bca35e19d3..72ca0b33e0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Prototype of the MePolicyLibPei library.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #define _PEI_ME_POLICY_LIB_H_
> 
>  #include <Ppi/SiPolicy.h>
> -#include <Library/ConfigBlockLib.h>
> 
>  /**
>    This function prints the PEI phase PreMem policy.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.c
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.c
> index 803de0999e..62e4232d59 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.c
> @@ -1,11 +1,12 @@
>  /** @file
>    This file is PeiMePolicy library.
> 
> -Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiMePolicyLibrary.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Load default settings for ME config block in pre-mem phase.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.inf
> index ea247181a4..6895f17f7c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> b.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiMePolicyLib libbrary.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -29,7 +29,7 @@ ConfigBlockLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  PeiMePolicyLib.c
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> brary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> brary.h
> index a908bb6c24..c57d226231 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> brary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLi
> brary.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for the PeiMePolicy library.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -16,7 +16,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <Ppi/SiPolicy.h>
>  #include <Library/PeiMePolicyLib.h>
>  #include <ConfigBlock.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Library/SiConfigBlockLib.h>
> 
>  #endif // _PEI_ME_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemP
> rintPolicy.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMem
> PrintPolicy.c
> index b7fcb0944e..43d0484713 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemP
> rintPolicy.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMem
> PrintPolicy.c
> @@ -1,11 +1,12 @@
>  /** @file
>    Print whole PCH_PREMEM_POLICY_PPI
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiPchPolicyLibrary.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Print PCH_GENERAL_PREMEM_CONFIG and serial out.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolic
> y.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolic
> y.c
> index 72a78e5faf..e540dc95b0 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolic
> y.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolic
> y.c
> @@ -1,11 +1,12 @@
>  /** @file
>    Print whole PCH_POLICY_PPI
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiPchPolicyLibrary.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    Print PCH_USB_CONFIG and serial out.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePo
> licyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePo
> licyLib.c
> index 62b621ce2f..9a27327032 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePo
> licyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePo
> licyLib.c
> @@ -1,11 +1,12 @@
>  /** @file
>    This file is to load sample board policy.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiPchPolicyLibrary.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /*
>    Apply sample board PCH specific default settings
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePr
> eMemPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePr
> eMemPolicyLib.c
> index 6cf9d9069e..5c2727acba 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePr
> eMemPolicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchSamplePr
> eMemPolicyLib.c
> @@ -1,11 +1,12 @@
>  /** @file
>    This file is to load sample board policy.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiPchPolicyLibrary.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  /*
>    Apply sample board PCH specific default settings
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.inf
> index 39004319aa..a5ccf4698b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiPchPolicy libbrary.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -32,7 +32,7 @@ SiConfigBlockLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>  gSiPkgTokenSpaceGuid.PcdAcpiBaseAddress
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ibrary.h
> index f8d01614ac..4a21cbbc10 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyL
> ibrary.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for the PeiPchPolicy library.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -13,7 +13,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/PeiServicesLib.h>
>  #include <Library/MemoryAllocationLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Library/SiConfigBlockLib.h>
>  #include <Library/PchInfoLib.h>
>  #include <Ppi/SiPolicy.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/BasePchSpiCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/BasePchSpiCommonLib.inf
> index 599b07d3d3..51e2d25a7f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/BasePchSpiCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/BasePchSpiCommonLi
> b/BasePchSpiCommonLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Component description file for the PchSpiCommonLib
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -22,6 +22,7 @@
>    MdePkg/MdePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
>    KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses]
>    IoLib
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePch
> HdaLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePch
> HdaLib.inf
> index 04940c75c1..7982327af7 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePch
> HdaLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/DxePchHdaLib/DxePch
> HdaLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component information file for PCH HD Audio Library
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -29,7 +29,7 @@ PchInfoLib
>  MdePkg/MdePkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
>  KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>    gSiPkgTokenSpaceGuid.PcdAcpiDefaultOemId
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/PeiDxeI2cMasterCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/PeiDxeI2cMasterCommonLib.inf
> index 5218191d8a..bcb28a6a0c 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/PeiDxeI2cMasterCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeI2cMasterCom
> monLib/PeiDxeI2cMasterCommonLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the I2C port driver.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -31,7 +31,7 @@ PchInfoLib
>  KabylakeSiliconPkg/SiPkg.dec
>  KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
>  MdePkg/MdePkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  I2cMasterCommonLib.c
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PeiDxeSmmGpioPrivateLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PeiDxeSmmGpioPrivateLib.inf
> index 7986358ce1..075e5c7f3f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PeiDxeSmmGpioPrivateLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmGpioPrivat
> eLib/PeiDxeSmmGpioPrivateLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Component description file for the PeiDxeSmmGpioPrivateLib
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -34,7 +34,7 @@ LIBRARY_CLASS                  = GpioPrivateLib
>    MdePkg/MdePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
>    KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> -
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    GpioPrivateLib.c
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PeiDxeSmmPchInitCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PeiDxeSmmPchInitCommonLib.inf
> index 52ab228442..b13295416f 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PeiDxeSmmPchInitCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchInitCo
> mmonLib/PeiDxeSmmPchInitCommonLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Component description file for the PchInitCommonLib
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -23,6 +23,7 @@
>    MdePkg/MdePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
>    KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses]
>    IoLib
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExp
> ressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> index 39dc89670a..1cbfe21a87 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExpr
> essHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPciExp
> ressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiDxeSmmPchPciExpressHelpersLib
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -39,7 +39,7 @@ PchInitCommonLib
>  MdePkg/MdePkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
>  KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  PchPciExpressHelpersLibrary.c
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PeiDxeSmmPchPsfPrivateLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PeiDxeSmmPchPsfPrivateLib.inf
> index 0d7050500a..094aa498fd 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PeiDxeSmmPchPsfPrivateLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchPsfPriv
> ateLib/PeiDxeSmmPchPsfPrivateLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Component description file for the PeiDxeSmmPchPsfPrivateLib
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -34,7 +34,7 @@ LIBRARY_CLASS                  = PchPsfPrivateLib
>    MdePkg/MdePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
>    KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> -
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>    PchPsfPrivateLib.c
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PeiDxeSmmPchSmbusCommonLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PeiDxeSmmPchSmbusCommonLib.inf
> index 78324e1fef..286b9f566b 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PeiDxeSmmPchSmbusCommonLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmPchSmbus
> CommonLib/PeiDxeSmmPchSmbusCommonLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Component description file for the PchSmbusCommonLib
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -22,6 +22,7 @@
>    MdePkg/MdePkg.dec
>    KabylakeSiliconPkg/SiPkg.dec
>    KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> +  IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [LibraryClasses]
>    IoLib
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.inf
> index 413d0c86f8..cfcd23d332 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/LibraryPrivate/PeiDxeSmmRstPrivate
> Lib/PeiDxeSmmRstPrivateLib.inf
> @@ -4,7 +4,7 @@
>  # All function in this library is available for PEI, DXE, and SMM,
>  # But do not support UEFI RUNTIME environment call.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -31,6 +31,7 @@ PchInitCommonLib
>  MdePkg/MdePkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
>  KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  PeiDxeSmmRstPrivateLib.c
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
> index 516606e604..2bed548f60 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInit.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for PCH Initialization Driver.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -17,7 +17,6 @@ typedef UINT16                    STRING_REF;
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/IoLib.h>
>  #include <Library/TimerLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Protocol/DriverSupportedEfiVersion.h>
>  #include <Library/PchCycleDecodingLib.h>
>  #include <Library/PchPcieRpLib.h>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
> index 49ede590e8..62a0fb30e0 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxe.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for Pch Initialization driver
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -51,7 +51,7 @@ RstPrivateLib
>  MdePkg/MdePkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
>  KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>  gSiPkgTokenSpaceGuid.PcdEfiGcdAllocateType
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
> index 68c1bca40c..44dbb75de3 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFsp.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Component description file for Pch Initialization driver for FSP package
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -45,7 +45,7 @@ PchPsfPrivateLib
>  MdePkg/MdePkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
>  KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>  gSiPkgTokenSpaceGuid.PcdEfiGcdAllocateType
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> index 666340e9b1..08261a5355 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for PCH Init SMM Handler
> 
> -Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -34,7 +34,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <Library/GpioNativeLib.h>
>  #include <Library/PchEspiLib.h>
>  #include <Library/MmPciLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Library/PchPciExpressHelpersLib.h>
>  #include <Protocol/PchPcieSmiDispatch.h>
>  #include <Protocol/PchTcoSmiDispatch.h>
> diff --git a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> index ea6692f6d9..942d1f48c9 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> +++ b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for PchInitSmm driver
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -51,7 +51,7 @@ ConfigBlockLib
>  MdePkg/MdePkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
>  KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>  gSiPkgTokenSpaceGuid.PcdEfiGcdAllocateType
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tcher.inf
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tcher.inf
> index 46c4c72617..f14787bbe4 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tcher.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/Pch/PchSmiDispatcher/Smm/PchSmiDispa
> tcher.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the Pch SMI Dispatch Handlers module
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -46,7 +46,7 @@ SmiHandlerProfileLib
>  MdePkg/MdePkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
>  KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>  # Progress Code for S3 Suspend end.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicy
> Lib.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicy
> Lib.h
> index 28e648f4a0..e8849580db 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicy
> Lib.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Library/PeiSaPolicy
> Lib.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Prototype of the PeiSaPolicy library.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -9,7 +9,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #define _PEI_SA_POLICY_LIB_H_
> 
>  #include <Ppi/SiPolicy.h>
> -#include <Library/ConfigBlockLib.h>
> 
>  /**
>    This function prints the PEI phase PreMem policy.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
> index 40a0ab884d..5a1534b7bc 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/Protocol/SaPolicy.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Interface definition details between System Agent and platform drivers
> during DXE phase.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -10,7 +10,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  #include <SaAccess.h>
>  #include <ConfigBlock.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <ConfigBlock/GraphicsDxeConfig.h>
>  #include <ConfigBlock/MiscDxeConfig.h>
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
> index dccd4c9b3b..35b5793c9e 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Include/SaPolicyCommon.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Main System Agent Policy structure definition which will contain several
> config blocks during runtime.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -12,7 +12,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <Library/SmbusLib.h>
>  #include <SaAccess.h>
>  #include <ConfigBlock.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <ConfigBlock/MemoryConfig.h>
>  #include <ConfigBlock/SaMiscPeiPreMemConfig.h>
>  #include <ConfigBlock/GraphicsPeiConfig.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.c
> index be36468b1e..1c656f0595 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.c
> @@ -1,13 +1,13 @@
>  /** @file
>    This file provide services for DXE phase policy default initialization
> 
> -Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> 
>  #include "DxeSaPolicyLibrary.h"
> -
> +#include <Library/ConfigBlockLib.h>
> 
>  extern EFI_GUID gGraphicsDxeConfigGuid;
>  extern EFI_GUID gMiscDxeConfigGuid;
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.inf
> index 9eb389b14f..2ba7b6af3a 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiSaPolicy library.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -30,7 +30,7 @@ ConfigBlockLib
>  [Packages]
>  MdePkg/MdePkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Sources]
>  DxeSaPolicyLib.c
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLibrary.h
> index ec1b7d10e8..24637bccfe 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/DxeSaPolicyLib/Dxe
> SaPolicyLibrary.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for the DxeSaPolicy library.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -14,7 +14,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <Library/UefiBootServicesTableLib.h>
>  #include <Library/BaseMemoryLib.h>
>  #include <Library/MemoryAllocationLib.h>
> -#include <Library/ConfigBlockLib.h>
> 
>  #include <Protocol/SaPolicy.h>
>  #endif // _DXE_SA_POLICY_LIBRARY_H_
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mrc
> OemPlatform.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mrc
> OemPlatform.c
> index f62651796a..82091415cb 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mrc
> OemPlatform.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/Mrc
> OemPlatform.c
> @@ -1,7 +1,7 @@
>  /** @file
>    This file is SampleCode for Intel SA PEI Policy initialization.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -15,6 +15,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <PchAccess.h>
>  #include <Library/PeiSaPolicyLib.h>
>  #include <Library/PchCycleDecodingLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  #pragma pack (push, 1)
>  typedef union {
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiS
> aPolicyLib.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiS
> aPolicyLib.inf
> index 88734d672c..38dd8c7947 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiS
> aPolicyLib.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiS
> aPolicyLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for the PeiSaPolicy library.
>  #
> -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -34,6 +34,7 @@ PchCycleDecodingLib
>  MdePkg/MdePkg.dec
>  UefiCpuPkg/UefiCpuPkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>  gSiPkgTokenSpaceGuid.PcdTsegSize
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiS
> aPolicyLibSample.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiS
> aPolicyLibSample.c
> index 63e93094e1..d2686760af 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiS
> aPolicyLibSample.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiS
> aPolicyLibSample.c
> @@ -1,7 +1,7 @@
>  /** @file
>    This file provides services for Sample PEI policy default initialization.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -22,6 +22,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <Library/CpuPlatformLib.h>
>  #include <Library/RngLib.h>
>  #include <Library/CpuMailboxLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  //
>  // DQ byte mapping to CMD/CTL/CLK, from the CPU side - for SKL RVP, SKL
> SDS.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiS
> aPolicyLibrary.h
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiS
> aPolicyLibrary.h
> index a44f7343dd..805ed18a81 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiS
> aPolicyLibrary.h
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/PeiS
> aPolicyLibrary.h
> @@ -1,7 +1,7 @@
>  /** @file
>    Header file for the PeiSaPolicy library.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
> @@ -20,7 +20,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #include <Library/MmPciLib.h>
>  #include <Library/MemoryAllocationLib.h>
>  #include <Library/CpuPlatformLib.h>
> -#include <Library/ConfigBlockLib.h>
>  #include <Ppi/SiPolicy.h>
>  #include <Library/PeiSaPolicyLib.h>
>  #include <Library/SiConfigBlockLib.h>
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPri
> ntPolicy.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPri
> ntPolicy.c
> index 5c80fca88e..7a674fb641 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPri
> ntPolicy.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/Library/PeiSaPolicyLib/SaPri
> ntPolicy.c
> @@ -1,12 +1,13 @@
>  /** @file
>    This file provides service for PEI phase policy printing
> 
> -Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "PeiSaPolicyLibrary.h"
>  #include <Library/GpioNativeLib.h>
> +#include <Library/ConfigBlockLib.h>
> 
>  /**
>    This function prints the PEI phase PreMem policy.
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> index 045f82a31d..3cae466aba 100644
> ---
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/GraphicsInit.c
> @@ -1,11 +1,12 @@
>  /** @file
>    DXE driver for Initializing SystemAgent Graphics ACPI table initialization.
> 
> -Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
>  **/
>  #include "GraphicsInit.h"
> +#include <Library/ConfigBlockLib.h>
> 
>  extern SYSTEM_AGENT_GLOBAL_NVS_AREA_PROTOCOL
> mSaGlobalNvsAreaProtocol;
> 
> diff --git
> a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
> index 3c4c79affb..0bbd1c4b34 100644
> --- a/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
> +++
> b/Silicon/Intel/KabylakeSiliconPkg/SystemAgent/SaInit/Dxe/SaInitDxe.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for SystemAgent Initialization driver
>  #
> -# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2020 Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -50,7 +50,7 @@ MdePkg/MdePkg.dec
>  UefiCpuPkg/UefiCpuPkg.dec
>  KabylakeSiliconPkg/SiPkg.dec
>  KabylakeSiliconPkg/KabylakeSiliconPrivate.dec
> -
> +IntelSiliconPkg/IntelSiliconPkg.dec
> 
>  [Pcd]
>  gSiPkgTokenSpaceGuid.PcdAcpiDefaultOemId
> --
> 2.16.2.windows.1


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

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