Browse Source

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>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Cc: Rangasai V Chaganty <rangasai.v.chaganty@intel.com>
Tsao, Ethan 4 years ago
parent
commit
beb7ba80bb
100 changed files with 186 additions and 130 deletions
  1. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
  2. 1 2
      Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
  3. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
  4. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
  5. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c
  6. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
  7. 1 2
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
  8. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
  9. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
  10. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
  11. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
  12. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
  13. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
  14. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
  15. 1 2
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
  16. 1 1
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
  17. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
  18. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
  19. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
  20. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
  21. 3 2
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c
  22. 3 1
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
  23. 2 1
      Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSiliconPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf
  24. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
  25. 3 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf
  26. 1 2
      Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h
  27. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspMePolicyInitLib.c
  28. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPchPolicyInitLib.c
  29. 1 2
      Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.h
  30. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf
  31. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspSaPolicyInitLib.c
  32. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspSiPolicyInitLib.c
  33. 1 2
      Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h
  34. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
  35. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/PeiHdaVerbTableLib.inf
  36. 1 2
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxeMePolicyUpdate.h
  37. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxePchPolicyUpdate.c
  38. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxePolicyUpdateLib.inf
  39. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxeSaPolicyUpdate.c
  40. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/PeiPolicyInitLib.inf
  41. 2 2
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/PeiSaPolicyInit.c
  42. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdate.c
  43. 1 2
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdate.h
  44. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdatePreMem.c
  45. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf
  46. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSaPolicyUpdate.c
  47. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSaPolicyUpdatePreMem.c
  48. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSiPolicyUpdate.c
  49. 1 2
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSiPolicyUpdate.h
  50. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
  51. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
  52. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
  53. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
  54. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPostMemLib.c
  55. 1 2
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxePolicyBoardConfig.h
  56. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxePolicyBoardConfigLib.inf
  57. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxeSaPolicyBoardConfig.c
  58. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPlatformHookLib/PeiPlatformHooklib.inf
  59. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiCpuPolicyBoardConfig.c
  60. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiMePolicyBoardConfig.c
  61. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiMePolicyBoardConfigPreMem.c
  62. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPchPolicyBoardConfig.c
  63. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPchPolicyBoardConfigPreMem.c
  64. 1 2
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPolicyBoardConfig.h
  65. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPolicyBoardConfigLib.inf
  66. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiSaPolicyBoardConfig.c
  67. 2 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiSaPolicyBoardConfigPreMem.c
  68. 3 1
      Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf
  69. 1 2
      Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibPreMem.c
  70. 3 1
      Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibPreMem.inf
  71. 2 2
      Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf
  72. 2 1
      Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c
  73. 2 2
      Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf
  74. 2 1
      Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c
  75. 1 2
      Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h
  76. 2 1
      Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c
  77. 1 2
      Silicon/Intel/CoffeelakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h
  78. 2 1
      Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c
  79. 2 1
      Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf
  80. 1 2
      Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h
  81. 1 2
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Protocol/PchPolicy.h
  82. 2 1
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/DxePchPolicyLib/DxePchPolicyLib.inf
  83. 2 1
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c
  84. 2 1
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c
  85. 2 1
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c
  86. 2 2
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibCnl.inf
  87. 1 2
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h
  88. 2 1
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c
  89. 2 2
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLib/PeiDxeSmmPchDmiLib.inf
  90. 2 2
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLib/PeiDxeSmmPchDmiWithS3Lib.inf
  91. 2 1
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf
  92. 2 2
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf
  93. 2 2
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiDxeSmmPmcPrivateLibCnl.inf
  94. 2 2
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiDxeSmmPmcPrivateLibWithS3.inf
  95. 2 1
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiPmcPrivateLibCnl.inf
  96. 2 1
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c
  97. 2 1
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c
  98. 2 2
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeCnl.inf
  99. 2 2
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFspCnl.inf
  100. 1 2
      Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf

@@ -2,7 +2,7 @@
 # This module will perform specific PCI-Express devices
 # This module will perform specific PCI-Express devices
 # resource configuration.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -40,6 +40,7 @@
   MinPlatformPkg/MinPlatformPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PciHotPlug.c
   PciHotPlug.c

+ 1 - 2
Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h

@@ -1,7 +1,7 @@
 /** @file
 /** @file
   Header file for the DxeTBTPolicy library.
   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
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 
 **/
 **/
@@ -16,7 +16,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <ConfigBlock.h>
 #include <ConfigBlock.h>
-#include <Library/ConfigBlockLib.h>
 #include <Guid/EventGroup.h>
 #include <Guid/EventGroup.h>
 
 
 #endif // _DXE_TBT_POLICY_LIBRARY_H_
 #endif // _DXE_TBT_POLICY_LIBRARY_H_

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c

@@ -2,7 +2,7 @@
   This library implements constructor function to register notify call back
   This library implements constructor function to register notify call back
   when policy PPI installed.
   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
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 
 **/
 **/
@@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/MemoryAllocationLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/SiPolicyLib.h>
 #include <Library/SiPolicyLib.h>
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   Callback function to update policy when policy PPI installed.
   Callback function to update policy when policy PPI installed.

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf

@@ -3,7 +3,7 @@
 # This library implements constructor function to register notify call back
 # This library implements constructor function to register notify call back
 # when policy PPI installed.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -25,6 +25,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiPreMemSiliconPolicyNotifyLib.c
   PeiPreMemSiliconPolicyNotifyLib.c

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.c

@@ -2,7 +2,7 @@
   This library implements constructor function to register notify call back
   This library implements constructor function to register notify call back
   when policy PPI installed.
   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
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 
 **/
 **/
@@ -11,6 +11,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/MemoryAllocationLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/SiPolicyLib.h>
 #include <Library/SiPolicyLib.h>
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   Callback function to update policy when policy PPI installed.
   Callback function to update policy when policy PPI installed.

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf

@@ -3,7 +3,7 @@
 # This library implements constructor function to register notify call back
 # This library implements constructor function to register notify call back
 # when policy PPI installed.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -25,6 +25,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiPreMemSiliconPolicyNotifyLib.c
   PeiPreMemSiliconPolicyNotifyLib.c

+ 1 - 2
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h

@@ -1,6 +1,6 @@
 /** @file
 /** @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
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 
 **/
 **/
@@ -19,7 +19,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PciLib.h>
 #include <Library/PciLib.h>
 #include <Ppi/SiPolicy.h>
 #include <Ppi/SiPolicy.h>
 #include <Library/MmPciLib.h>
 #include <Library/MmPciLib.h>
-#include <Library/ConfigBlockLib.h>
 
 
 #include <FspEas.h>
 #include <FspEas.h>
 #include <FspmUpd.h>
 #include <FspmUpd.h>

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 #  FSP wrapper silicon policy update library.
 #  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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -59,6 +59,7 @@
   KabylakeFspBinPkg/KabylakeFspBinPkg.dec
   KabylakeFspBinPkg/KabylakeFspBinPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [LibraryClasses.IA32]
 [LibraryClasses.IA32]
   FspWrapperApiLib
   FspWrapperApiLib

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component information file for GalagoPro3InitLib in PEI post memory phase.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -30,6 +30,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiGalagoPro3InitPostMemLib.c
   PeiGalagoPro3InitPostMemLib.c

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component information file for PEI GalagoPro3 Board Init Pre-Mem Library
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -29,6 +29,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiGalagoPro3Detect.c
   PeiGalagoPro3Detect.c

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component information file for GalagoPro3InitLib in PEI post memory phase.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -32,6 +32,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiGalagoPro3InitPostMemLib.c
   PeiGalagoPro3InitPostMemLib.c

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component information file for PEI GalagoPro3 Board Init Pre-Mem Library
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -31,6 +31,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiGalagoPro3InitPreMemLib.c
   PeiGalagoPro3InitPreMemLib.c

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c

@@ -1,12 +1,13 @@
 /** @file
 /** @file
   This file is the library for SA DXE Policy initialization.
   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
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 
 **/
 **/
 
 
 #include "DxeSaPolicyInit.h"
 #include "DxeSaPolicyInit.h"
+#include <Library/ConfigBlockLib.h>
 
 
 #define SA_VTD_RMRR_USB_LENGTH  0x20000
 #define SA_VTD_RMRR_USB_LENGTH  0x20000
 
 

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component information file for DXE silicon policy update library
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -25,6 +25,7 @@
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   DxeSiliconPolicyUpdateLib.c
   DxeSiliconPolicyUpdateLib.c

+ 1 - 2
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h

@@ -1,6 +1,6 @@
 /** @file
 /** @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
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 
 **/
 **/
@@ -19,7 +19,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <Library/PciLib.h>
 #include <Library/PciLib.h>
 #include <Ppi/SiPolicy.h>
 #include <Ppi/SiPolicy.h>
 #include <Library/MmPciLib.h>
 #include <Library/MmPciLib.h>
-#include <Library/ConfigBlockLib.h>
 
 
 #include <FspEas.h>
 #include <FspEas.h>
 #include <FspmUpd.h>
 #include <FspmUpd.h>

+ 1 - 1
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 #  Provide FSP wrapper platform related function.
 #  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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPostMemLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component information file for KabylakeRvp3InitLib in PEI post memory phase.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -30,6 +30,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiKabylakeRvp3InitPostMemLib.c
   PeiKabylakeRvp3InitPostMemLib.c

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiBoardInitPreMemLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component information file for PEI KabylakeRvp3 Board Init Pre-Mem Library
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -30,6 +30,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiKabylakeRvp3Detect.c
   PeiKabylakeRvp3Detect.c

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component information file for KabylakeRvp3InitLib in PEI post memory phase.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -32,6 +32,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiKabylakeRvp3InitPostMemLib.c
   PeiKabylakeRvp3InitPostMemLib.c

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component information file for PEI KabylakeRvp3 Board Init Pre-Mem Library
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -32,6 +32,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiKabylakeRvp3InitPreMemLib.c
   PeiKabylakeRvp3InitPreMemLib.c

+ 3 - 2
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSaPolicyUpdate.c

@@ -1,12 +1,13 @@
 /** @file
 /** @file
   This file is the library for SA DXE Policy initialization.
   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
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
 
 **/
 **/
 
 
 #include "DxeSaPolicyInit.h"
 #include "DxeSaPolicyInit.h"
+#include <Library/ConfigBlockLib.h>
 
 
 #define SA_VTD_RMRR_USB_LENGTH  0x20000
 #define SA_VTD_RMRR_USB_LENGTH  0x20000
 
 

+ 3 - 1
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSiliconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component information file for Silicon Update Library
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -19,12 +19,14 @@
   BaseLib
   BaseLib
   PcdLib
   PcdLib
   DebugLib
   DebugLib
+  ConfigBlockLib
 
 
 [Packages]
 [Packages]
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   DxeSiliconPolicyUpdateLib.c
   DxeSiliconPolicyUpdateLib.c

+ 2 - 1
Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSiliconPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf

@@ -1,7 +1,7 @@
 ### @file
 ### @file
 # Component information file for silicon policy update library
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -36,6 +36,7 @@
   UefiCpuPkg/UefiCpuPkg.dec
   UefiCpuPkg/UefiCpuPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeSiliconPkg/SiPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
   KabylakeOpenBoardPkg/OpenBoardPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiSiliconPolicyUpdateLib.c
   PeiSiliconPolicyUpdateLib.c

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf

@@ -3,7 +3,7 @@
 # resource configuration.
 # 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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -42,6 +42,7 @@
   MinPlatformPkg/MinPlatformPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PciHotPlug.c
   PciHotPlug.c

+ 3 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLib.inf

@@ -2,7 +2,7 @@
 # Component description file for Tbt functionality
 # 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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -30,6 +30,8 @@ HobLib
 MdePkg/MdePkg.dec
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
 WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
+
 [Sources]
 [Sources]
 DxeTbtPolicyLib.c
 DxeTbtPolicyLib.c
 
 

+ 1 - 2
Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib/DxeTbtPolicyLibrary.h

@@ -2,7 +2,7 @@
   Header file for the DxeTBTPolicy library.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -17,7 +17,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <ConfigBlock.h>
 #include <ConfigBlock.h>
-#include <Library/ConfigBlockLib.h>
 //#include <SetupVariable.h>
 //#include <SetupVariable.h>
 #include <Guid/EventGroup.h>
 #include <Guid/EventGroup.h>
 
 

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspMePolicyInitLib.c

@@ -2,13 +2,14 @@
   Implementation of Fsp Me Policy Initialization.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include <PeiFspPolicyInitLib.h>
 #include <PeiFspPolicyInitLib.h>
 #include <ConfigBlock/MePeiConfig.h>
 #include <ConfigBlock/MePeiConfig.h>
 #include <Ppi/SiPolicy.h>
 #include <Ppi/SiPolicy.h>
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   Performs FSP ME PEI Policy pre mem initialization.
   Performs FSP ME PEI Policy pre mem initialization.

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPchPolicyInitLib.c

@@ -2,7 +2,7 @@
   Implementation of Fsp PCH Policy Initialization.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -12,6 +12,7 @@
 #include <Library/MemoryAllocationLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/PchInfoLib.h>
 #include <Library/PchInfoLib.h>
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   Performs FSP PCH PEI Policy pre mem initialization.
   Performs FSP PCH PEI Policy pre mem initialization.

+ 1 - 2
Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.h

@@ -2,7 +2,7 @@
   Internal header file for Fsp Policy Initialization Library.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -13,7 +13,6 @@
 
 
 #include <Library/DebugLib.h>
 #include <Library/DebugLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/PeiServicesLib.h>
-#include <Library/ConfigBlockLib.h>
 
 
 #include <FspEas.h>
 #include <FspEas.h>
 #include <FspmUpd.h>
 #include <FspmUpd.h>

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf

@@ -2,7 +2,7 @@
 # Library functions for Fsp Policy Initialization Library.
 # 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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -59,6 +59,7 @@
   CoffeeLakeFspBinPkg/CoffeeLakeFspBinPkg.dec
   CoffeeLakeFspBinPkg/CoffeeLakeFspBinPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   UefiCpuPkg/UefiCpuPkg.dec
   UefiCpuPkg/UefiCpuPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [LibraryClasses]
 [LibraryClasses]
   BaseMemoryLib
   BaseMemoryLib

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspSaPolicyInitLib.c

@@ -2,7 +2,7 @@
   Implementation of Fsp SA Policy Initialization.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -22,6 +22,7 @@
 #include <Pi/PiFirmwareFile.h>
 #include <Pi/PiFirmwareFile.h>
 #include <Pi/PiPeiCis.h>
 #include <Pi/PiPeiCis.h>
 #include <Core/Pei/PeiMain.h>
 #include <Core/Pei/PeiMain.h>
+#include <Library/ConfigBlockLib.h>
 
 
 #define MAX_SPD_PAGE_COUNT           (2)
 #define MAX_SPD_PAGE_COUNT           (2)
 #define MAX_SPD_PAGE_SIZE            (256)
 #define MAX_SPD_PAGE_SIZE            (256)

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspSiPolicyInitLib.c

@@ -2,12 +2,13 @@
   Implementation of Fsp SI Policy Initialization.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include <PeiFspPolicyInitLib.h>
 #include <PeiFspPolicyInitLib.h>
 #include <Ppi/SiPolicy.h>
 #include <Ppi/SiPolicy.h>
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   Performs FSP SI PEI Policy pre mem initialization.
   Performs FSP SI PEI Policy pre mem initialization.

+ 1 - 2
Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiPchPolicyUpdate.h

@@ -1,6 +1,6 @@
 /** @file
 /** @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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -18,7 +18,6 @@
 #include <Library/PciLib.h>
 #include <Library/PciLib.h>
 #include <Ppi/SiPolicy.h>
 #include <Ppi/SiPolicy.h>
 #include <Library/MmPciLib.h>
 #include <Library/MmPciLib.h>
-#include <Library/ConfigBlockLib.h>
 
 
 #include <FspEas.h>
 #include <FspEas.h>
 #include <FspmUpd.h>
 #include <FspmUpd.h>

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf

@@ -2,7 +2,7 @@
 #  Provide FSP wrapper platform related function.
 #  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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -60,6 +60,7 @@
   CoffeeLakeFspBinPkg/CoffeeLakeFspBinPkg.dec
   CoffeeLakeFspBinPkg/CoffeeLakeFspBinPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [LibraryClasses.IA32]
 [LibraryClasses.IA32]
   FspWrapperApiLib
   FspWrapperApiLib

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/PeiHdaVerbTableLib.inf

@@ -2,7 +2,7 @@
 #  PEI Intel HD Audio Verb Table library.
 #  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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -50,6 +50,7 @@
   MdeModulePkg/MdeModulePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [LibraryClasses]
 [LibraryClasses]
   BaseLib
   BaseLib

+ 1 - 2
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxeMePolicyUpdate.h

@@ -1,6 +1,6 @@
 /** @file
 /** @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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -16,7 +16,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Protocol/MePolicy.h>
 #include <Protocol/MePolicy.h>
 #include <Library/HobLib.h>
 #include <Library/HobLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <ConfigBlock/MePeiConfig.h>
 #include <ConfigBlock/MePeiConfig.h>
 
 
 #define PLATFORM_BOOT_TABLE_PTR_TYPE   0x1001
 #define PLATFORM_BOOT_TABLE_PTR_TYPE   0x1001

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxePchPolicyUpdate.c

@@ -2,7 +2,7 @@
   This file is the library for PCH DXE Policy initialization.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -13,6 +13,7 @@
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Library/UefiRuntimeServicesTableLib.h>
 #include <Protocol/PchPolicy.h>
 #include <Protocol/PchPolicy.h>
 #include <ConfigBlock/HdAudioConfig.h>
 #include <ConfigBlock/HdAudioConfig.h>
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   Get data for PCH policy from setup options.
   Get data for PCH policy from setup options.

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxePolicyUpdateLib.inf

@@ -2,7 +2,7 @@
 #  Component description file for DXE DxePolicyUpdateLib Library
 #  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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -31,6 +31,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [LibraryClasses]
 [LibraryClasses]
   UefiBootServicesTableLib
   UefiBootServicesTableLib

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/DxePolicyUpdateLib/DxeSaPolicyUpdate.c

@@ -2,11 +2,12 @@
   This file is the library for SA DXE Policy initialization.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include <DxeSaPolicyUpdate.h>
 #include <DxeSaPolicyUpdate.h>
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   Get data for platform policy from setup options.
   Get data for platform policy from setup options.

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/PeiPolicyInitLib.inf

@@ -2,7 +2,7 @@
 # Component description file for PeiPolicyInit library.
 # 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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -39,6 +39,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Pcd]
 [Pcd]
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress  ## CONSUMES
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress  ## CONSUMES

+ 2 - 2
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyInitLib/PeiSaPolicyInit.c

@@ -2,12 +2,12 @@
   This file is SampleCode for Intel SA PEI Policy initialization.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiSaPolicyInit.h"
 #include "PeiSaPolicyInit.h"
-
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   PcieCardResetWorkAround performs PCIe Card reset on root port
   PcieCardResetWorkAround performs PCIe Card reset on root port

+ 2 - 1
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.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -25,6 +25,7 @@
 #include <Library/CnviLib.h>
 #include <Library/CnviLib.h>
 #include <Register/PchRegsLpcCnl.h>
 #include <Register/PchRegsLpcCnl.h>
 #include <PcieDeviceOverrideTable.h>
 #include <PcieDeviceOverrideTable.h>
+#include <Library/ConfigBlockLib.h>
 
 
 VOID
 VOID
 UpdatePcieClockInfo (
 UpdatePcieClockInfo (

+ 1 - 2
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPchPolicyUpdate.h

@@ -1,6 +1,6 @@
 /** @file
 /** @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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -18,7 +18,6 @@
 #include <Library/IoLib.h>
 #include <Library/IoLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Ppi/SiPolicy.h>
 #include <Ppi/SiPolicy.h>
-#include <Library/ConfigBlockLib.h>
 #include <PlatformBoardConfig.h>
 #include <PlatformBoardConfig.h>
 
 
 #endif
 #endif

+ 2 - 1
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.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -16,6 +16,7 @@
 #include <Library/PchPcieRpLib.h>
 #include <Library/PchPcieRpLib.h>
 #include <Library/DebugLib.h>
 #include <Library/DebugLib.h>
 #include <Library/PchPolicyLib.h>
 #include <Library/PchPolicyLib.h>
+#include <Library/ConfigBlockLib.h>
 
 
 //
 //
 // Sawtooth Peak
 // Sawtooth Peak

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf

@@ -2,7 +2,7 @@
 # Module Information file for PEI PolicyUpdateLib Library
 # 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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -52,6 +52,7 @@
   SecurityPkg/SecurityPkg.dec
   SecurityPkg/SecurityPkg.dec
   IntelSiliconPkg/IntelSiliconPkg.dec
   IntelSiliconPkg/IntelSiliconPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [FixedPcd]
 [FixedPcd]
   gSiPkgTokenSpaceGuid.PcdTsegSize                             ## CONSUMES
   gSiPkgTokenSpaceGuid.PcdTsegSize                             ## CONSUMES

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSaPolicyUpdate.c

@@ -2,7 +2,7 @@
 Do Platform Stage System Agent initialization.
 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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -21,6 +21,7 @@ Do Platform Stage System Agent initialization.
 #include <Library/PeiSaPolicyLib.h>
 #include <Library/PeiSaPolicyLib.h>
 #include <GpioPinsCnlLp.h>
 #include <GpioPinsCnlLp.h>
 #include <GpioPinsCnlH.h>
 #include <GpioPinsCnlH.h>
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   UpdatePeiSaPolicy performs SA PEI Policy initialization
   UpdatePeiSaPolicy performs SA PEI Policy initialization

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSaPolicyUpdatePreMem.c

@@ -2,7 +2,7 @@
   Platform Stage System Agent initialization.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 
 
 **/
 **/
@@ -22,6 +22,7 @@
 #include <Library/MemoryAllocationLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/PeiSaPolicyLib.h>
 #include <Library/PeiSaPolicyLib.h>
 #include <Library/GpioLib.h>
 #include <Library/GpioLib.h>
+#include <Library/ConfigBlockLib.h>
 
 
 ///
 ///
 /// Memory Reserved should be between 125% to 150% of the Current required memory
 /// Memory Reserved should be between 125% to 150% of the Current required memory

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSiPolicyUpdate.c

@@ -3,7 +3,7 @@
   Platform Policy initialization.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -13,6 +13,7 @@
 #include <Library/PeiServicesLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/SiPolicyLib.h>
 #include <Library/SiPolicyLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/MemoryAllocationLib.h>
+#include <Library/ConfigBlockLib.h>
 
 
 STATIC SVID_SID_INIT_ENTRY mCdfSsidTablePtr[] = {
 STATIC SVID_SID_INIT_ENTRY mCdfSsidTablePtr[] = {
   //
   //

+ 1 - 2
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiSiPolicyUpdate.h

@@ -2,7 +2,7 @@
    Header file for PEI SiPolicyUpdate.
    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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -12,7 +12,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/PeiPlatformLib.h>
 #include <Library/PeiPlatformLib.h>
 #include <Library/DebugLib.h>
 #include <Library/DebugLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Ppi/SiPolicy.h>
 #include <Ppi/SiPolicy.h>
 
 
 #endif
 #endif

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPostMemLib.inf

@@ -2,7 +2,7 @@
 # Component information file for WhiskeylakeURvpInitLib in PEI post memory phase.
 # 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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -35,6 +35,7 @@
   MdeModulePkg/MdeModulePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   SecurityPkg/SecurityPkg.dec
   SecurityPkg/SecurityPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiWhiskeylakeURvpInitPostMemLib.c
   PeiWhiskeylakeURvpInitPostMemLib.c

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPreMemLib.inf

@@ -2,7 +2,7 @@
 # Component information file for PEI WhiskeylakeURvp Board Init Pre-Mem Library
 # 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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -31,6 +31,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiWhiskeylakeURvpDetect.c
   PeiWhiskeylakeURvpDetect.c

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf

@@ -2,7 +2,7 @@
 # Component information file for WhiskeylakeURvpInitLib in PEI post memory phase.
 # 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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -39,6 +39,7 @@
   MdeModulePkg/MdeModulePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   SecurityPkg/SecurityPkg.dec
   SecurityPkg/SecurityPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiWhiskeylakeURvpInitPostMemLib.c
   PeiWhiskeylakeURvpInitPostMemLib.c

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf

@@ -2,7 +2,7 @@
 # Component information file for PEI WhiskeylakeURvp Board Init Pre-Mem Library
 # 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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -40,6 +40,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   MdeModulePkg/MdeModulePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PeiWhiskeylakeURvpInitPreMemLib.c
   PeiWhiskeylakeURvpInitPreMemLib.c

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiWhiskeylakeURvpInitPostMemLib.c

@@ -1,6 +1,6 @@
 /** @file
 /** @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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -31,6 +31,7 @@
 #include <Library/PchInfoLib.h>
 #include <Library/PchInfoLib.h>
 #include <FirwmareConfigurations.h>
 #include <FirwmareConfigurations.h>
 #include "WhiskeylakeURvpInit.h"
 #include "WhiskeylakeURvpInit.h"
+#include <Library/ConfigBlockLib.h>
 
 
 EFI_STATUS
 EFI_STATUS
 BoardFunctionInit (
 BoardFunctionInit (

+ 1 - 2
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxePolicyBoardConfig.h

@@ -2,7 +2,7 @@
  Header file for DxePolicyBoardConfig library instance.
  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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -12,7 +12,6 @@
 #include <PiDxe.h>
 #include <PiDxe.h>
 #include <Library/DebugLib.h>
 #include <Library/DebugLib.h>
 #include <Library/HobLib.h>
 #include <Library/HobLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Library/DxePolicyBoardConfigLib.h>
 #include <Library/DxePolicyBoardConfigLib.h>
 
 
 
 

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxePolicyBoardConfigLib.inf

@@ -2,7 +2,7 @@
 # Module Information file for DxePolicyBoardConfigLib Library
 # 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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -28,6 +28,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [LibraryClasses]
 [LibraryClasses]
   UefiBootServicesTableLib
   UefiBootServicesTableLib

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/DxePolicyBoardConfigLib/DxeSaPolicyBoardConfig.c

@@ -2,11 +2,12 @@
  Intel DXE SA Policy update by board configuration
  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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "DxePolicyBoardConfig.h"
 #include "DxePolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   This function performs DXE SA Policy update by board configuration.
   This function performs DXE SA Policy update by board configuration.

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPlatformHookLib/PeiPlatformHooklib.inf

@@ -1,6 +1,6 @@
 ## @file
 ## @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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -38,6 +38,7 @@
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Pcd]
 [Pcd]
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress                        ## CONSUMES
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress                        ## CONSUMES

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiCpuPolicyBoardConfig.c

@@ -2,11 +2,12 @@
  Intel PEI CPU Policy update by board configuration
  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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiPolicyBoardConfig.h"
 #include "PeiPolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   This function performs PEI CPU Policy update by board configuration.
   This function performs PEI CPU Policy update by board configuration.

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiMePolicyBoardConfig.c

@@ -2,11 +2,12 @@
  Intel PEI ME Policy update by board configuration
  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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiPolicyBoardConfig.h"
 #include "PeiPolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   This function performs PEI ME Policy update by board configuration.
   This function performs PEI ME Policy update by board configuration.

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiMePolicyBoardConfigPreMem.c

@@ -2,11 +2,12 @@
  Intel PEI ME Pre-Memory Policy update by board configuration
  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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiPolicyBoardConfig.h"
 #include "PeiPolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   This function performs PEI ME Pre-Memory Policy update by board configuration.
   This function performs PEI ME Pre-Memory Policy update by board configuration.

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPchPolicyBoardConfig.c

@@ -2,11 +2,12 @@
  Intel PEI PCH Policy update by board configuration
  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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiPolicyBoardConfig.h"
 #include "PeiPolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   This function performs PEI PCH Policy update by board configuration.
   This function performs PEI PCH Policy update by board configuration.

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPchPolicyBoardConfigPreMem.c

@@ -2,11 +2,12 @@
  Intel PEI PCH Pre-Memory Policy update by board configuration
  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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiPolicyBoardConfig.h"
 #include "PeiPolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   This function performs PEI PCH Pre-Memory Policy update by board configuration.
   This function performs PEI PCH Pre-Memory Policy update by board configuration.

+ 1 - 2
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPolicyBoardConfig.h

@@ -2,7 +2,7 @@
  Header file for PeiPolicyBoardConfig library instance.
  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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
@@ -14,7 +14,6 @@
 #include <Library/PeiServicesLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/DebugLib.h>
 #include <Library/DebugLib.h>
 #include <Library/HobLib.h>
 #include <Library/HobLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Library/PeiPolicyBoardConfigLib.h>
 #include <Library/PeiPolicyBoardConfigLib.h>
 #include <Library/IoLib.h>
 #include <Library/IoLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseMemoryLib.h>

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiPolicyBoardConfigLib.inf

@@ -2,7 +2,7 @@
 # Module Information file for PeiPolicyBoardConfigLib Library
 # 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
 #  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -34,6 +34,7 @@
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
   SecurityPkg/SecurityPkg.dec
   SecurityPkg/SecurityPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
   MinPlatformPkg/MinPlatformPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [LibraryClasses]
 [LibraryClasses]
   PcdLib
   PcdLib

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiSaPolicyBoardConfig.c

@@ -2,11 +2,12 @@
  Intel PEI SA Policy update by board configuration
  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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiPolicyBoardConfig.h"
 #include "PeiPolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   This function performs PEI SA Policy update by board configuration.
   This function performs PEI SA Policy update by board configuration.

+ 2 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPolicyBoardConfigLib/PeiSaPolicyBoardConfigPreMem.c

@@ -2,11 +2,12 @@
  Intel PEI SA Pre-Memory Policy update by board configuration
  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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiPolicyBoardConfig.h"
 #include "PeiPolicyBoardConfig.h"
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   This function performs PEI SA Pre-Memory Policy update by board configuration.
   This function performs PEI SA Pre-Memory Policy update by board configuration.

+ 3 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component description file for the PeiCpuPolicyLib library.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -28,11 +28,13 @@ SaPlatformLib
 SiConfigBlockLib
 SiConfigBlockLib
 PostCodeLib
 PostCodeLib
 PcdLib
 PcdLib
+ConfigBlockLib
 
 
 [Packages]
 [Packages]
 MdePkg/MdePkg.dec
 MdePkg/MdePkg.dec
 UefiCpuPkg/UefiCpuPkg.dec
 UefiCpuPkg/UefiCpuPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
 PeiCpuPolicyLib.c
 PeiCpuPolicyLib.c

+ 1 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibPreMem.c

@@ -1,14 +1,13 @@
 /** @file
 /** @file
   This file is PeiCpuPolicyLibPreMem library.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiCpuPolicyLibrary.h"
 #include "PeiCpuPolicyLibrary.h"
 #include <Library/PciSegmentLib.h>
 #include <Library/PciSegmentLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Library/PostCodeLib.h>
 #include <Library/PostCodeLib.h>
 #include <Library/SaPlatformLib.h>
 #include <Library/SaPlatformLib.h>
 
 

+ 3 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Cpu/Library/PeiCpuPolicyLib/PeiCpuPolicyLibPreMem.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component description file for the PeiCpuPolicyLibPreMem library.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -24,11 +24,13 @@ MemoryAllocationLib
 CpuPlatformLib
 CpuPlatformLib
 SiConfigBlockLib
 SiConfigBlockLib
 PostCodeLib
 PostCodeLib
+ConfigBlockLib
 
 
 [Packages]
 [Packages]
 MdePkg/MdePkg.dec
 MdePkg/MdePkg.dec
 UefiCpuPkg/UefiCpuPkg.dec
 UefiCpuPkg/UefiCpuPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
 PeiCpuPolicyLib.c
 PeiCpuPolicyLib.c

+ 2 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Library/BaseSiConfigBlockLib/BaseSiConfigBlockLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component description file for the BaseSiConfigBlockLib library.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -25,7 +25,7 @@ ConfigBlockLib
 [Packages]
 [Packages]
 MdePkg/MdePkg.dec
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
 BaseSiConfigBlockLib.c
 BaseSiConfigBlockLib.c

+ 2 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.c

@@ -2,13 +2,14 @@
   This file is PeiSiPolicyLib library creates default settings of RC
   This file is PeiSiPolicyLib library creates default settings of RC
   Policy and installs RC Policy PPI.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiSiPolicyLibrary.h"
 #include "PeiSiPolicyLibrary.h"
 #include <Library/PcdLib.h>
 #include <Library/PcdLib.h>
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   Get Si config block table total size.
   Get Si config block table total size.

+ 2 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component description file for the PeiSiPolicyLib library.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -32,7 +32,7 @@ PcdLib
 [Packages]
 [Packages]
 MdePkg/MdePkg.dec
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
 PeiSiPolicyLib.c
 PeiSiPolicyLib.c

+ 2 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibPreMem.c

@@ -2,13 +2,14 @@
   This file is PeiSiPolicyLib library creates default settings of RC
   This file is PeiSiPolicyLib library creates default settings of RC
   Policy and installs RC Policy PPI.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiSiPolicyLibrary.h"
 #include "PeiSiPolicyLibrary.h"
 #include <Base.h>
 #include <Base.h>
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   SiCreatePreMemConfigBlocks creates the config blocksg of Silicon PREMEM Policy.
   SiCreatePreMemConfigBlocks creates the config blocksg of Silicon PREMEM Policy.

+ 1 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/PeiSiPolicyLibrary.h

@@ -1,7 +1,7 @@
 /** @file
 /** @file
   Header file for the PeiSiPolicyLib library.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
@@ -14,7 +14,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Ppi/SiPolicy.h>
 #include <Ppi/SiPolicy.h>
 #include <Library/SiPolicyLib.h>
 #include <Library/SiPolicyLib.h>
 #include <Library/PchPolicyLib.h>
 #include <Library/PchPolicyLib.h>

+ 2 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Library/PeiSiPolicyLib/SiPrintPolicy.c

@@ -1,12 +1,13 @@
 /** @file
 /** @file
   This file is PeiSiPolicyLib library for printing Policy settings.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiSiPolicyLibrary.h"
 #include "PeiSiPolicyLibrary.h"
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   Print whole SI_POLICY_PPI and serial out.
   Print whole SI_POLICY_PPI and serial out.

+ 1 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Me/Include/Library/PeiMePolicyLib.h

@@ -1,7 +1,7 @@
 /** @file
 /** @file
   Prototype of the MePolicyLibPei library.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
@@ -10,7 +10,6 @@
 #define _PEI_ME_POLICY_LIB_H_
 #define _PEI_ME_POLICY_LIB_H_
 
 
 #include <Ppi/SiPolicy.h>
 #include <Ppi/SiPolicy.h>
-#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   This function prints the PEI phase PreMem policy.
   This function prints the PEI phase PreMem policy.

+ 2 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.c

@@ -1,12 +1,13 @@
 /** @file
 /** @file
   This file is PeiMePolicy library.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiMePolicyLibrary.h"
 #include "PeiMePolicyLibrary.h"
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   Load default settings for ME config block in pre-mem phase.
   Load default settings for ME config block in pre-mem phase.

+ 2 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component description file for the PeiMePolicyLib libbrary.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -28,6 +28,7 @@ ConfigBlockLib
 [Packages]
 [Packages]
 MdePkg/MdePkg.dec
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
 PeiMePolicyLib.c
 PeiMePolicyLib.c

+ 1 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Me/Library/PeiMePolicyLib/PeiMePolicyLibrary.h

@@ -1,7 +1,7 @@
 /** @file
 /** @file
   Header file for the PeiMePolicy library.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
@@ -18,7 +18,6 @@
 #include <Library/PeiMePolicyLib.h>
 #include <Library/PeiMePolicyLib.h>
 #include <ConfigBlock.h>
 #include <ConfigBlock.h>
 #include <ConfigBlock/MePeiConfig.h>
 #include <ConfigBlock/MePeiConfig.h>
-#include <Library/ConfigBlockLib.h>
 #include <Library/SiConfigBlockLib.h>
 #include <Library/SiConfigBlockLib.h>
 #include <MkhiMsgs.h>
 #include <MkhiMsgs.h>
 
 

+ 1 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Include/Protocol/PchPolicy.h

@@ -1,7 +1,7 @@
 /** @file
 /** @file
   Interface definition details between Pch and platform drivers during DXE phase.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
@@ -10,7 +10,6 @@
 #define _PCH_POLICY_H_
 #define _PCH_POLICY_H_
 
 
 #include <ConfigBlock.h>
 #include <ConfigBlock.h>
-#include <Library/ConfigBlockLib.h>
 #include <Private/PchConfigHob.h>
 #include <Private/PchConfigHob.h>
 #include <Library/HobLib.h>
 #include <Library/HobLib.h>
 
 

+ 2 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/DxePchPolicyLib/DxePchPolicyLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component description file for the PeiPchPolicy library.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -28,6 +28,7 @@ PchInfoLib
 [Packages]
 [Packages]
 MdePkg/MdePkg.dec
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
 DxePchPolicyLib.c
 DxePchPolicyLib.c

+ 2 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPreMemPrintPolicy.c

@@ -1,12 +1,13 @@
 /** @file
 /** @file
   Print whole PCH_PREMEM_POLICY_PPI
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiPchPolicyLibrary.h"
 #include "PeiPchPolicyLibrary.h"
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   Print PCH_GENERAL_PREMEM_CONFIG and serial out.
   Print PCH_GENERAL_PREMEM_CONFIG and serial out.

+ 2 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PchPrintPolicy.c

@@ -1,13 +1,14 @@
 /** @file
 /** @file
   Print whole PCH_POLICY_PPI
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiPchPolicyLibrary.h"
 #include "PeiPchPolicyLibrary.h"
 #include <Private/PchHsio.h>
 #include <Private/PchHsio.h>
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   Print USB_CONFIG and serial out.
   Print USB_CONFIG and serial out.

+ 2 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLib.c

@@ -1,7 +1,7 @@
 /** @file
 /** @file
   This file is PeiPchPolicy library.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
@@ -10,6 +10,7 @@
 #include <Library/PchPcieRpLib.h>
 #include <Library/PchPcieRpLib.h>
 #include <Library/CpuPlatformLib.h>
 #include <Library/CpuPlatformLib.h>
 #include <Register/PchRegsLpcCnl.h>
 #include <Register/PchRegsLpcCnl.h>
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   mPxRcConfig[] table contains data for 8259 routing (how PIRQx is mapped to IRQy).
   mPxRcConfig[] table contains data for 8259 routing (how PIRQx is mapped to IRQy).

+ 2 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibCnl.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component description file for the PeiPchPolicy libbrary.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -33,7 +33,7 @@ CpuPlatformLib
 [Packages]
 [Packages]
 MdePkg/MdePkg.dec
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Pcd]
 [Pcd]
 gSiPkgTokenSpaceGuid.PcdSmbusBaseAddress
 gSiPkgTokenSpaceGuid.PcdSmbusBaseAddress

+ 1 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPolicyLibrary.h

@@ -1,7 +1,7 @@
 /** @file
 /** @file
   Header file for the PeiPchPolicy library.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
@@ -14,7 +14,6 @@
 #include <Library/BaseMemoryLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/PeiServicesLib.h>
 #include <Library/MemoryAllocationLib.h>
 #include <Library/MemoryAllocationLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Library/SiConfigBlockLib.h>
 #include <Library/SiConfigBlockLib.h>
 #include <Library/PchInfoLib.h>
 #include <Library/PchInfoLib.h>
 #include <Library/SataLib.h>
 #include <Library/SataLib.h>

+ 2 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/PeiPchPolicyLib/PeiPchPreMemPolicyLib.c

@@ -1,13 +1,14 @@
 /** @file
 /** @file
   This file is PeiPchPreMemPolicy library.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
 
 
 #include "PeiPchPolicyLibrary.h"
 #include "PeiPchPolicyLibrary.h"
 #include <Library/CpuPlatformLib.h>
 #include <Library/CpuPlatformLib.h>
+#include <Library/ConfigBlockLib.h>
 
 
 /**
 /**
   Load Config block default
   Load Config block default

+ 2 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLib/PeiDxeSmmPchDmiLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 #  Component description file for the PeiDxeSmmPchDmiLib
 #  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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -31,7 +31,7 @@ LIBRARY_CLASS                  = PchDmiLib
 [Packages]
 [Packages]
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
-
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PchDmiLib.c
   PchDmiLib.c

+ 2 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchDmiLib/PeiDxeSmmPchDmiWithS3Lib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 #  Component description file for the PeiDxeSmmPchDmiWithS3Lib
 #  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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -33,7 +33,7 @@ LIBRARY_CLASS                  = PchDmiWithS3Lib
 [Packages]
 [Packages]
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
-
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
   PchDmiWithS3Lib.c
   PchDmiWithS3Lib.c

+ 2 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchInitCommonLib/PeiDxeSmmPchInitCommonLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 #  Component description file for the PchInitCommonLib
 #  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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -21,6 +21,7 @@
 [Packages]
 [Packages]
   MdePkg/MdePkg.dec
   MdePkg/MdePkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
   CoffeelakeSiliconPkg/SiPkg.dec
+  IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [LibraryClasses]
 [LibraryClasses]
   IoLib
   IoLib

+ 2 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPchPciExpressHelpersLib/PeiDxeSmmPchPciExpressHelpersLib.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component description file for the PeiDxeSmmPchPciExpressHelpersLib
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -35,7 +35,7 @@ PchInitCommonLib
 [Packages]
 [Packages]
 MdePkg/MdePkg.dec
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
 PchPciExpressHelpersLibrary.c
 PchPciExpressHelpersLibrary.c

+ 2 - 2
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,
 # All function in this library is available for PEI, DXE, and SMM,
 # But do not support UEFI RUNTIME environment call.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -36,7 +36,7 @@ BaseMemoryLib
 [Packages]
 [Packages]
 MdePkg/MdePkg.dec
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Pcd]
 [Pcd]
 gSiPkgTokenSpaceGuid.PcdAcpiBaseAddress
 gSiPkgTokenSpaceGuid.PcdAcpiBaseAddress

+ 2 - 2
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,
 # All function in this library is available for PEI, DXE, and SMM,
 # But do not support UEFI RUNTIME environment call.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -33,7 +33,7 @@ S3BootScriptLib
 [Packages]
 [Packages]
 MdePkg/MdePkg.dec
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
 PmcPrivateLibWithS3.c
 PmcPrivateLibWithS3.c

+ 2 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Pch/Library/Private/PeiDxeSmmPmcPrivateLib/PeiPmcPrivateLibCnl.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # PEI PCH PMC Private Lib for Cannon Lake PCH.
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -35,6 +35,7 @@ PeiItssLib
 [Packages]
 [Packages]
 MdePkg/MdePkg.dec
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Sources]
 [Sources]
 PeiPmcPrivateLib.c
 PeiPmcPrivateLib.c

+ 2 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchAcpi.c

@@ -1,7 +1,7 @@
 /** @file
 /** @file
   This is the driver that initializes the Intel PCH.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
@@ -34,6 +34,7 @@
 #include <TraceHubCommonConfig.h>
 #include <TraceHubCommonConfig.h>
 #include <PchReservedResources.h>
 #include <PchReservedResources.h>
 #include <Register/PchRegsTraceHub.h>
 #include <Register/PchRegsTraceHub.h>
+#include <Library/ConfigBlockLib.h>
 
 
 //
 //
 // Module variables
 // Module variables

+ 2 - 1
Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchHdaAcpi.c

@@ -1,7 +1,7 @@
 /** @file
 /** @file
   Initializes the PCH HD Audio ACPI Tables.
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
@@ -13,6 +13,7 @@
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/UefiLib.h>
 #include <Library/UefiLib.h>
 #include <Protocol/AcpiTable.h>
 #include <Protocol/AcpiTable.h>
+#include <Library/ConfigBlockLib.h>
 
 
 #include "PchInit.h"
 #include "PchInit.h"
 #include <Protocol/PchPolicy.h>
 #include <Protocol/PchPolicy.h>

+ 2 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeCnl.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 # Component description file for Pch Initialization driver
 # 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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -55,7 +55,7 @@ DxeSaPolicyLib
 [Packages]
 [Packages]
 MdePkg/MdePkg.dec
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Pcd]
 [Pcd]
 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress

+ 2 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Dxe/PchInitDxeFspCnl.inf

@@ -1,7 +1,7 @@
 ## @file
 ## @file
 #  Component description file for Pch Initialization driver for FSP package
 #  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
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 #
@@ -48,7 +48,7 @@ BiosLockLib
 [Packages]
 [Packages]
 MdePkg/MdePkg.dec
 MdePkg/MdePkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
 CoffeelakeSiliconPkg/SiPkg.dec
-
+IntelSiliconPkg/IntelSiliconPkg.dec
 
 
 [Pcd]
 [Pcd]
 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
 gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress

+ 1 - 2
Silicon/Intel/CoffeelakeSiliconPkg/Pch/PchInit/Smm/PchInitSmm.h

@@ -1,7 +1,7 @@
 /** @file
 /** @file
   Header file for PCH Init SMM Handler
   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
   SPDX-License-Identifier: BSD-2-Clause-Patent
 **/
 **/
@@ -34,7 +34,6 @@
 #include <Library/GpioNativeLib.h>
 #include <Library/GpioNativeLib.h>
 #include <Library/PchEspiLib.h>
 #include <Library/PchEspiLib.h>
 #include <Library/PciSegmentLib.h>
 #include <Library/PciSegmentLib.h>
-#include <Library/ConfigBlockLib.h>
 #include <Private/Library/PchPciExpressHelpersLib.h>
 #include <Private/Library/PchPciExpressHelpersLib.h>
 #include <Protocol/PchPcieSmiDispatch.h>
 #include <Protocol/PchPcieSmiDispatch.h>
 #include <Protocol/PchTcoSmiDispatch.h>
 #include <Protocol/PchTcoSmiDispatch.h>

Some files were not shown because too many files changed in this diff