Browse Source

WhiskeylakeOpenBoardPkg: Assign unique token namespace

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

PCDs declared in the WhiskeylakeOpenBoardPkg currently use the GUID
gBoardModuleTokenSpaceGuid. The same name is used in other board
packages and a package has been added called BoardModulePkg so
this name is now misleading.

This change assigns a unique GUID value and a name specific to the
package to provide differentiation from PCDs in other board
packages.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Signed-off-by: Michael Kubacki <michael.a.kubacki@intel.com>
Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
Reviewed-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
Michael Kubacki 4 years ago
parent
commit
4b3bf5d6c1
21 changed files with 1051 additions and 1051 deletions
  1. 7 7
      Platform/Intel/WhiskeylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
  2. 13 13
      Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf
  3. 1 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf
  4. 1 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf
  5. 11 11
      Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf
  6. 37 37
      Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
  7. 7 7
      Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/PeiHdaVerbTableLib.inf
  8. 347 347
      Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
  9. 140 140
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf
  10. 82 82
      Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDxe.inf
  11. 6 6
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BasePlatformHookLib/BasePlatformHookLib.inf
  12. 1 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
  13. 1 1
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
  14. 7 7
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
  15. 56 56
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
  16. 113 113
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
  17. 162 162
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
  18. 33 33
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPlatformHookLib/PeiPlatformHooklib.inf
  19. 7 7
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc
  20. 2 2
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.fdf
  21. 17 17
      Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPcd.dsc

+ 7 - 7
Platform/Intel/WhiskeylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf

@@ -51,14 +51,14 @@
   gEfiGlobalNvsAreaProtocolGuid
 
 [Pcd]
-  gBoardModuleTokenSpaceGuid.PcdAcpiGnvsAddress
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiGnvsAddress
 
-  gBoardModuleTokenSpaceGuid.PcdAcpiSleepState
-  gBoardModuleTokenSpaceGuid.PcdAcpiHibernate
-  gBoardModuleTokenSpaceGuid.PcdLowPowerS0Idle
-  gBoardModuleTokenSpaceGuid.PcdDisableActiveTripPoints
-  gBoardModuleTokenSpaceGuid.PcdDisablePassiveTripPoints
-  gBoardModuleTokenSpaceGuid.PcdDisableCriticalTripPoints
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiSleepState
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiHibernate
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisableActiveTripPoints
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisablePassiveTripPoints
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisableCriticalTripPoints
 
 [Depex]
   gEfiAcpiTableProtocolGuid           AND

+ 13 - 13
Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf

@@ -40,19 +40,19 @@
 
 
 [Pcd]
-gBoardModuleTokenSpaceGuid.PcdDTbtSecurityMode           ## CONSUMES
-gBoardModuleTokenSpaceGuid.PcdDTbtWakeupSupport       ## CONSUMES
-gBoardModuleTokenSpaceGuid.PcdDTbtHotSMI              ## CONSUMES
-gBoardModuleTokenSpaceGuid.PcdDTbtHotNotify           ## CONSUMES
-gBoardModuleTokenSpaceGuid.PcdDTbtSetClkReq           ## CONSUMES
-gBoardModuleTokenSpaceGuid.PcdDTbtAspm                ## CONSUMES
-gBoardModuleTokenSpaceGuid.PcdDTbtAcDcSwitch          ## CONSUMES
-gBoardModuleTokenSpaceGuid.PcdRtd3Tbt                ## CONSUMES
-gBoardModuleTokenSpaceGuid.PcdRtd3TbtClkReq          ## CONSUMES
-gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax  ## CONSUMES
-gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemRsvd       ## CONSUMES
-gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax ## CONSUMES
-gBoardModuleTokenSpaceGuid.PcdDTbtPcieRpNumber
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtSecurityMode        ## CONSUMES
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtWakeupSupport       ## CONSUMES
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotSMI              ## CONSUMES
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotNotify           ## CONSUMES
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtSetClkReq           ## CONSUMES
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAspm                ## CONSUMES
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAcDcSwitch          ## CONSUMES
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3Tbt                 ## CONSUMES
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtClkReq           ## CONSUMES
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax   ## CONSUMES
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemRsvd        ## CONSUMES
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax  ## CONSUMES
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieRpNumber
 
 [Sources]
   TbtCommonLib.c

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

@@ -37,7 +37,7 @@ GpioLib
   IntelSiliconPkg/IntelSiliconPkg.dec
 
 [Pcd]
-gBoardModuleTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad    ## CONSUMES
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad    ## CONSUMES
 
 [Sources]
 PeiTbtPolicyLib.c

+ 1 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.inf

@@ -45,7 +45,7 @@
   CoffeelakeSiliconPkg/SiPkg.dec
 
 [Pcd]
-#  gBoardModuleTokenSpaceGuid.PcdSwSmiDTbtEnumerate ## CONSUMES
+#  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSwSmiDTbtEnumerate ## CONSUMES
   gMinPlatformPkgTokenSpaceGuid.PcdPciExpressRegionLength      ## CONSUMES
 
 [FixedPcd]

+ 11 - 11
Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyInitLib/PeiFspPolicyInitLib.inf

@@ -75,17 +75,17 @@
 [Pcd]
   gSiPkgTokenSpaceGuid.PcdTsegSize
   gSiPkgTokenSpaceGuid.PcdSmbusBaseAddress
-  gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget                 ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap                   ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMapSize               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram              ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize          ## CONSUMES
-  gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase              ## CONSUMES
-  gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamSize              ## CONSUMES
-  gIntelFsp2PkgTokenSpaceGuid.PcdFspTemporaryRamSize           ## CONSUMES
-  gIntelFsp2PkgTokenSpaceGuid.PcdFspReservedBufferSize         ## CONSUMES
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuApLoopMode                   ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor        ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget          ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap            ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMapSize        ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize   ## CONSUMES
+  gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase                   ## CONSUMES
+  gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamSize                   ## CONSUMES
+  gIntelFsp2PkgTokenSpaceGuid.PcdFspTemporaryRamSize                ## CONSUMES
+  gIntelFsp2PkgTokenSpaceGuid.PcdFspReservedBufferSize              ## CONSUMES
+  gUefiCpuPkgTokenSpaceGuid.PcdCpuApLoopMode                        ## CONSUMES
 
 [Ppis]
   gSiPolicyPpiGuid                        ## CONSUMES

+ 37 - 37
Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf

@@ -90,45 +90,45 @@
   PeiLib
 
 [Pcd]
-  gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget         ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap           ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram      ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdData
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdDataSize
-
-
-  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress      ## CONSUMES
-  gSiPkgTokenSpaceGuid.PcdSerialIoUartDebugEnable        ## CONSUMES
-  gSiPkgTokenSpaceGuid.PcdSerialIoUartNumber             ## CONSUMES
-  gSiPkgTokenSpaceGuid.PcdSmmbaseSwSmi                   ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdSaDdrFreqLimit           ## CONSUMES
-
-  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable1
-  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable2
-  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Size
-  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Size
-  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
-  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
-  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
-  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
-
-  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1
-  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2
-  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
-  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
-  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable1
-  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable2
-  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable1Size
-  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable2Size
-
-  gBoardModuleTokenSpaceGuid.PcdGraphicsVbtGuid
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget         ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap           ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram      ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize
+
+
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress         ## CONSUMES
+  gSiPkgTokenSpaceGuid.PcdSerialIoUartDebugEnable           ## CONSUMES
+  gSiPkgTokenSpaceGuid.PcdSerialIoUartNumber                ## CONSUMES
+  gSiPkgTokenSpaceGuid.PcdSmmbaseSwSmi                      ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDdrFreqLimit  ## CONSUMES
+
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Size
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Size
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
+
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1Size
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2Size
+
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGraphicsVbtGuid
 
   # SPD Address Table
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3
 
 [Guids]
   gFspNonVolatileStorageHobGuid                 ## CONSUMES

+ 7 - 7
Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/PeiHdaVerbTableLib.inf

@@ -59,10 +59,10 @@
   PcdLib
 
 [Pcd]
-  gBoardModuleTokenSpaceGuid.PcdHdaVerbTable                ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdHdaVerbTable2               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdExtHdaVerbTable             ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable1         ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable2         ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable3         ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdDisplayAudioHdaVerbTable    ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable                ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable2               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdExtHdaVerbTable             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable1         ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable2         ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable3         ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisplayAudioHdaVerbTable    ## CONSUMES

+ 347 - 347
Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec

@@ -26,7 +26,7 @@ WhiskeylakeURvp/Include
 
 [Guids]
 
-gBoardModuleTokenSpaceGuid            =  {0x72d1fff7, 0xa42a, 0x4219, {0xb9, 0x95, 0x5a, 0x67, 0x53, 0x6e, 0xa4, 0x2a}}
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid = {0xec265230, 0x3a23, 0x4650, {0xb7, 0xb6, 0x52, 0x1d, 0x33, 0xd6, 0x6f, 0x78}}
 
 gTianoLogoGuid                        =  {0x7BB28B99, 0x61BB, 0x11D5, {0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}}
 
@@ -72,8 +72,8 @@ gPeiTbtPolicyBoardInitDonePpiGuid     =  {0x970f9c60, 0x8547, 0x49d7, { 0xa4, 0x
 
 [PcdsFixedAtBuild]
 
-gBoardModuleTokenSpaceGuid.PcdLpcIoDecodeRange|0x0010|UINT16|0x10001004
-gBoardModuleTokenSpaceGuid.PchLpcIoEnableDecoding|0x3c03|UINT16|0x10001005
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcIoDecodeRange|0x0010|UINT16|0x10001004
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PchLpcIoEnableDecoding|0x3c03|UINT16|0x10001005
 
 gPlatformModuleTokenSpaceGuid.PcdDmiBaseAddress|0xFED18000|UINT64|0x90000003
 gPlatformModuleTokenSpaceGuid.PcdDmiMmioSize|0x1000|UINT32|0x90000004
@@ -102,455 +102,455 @@ gPlatformModuleTokenSpaceGuid.PcdRuntimeUpdateFvHeaderLength|0x48|UINT8|0x900000
 gPlatformModuleTokenSpaceGuid.PcdEcExtraIoBase|0x6A0|UINT16|0x20000505
 gPlatformModuleTokenSpaceGuid.PcdFspTemporaryRamSize|0x1000|UINT32|0x10001003
 
-gBoardModuleTokenSpaceGuid.PcdSmcExtSmiBitPosition|0x01|UINT8|0x90000015
-gBoardModuleTokenSpaceGuid.PcdLpcSioIndexPort|0x4e|UINT16|0x90000018
-gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort|0x164E|UINT16|0x9000001C
-gBoardModuleTokenSpaceGuid.PcdSioBaseAddress|0x0680|UINT16|0x9000001D
-gBoardModuleTokenSpaceGuid.PcdLpcSioDataPort|0x4f|UINT16|0x9000001F
-gBoardModuleTokenSpaceGuid.PcdLpcSioIndexDefaultPort|0x164E|UINT16|0x90000021
-gBoardModuleTokenSpaceGuid.PcdLpcSioDataDefaultPort|0x164F|UINT16|0x90000022
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmcExtSmiBitPosition|0x01|UINT8|0x90000015
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioIndexPort|0x4e|UINT16|0x90000018
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort|0x164E|UINT16|0x9000001C
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSioBaseAddress|0x0680|UINT16|0x9000001D
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioDataPort|0x4f|UINT16|0x9000001F
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioIndexDefaultPort|0x164E|UINT16|0x90000021
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioDataDefaultPort|0x164F|UINT16|0x90000022
 
 [PcdsDynamic]
 # Board GPIO Table
-gBoardModuleTokenSpaceGuid.PcdBoardGpioTable|0|UINT32|0x00000040
-gBoardModuleTokenSpaceGuid.PcdBoardGpioTableSize|0|UINT16|0x00000041
-gBoardModuleTokenSpaceGuid.PcdBoardGpioTable2|0|UINT32|0x00000042
-gBoardModuleTokenSpaceGuid.PcdBoardGpioTable2Size|0|UINT16|0x00000043
-gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMem|0|UINT32|0x000000113
-gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMemSize|0|UINT16|0x000000114
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable|0|UINT32|0x00000040
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableSize|0|UINT16|0x00000041
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable2|0|UINT32|0x00000042
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable2Size|0|UINT16|0x00000043
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMem|0|UINT32|0x000000113
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMemSize|0|UINT16|0x000000114
 
 # Board Expander GPIO Table
-gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable|0|UINT32|0x00000044
-gBoardModuleTokenSpaceGuid.PcdGpioExpanderTableSize|0|UINT16|0x00000045
-gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable2|0|UINT32|0x00000046
-gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable2Size|0|UINT16|0x00000047
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable|0|UINT32|0x00000044
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTableSize|0|UINT16|0x00000045
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable2|0|UINT32|0x00000046
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable2Size|0|UINT16|0x00000047
 
 # TouchPanel & SDHC CD GPIO Table
-gBoardModuleTokenSpaceGuid.PcdBoardGpioTableTouchPanel|0|UINT32|0x00000048
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableTouchPanel|0|UINT32|0x00000048
 
 # PCH-LP HSIO PTSS Table
-gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable1|0|UINT32|0x0000004A
-gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable2|0|UINT32|0x0000004B
-gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Size|0|UINT16|0x0000004C
-gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Size|0|UINT16|0x0000004D
-gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1|0|UINT32|0x0000004E
-gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2|0|UINT32|0x0000004F
-gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size|0|UINT16|0x00000050
-gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size|0|UINT16|0x00000051
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1|0|UINT32|0x0000004A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2|0|UINT32|0x0000004B
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Size|0|UINT16|0x0000004C
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Size|0|UINT16|0x0000004D
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1|0|UINT32|0x0000004E
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2|0|UINT32|0x0000004F
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size|0|UINT16|0x00000050
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size|0|UINT16|0x00000051
 
 # PCH-H HSIO PTSS Table
-gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1|0|UINT32|0x00000052
-gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2|0|UINT32|0x00000053
-gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size|0|UINT16|0x00000054
-gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size|0|UINT16|0x00000055
-gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable1|0|UINT32|0x00000056
-gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable2|0|UINT32|0x00000057
-gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable1Size|0|UINT16|0x00000058
-gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable2Size|0|UINT16|0x00000059
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1|0|UINT32|0x00000052
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2|0|UINT32|0x00000053
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size|0|UINT16|0x00000054
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size|0|UINT16|0x00000055
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1|0|UINT32|0x00000056
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2|0|UINT32|0x00000057
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1Size|0|UINT16|0x00000058
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2Size|0|UINT16|0x00000059
 
 # HDA Verb Table
-gBoardModuleTokenSpaceGuid.PcdHdaVerbTable|0|UINT32|0x0000005A
-gBoardModuleTokenSpaceGuid.PcdHdaVerbTable2|0|UINT32|0x0000005B
-gBoardModuleTokenSpaceGuid.PcdExtHdaVerbTable|0|UINT32|0x0000005C
-gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable1|0|UINT32|0x0000005D
-gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable2|0|UINT32|0x0000005E
-gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable3|0|UINT32|0x0000005F
-gBoardModuleTokenSpaceGuid.PcdDisplayAudioHdaVerbTable|0|UINT32|0x00000060
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable|0|UINT32|0x0000005A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable2|0|UINT32|0x0000005B
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdExtHdaVerbTable|0|UINT32|0x0000005C
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable1|0|UINT32|0x0000005D
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable2|0|UINT32|0x0000005E
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable3|0|UINT32|0x0000005F
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisplayAudioHdaVerbTable|0|UINT32|0x00000060
 
 # SA Misc Configuration
-gBoardModuleTokenSpaceGuid.PcdSaMiscUserBd|0|UINT8|0x00000066
-gBoardModuleTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment|0|UINT16|0x00000067
-gBoardModuleTokenSpaceGuid.PcdSaDdrFreqLimit|0|UINT16|0x00000101
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscUserBd|0|UINT8|0x00000066
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment|0|UINT16|0x00000067
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDdrFreqLimit|0|UINT16|0x00000101
 
 # DRAM Configuration
-gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor|0|UINT32|0x00000068
-gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget|0|UINT32|0x00000069
-gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap|0|UINT32|0x0000006A
-gBoardModuleTokenSpaceGuid.PcdMrcDqByteMapSize|0|UINT16|0x0000006B
-gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram|0|UINT32|0x0000006C
-gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize|0|UINT16|0x0000006D
-gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleavedControl|FALSE|BOOLEAN|0x0000006E
-gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleaved|FALSE|BOOLEAN|0x0000006F
-gBoardModuleTokenSpaceGuid.PcdMrcSpdData|0|UINT32|0x00000070
-gBoardModuleTokenSpaceGuid.PcdMrcSpdDataSize|0|UINT16|0x00000071
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor|0|UINT32|0x00000068
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget|0|UINT32|0x00000069
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap|0|UINT32|0x0000006A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMapSize|0|UINT16|0x0000006B
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram|0|UINT32|0x0000006C
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize|0|UINT16|0x0000006D
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleavedControl|FALSE|BOOLEAN|0x0000006E
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleaved|FALSE|BOOLEAN|0x0000006F
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData|0|UINT32|0x00000070
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize|0|UINT16|0x00000071
 
 # PEG RESET GPIO
-gBoardModuleTokenSpaceGuid.PcdPegGpioResetControl|FALSE|BOOLEAN|0x00000072
-gBoardModuleTokenSpaceGuid.PcdPegGpioResetSupoort|FALSE|BOOLEAN|0x00000073
-gBoardModuleTokenSpaceGuid.PcdPcie0WakeGpioNo|0|UINT32|0x00000079
-gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstExpanderNo|0|UINT8|0x0000007A
-gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstGpioNo|0|UINT32|0x0000007B
-gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstActive|FALSE|BOOLEAN|0x0000007C
-gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo|0|UINT8|0x0000007D
-gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableGpioNo|0|UINT32|0x0000007E
-gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableActive|FALSE|BOOLEAN|0x0000007F
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPegGpioResetControl|FALSE|BOOLEAN|0x00000072
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPegGpioResetSupoort|FALSE|BOOLEAN|0x00000073
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0WakeGpioNo|0|UINT32|0x00000079
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstExpanderNo|0|UINT8|0x0000007A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstGpioNo|0|UINT32|0x0000007B
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstActive|FALSE|BOOLEAN|0x0000007C
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo|0|UINT8|0x0000007D
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableGpioNo|0|UINT32|0x0000007E
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableActive|FALSE|BOOLEAN|0x0000007F
 
 # SPD Address Table
-gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0|0|UINT8|0x00000099
-gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1|0|UINT8|0x0000009A
-gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2|0|UINT8|0x0000009B
-gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3|0|UINT8|0x0000009C
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0|0|UINT8|0x00000099
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1|0|UINT8|0x0000009A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2|0|UINT8|0x0000009B
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3|0|UINT8|0x0000009C
 
 # CA Vref Configuration
-gBoardModuleTokenSpaceGuid.PcdMrcCaVrefConfig|0|UINT8|0x0000009D
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcCaVrefConfig|0|UINT8|0x0000009D
 
 # USB 2.0 Port AFE
-gBoardModuleTokenSpaceGuid.PcdUsb20Port0Afe|0|UINT32|0x000000BF
-gBoardModuleTokenSpaceGuid.PcdUsb20Port1Afe|0|UINT32|0x000000C0
-gBoardModuleTokenSpaceGuid.PcdUsb20Port2Afe|0|UINT32|0x000000C1
-gBoardModuleTokenSpaceGuid.PcdUsb20Port3Afe|0|UINT32|0x000000C2
-gBoardModuleTokenSpaceGuid.PcdUsb20Port4Afe|0|UINT32|0x000000C3
-gBoardModuleTokenSpaceGuid.PcdUsb20Port5Afe|0|UINT32|0x000000C4
-gBoardModuleTokenSpaceGuid.PcdUsb20Port6Afe|0|UINT32|0x000000C5
-gBoardModuleTokenSpaceGuid.PcdUsb20Port7Afe|0|UINT32|0x000000C6
-gBoardModuleTokenSpaceGuid.PcdUsb20Port8Afe|0|UINT32|0x000000C7
-gBoardModuleTokenSpaceGuid.PcdUsb20Port9Afe|0|UINT32|0x000000C8
-gBoardModuleTokenSpaceGuid.PcdUsb20Port10Afe|0|UINT32|0x000000C9
-gBoardModuleTokenSpaceGuid.PcdUsb20Port11Afe|0|UINT32|0x000000CA
-gBoardModuleTokenSpaceGuid.PcdUsb20Port12Afe|0|UINT32|0x000000CB
-gBoardModuleTokenSpaceGuid.PcdUsb20Port13Afe|0|UINT32|0x000000CC
-gBoardModuleTokenSpaceGuid.PcdUsb20Port14Afe|0|UINT32|0x000000CD
-gBoardModuleTokenSpaceGuid.PcdUsb20Port15Afe|0|UINT32|0x000000CE
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port0Afe|0|UINT32|0x000000BF
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port1Afe|0|UINT32|0x000000C0
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port2Afe|0|UINT32|0x000000C1
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port3Afe|0|UINT32|0x000000C2
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port4Afe|0|UINT32|0x000000C3
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port5Afe|0|UINT32|0x000000C4
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port6Afe|0|UINT32|0x000000C5
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port7Afe|0|UINT32|0x000000C6
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port8Afe|0|UINT32|0x000000C7
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port9Afe|0|UINT32|0x000000C8
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port10Afe|0|UINT32|0x000000C9
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port11Afe|0|UINT32|0x000000CA
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port12Afe|0|UINT32|0x000000CB
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port13Afe|0|UINT32|0x000000CC
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port14Afe|0|UINT32|0x000000CD
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port15Afe|0|UINT32|0x000000CE
 
 # USB 2.0 Port Over Current Pin
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort0|0|UINT8|0x000000CF
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort1|0|UINT8|0x000000D0
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort2|0|UINT8|0x000000D1
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort3|0|UINT8|0x000000D2
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort4|0|UINT8|0x000000D3
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort5|0|UINT8|0x000000D4
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort6|0|UINT8|0x000000D5
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort7|0|UINT8|0x000000D6
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort8|0|UINT8|0x000000D7
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort9|0|UINT8|0x000000D8
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort10|0|UINT8|0x000000D9
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort11|0|UINT8|0x000000DA
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort12|0|UINT8|0x000000DB
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort13|0|UINT8|0x000000DC
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort14|0|UINT8|0x000000DD
-gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort15|0|UINT8|0x000000DE
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort0|0|UINT8|0x000000CF
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort1|0|UINT8|0x000000D0
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort2|0|UINT8|0x000000D1
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort3|0|UINT8|0x000000D2
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort4|0|UINT8|0x000000D3
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort5|0|UINT8|0x000000D4
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort6|0|UINT8|0x000000D5
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort7|0|UINT8|0x000000D6
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort8|0|UINT8|0x000000D7
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort9|0|UINT8|0x000000D8
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort10|0|UINT8|0x000000D9
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort11|0|UINT8|0x000000DA
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort12|0|UINT8|0x000000DB
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort13|0|UINT8|0x000000DC
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort14|0|UINT8|0x000000DD
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort15|0|UINT8|0x000000DE
 
 # USB 3.0 Port Over Current Pin
-gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort0|0|UINT8|0x000000DF
-gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort1|0|UINT8|0x000000E0
-gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort2|0|UINT8|0x000000E1
-gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort3|0|UINT8|0x000000E2
-gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort4|0|UINT8|0x000000E3
-gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort5|0|UINT8|0x000000E4
-gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort6|0|UINT8|0x000000E5
-gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort7|0|UINT8|0x000000E6
-gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort8|0|UINT8|0x000000E7
-gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort9|0|UINT8|0x000000E8
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort0|0|UINT8|0x000000DF
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort1|0|UINT8|0x000000E0
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort2|0|UINT8|0x000000E1
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort3|0|UINT8|0x000000E2
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort4|0|UINT8|0x000000E3
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort5|0|UINT8|0x000000E4
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort6|0|UINT8|0x000000E5
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort7|0|UINT8|0x000000E6
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort8|0|UINT8|0x000000E7
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort9|0|UINT8|0x000000E8
 
 # Misc
-gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent|FALSE|BOOLEAN|0x000000EC
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent|FALSE|BOOLEAN|0x000000EC
 
 # TBT
-gBoardModuleTokenSpaceGuid.PcdDTbtGpioLevel |0|BOOLEAN|0x000000F3
-gBoardModuleTokenSpaceGuid.PcdDTbtForcepowerGpioPad |0|UINT32|0x000000F4
-gBoardModuleTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad |0|UINT32|0x000000F5
-gBoardModuleTokenSpaceGuid.PcdDTbtWakeupSupport |0|UINT8|0x000000FA
-gBoardModuleTokenSpaceGuid.PcdDTbtHotSMI |0|UINT8|0x000000FB
-gBoardModuleTokenSpaceGuid.PcdDTbtHotNotify |0|UINT8|0x000000FC
-gBoardModuleTokenSpaceGuid.PcdDTbtSetClkReq|0|UINT8|0x000000FD
-gBoardModuleTokenSpaceGuid.PcdDTbtAspm |0|UINT8|0x000000FE
-gBoardModuleTokenSpaceGuid.PcdDTbtLtr | 0 | UINT8| 0x00000116
-gBoardModuleTokenSpaceGuid.PcdDTbtAcDcSwitch |0|UINT8|0x000000FF
-gBoardModuleTokenSpaceGuid.PcdRtd3Tbt |0|UINT8|0x00000100
-gBoardModuleTokenSpaceGuid.PcdRtd3TbtClkReq |0|UINT8|0x0000010A
-gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax |0|UINT8|0x00000107
-gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemRsvd |0|UINT16|0x00000108
-gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax |0|UINT8|0x00000109
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpioLevel |0|BOOLEAN|0x000000F3
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtForcepowerGpioPad |0|UINT32|0x000000F4
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad |0|UINT32|0x000000F5
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtWakeupSupport |0|UINT8|0x000000FA
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotSMI |0|UINT8|0x000000FB
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotNotify |0|UINT8|0x000000FC
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtSetClkReq|0|UINT8|0x000000FD
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAspm |0|UINT8|0x000000FE
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtLtr | 0 | UINT8| 0x00000116
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAcDcSwitch |0|UINT8|0x000000FF
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3Tbt |0|UINT8|0x00000100
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtClkReq |0|UINT8|0x0000010A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax |0|UINT8|0x00000107
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemRsvd |0|UINT16|0x00000108
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax |0|UINT8|0x00000109
 
 # UCMC GPIO Table
-gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTable|0|UINT32|0x000000111
-gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTableSize|0|UINT16|0x000000112
-
-gBoardModuleTokenSpaceGuid.PcdAcpiSleepState|1|UINT8|0x40000002
-gBoardModuleTokenSpaceGuid.PcdAcpiHibernate|1|UINT8|0x40000003
-gBoardModuleTokenSpaceGuid.PcdLowPowerS0Idle|0|UINT8|0x40000004
-gBoardModuleTokenSpaceGuid.PcdPciExpNative|0|UINT8|0x40000005
-gBoardModuleTokenSpaceGuid.PcdNativeAspmEnable|1|UINT8|0x40000006
-gBoardModuleTokenSpaceGuid.PcdPs2KbMsEnable|0|UINT8|0x40000009
-gBoardModuleTokenSpaceGuid.PcdDisableActiveTripPoints|1|UINT8|0x4000000A
-gBoardModuleTokenSpaceGuid.PcdDisablePassiveTripPoints|0|UINT8|0x4000000B
-gBoardModuleTokenSpaceGuid.PcdDisableCriticalTripPoints|1|UINT8|0x4000000C
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTable|0|UINT32|0x000000111
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTableSize|0|UINT16|0x000000112
+
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiSleepState|1|UINT8|0x40000002
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiHibernate|1|UINT8|0x40000003
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle|0|UINT8|0x40000004
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative|0|UINT8|0x40000005
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable|1|UINT8|0x40000006
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable|0|UINT8|0x40000009
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisableActiveTripPoints|1|UINT8|0x4000000A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisablePassiveTripPoints|0|UINT8|0x4000000B
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisableCriticalTripPoints|1|UINT8|0x4000000C
 
 # 0: Type-C
 # 1: Stacked-Jack
-gBoardModuleTokenSpaceGuid.PcdAudioConnector|0|UINT8|0x40000012
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAudioConnector|0|UINT8|0x40000012
 
-gBoardModuleTokenSpaceGuid.PcdAcpiGnvsAddress|0|UINT64|0x40000013
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiGnvsAddress|0|UINT64|0x40000013
 
 # gIntelPeiGraphicsVbtGuid =  {0x4ad46122, 0xffeb, 0x4a52, {0xbf, 0xb0, 0x51, 0x8c, 0xfc, 0xa0, 0x2d, 0xb0}}
-gBoardModuleTokenSpaceGuid.PcdGraphicsVbtGuid|{0x22, 0x61, 0xd4, 0x4a, 0xeb, 0xff, 0x52, 0x4a, 0xbf, 0xb0, 0x51, 0x8c, 0xfc, 0xa0, 0x2d, 0xb0}|VOID*|0x40000014
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGraphicsVbtGuid|{0x22, 0x61, 0xd4, 0x4a, 0xeb, 0xff, 0x52, 0x4a, 0xbf, 0xb0, 0x51, 0x8c, 0xfc, 0xa0, 0x2d, 0xb0}|VOID*|0x40000014
 #==============================================================
 #
 # The PCD which indicates the Memory Slot Population.
 #
-gBoardModuleTokenSpaceGuid.PcdDualDimmPerChannelBoardType|FALSE|BOOLEAN|0x00101027
-gBoardModuleTokenSpaceGuid.PcdFunctionGopVbtSpecificUpdate|0|UINT64|0x00000010
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDualDimmPerChannelBoardType|FALSE|BOOLEAN|0x00101027
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdFunctionGopVbtSpecificUpdate|0|UINT64|0x00000010
 
 # Board GPIO Table
-gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMem|0|UINT32|0x001000115
-gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMemSize|0|UINT16|0x001000116
-gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMem|0|UINT32|0x001000117
-gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMemSize|0|UINT16|0x001000118
-gBoardModuleTokenSpaceGuid.PcdWwanFullCardPowerOffGpio|0x0|UINT32|0x0010020C
-gBoardModuleTokenSpaceGuid.PcdWwanPerstGpioPolarity|0x0|UINT8|0x0010022E
-gBoardModuleTokenSpaceGuid.PcdWwanPerstGpio|0x0|UINT32|0x0010022F
-gBoardModuleTokenSpaceGuid.PcdWwanBbrstGpio|0x0|UINT32|0x00100230
-gBoardModuleTokenSpaceGuid.PcdPcieWwanEnable|FALSE|BOOLEAN|0x00100231
-gBoardModuleTokenSpaceGuid.PcdWlanWakeGpio|0x0|UINT32|0x00100234
-gBoardModuleTokenSpaceGuid.PcdWlanRootPortNumber|0x0|UINT8|0x00100235
-gBoardModuleTokenSpaceGuid.PcdWwanResetWorkaround|FALSE|BOOLEAN|0x00100236
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMem|0|UINT32|0x001000115
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMemSize|0|UINT16|0x001000116
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMem|0|UINT32|0x001000117
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMemSize|0|UINT16|0x001000118
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanFullCardPowerOffGpio|0x0|UINT32|0x0010020C
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanPerstGpioPolarity|0x0|UINT8|0x0010022E
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanPerstGpio|0x0|UINT32|0x0010022F
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanBbrstGpio|0x0|UINT32|0x00100230
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieWwanEnable|FALSE|BOOLEAN|0x00100231
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWlanWakeGpio|0x0|UINT32|0x00100234
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWlanRootPortNumber|0x0|UINT8|0x00100235
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanResetWorkaround|FALSE|BOOLEAN|0x00100236
 
 # UCMC GPIO Table
-gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTable|0|UINT32|0x00100033
-gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTableSize|0|UINT16|0x00100034
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTable|0|UINT32|0x00100033
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTableSize|0|UINT16|0x00100034
 
 # PEG RESET GPIO
-gBoardModuleTokenSpaceGuid.PcdPeg0ResetGpioPad|0|UINT32|0x00000074
-gBoardModuleTokenSpaceGuid.PcdPeg0ResetGpioActive|FALSE|BOOLEAN|0x00000075
-gBoardModuleTokenSpaceGuid.PcdPeg3ResetGpioPad|0|UINT32|0x00000105
-gBoardModuleTokenSpaceGuid.PcdPeg3ResetGpioActive|FALSE|BOOLEAN|0x00000106
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg0ResetGpioPad|0|UINT32|0x00000074
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg0ResetGpioActive|FALSE|BOOLEAN|0x00000075
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg3ResetGpioPad|0|UINT32|0x00000105
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg3ResetGpioActive|FALSE|BOOLEAN|0x00000106
 
 # PCIE RTD3 GPIO
-gBoardModuleTokenSpaceGuid.PcdRootPortDev|0xFF|UINT8|0x00000076
-gBoardModuleTokenSpaceGuid.PcdRootPortFunc|0xFF|UINT8|0x00000077
-gBoardModuleTokenSpaceGuid.PcdRootPortIndex|0xFF|UINT8|0x00000104
-gBoardModuleTokenSpaceGuid.PcdPcie0GpioSupport|0|UINT8|0x00000078
-
-gBoardModuleTokenSpaceGuid.PcdPcie1GpioSupport|0|UINT8|0x00000080
-gBoardModuleTokenSpaceGuid.PcdPcie1WakeGpioNo|0|UINT32|0x00000081
-gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstExpanderNo|0|UINT8|0x00000082
-gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstGpioNo|0|UINT32|0x00000083
-gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstActive|FALSE|BOOLEAN|0x00000084
-gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableExpanderNo|0|UINT8|0x00000085
-gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableGpioNo|0|UINT32|0x00000086
-gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableActive|FALSE|BOOLEAN|0x00000087
-
-gBoardModuleTokenSpaceGuid.PcdPcie2GpioSupport|0|UINT8|0x00000088
-gBoardModuleTokenSpaceGuid.PcdPcie2WakeGpioNo|0|UINT32|0x00000089
-gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstExpanderNo|0|UINT8|0x0000008A
-gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstGpioNo|0|UINT32|0x0000008B
-gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstActive|FALSE|BOOLEAN|0x0000008C
-gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableExpanderNo|0|UINT8|0x0000008D
-gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableGpioNo|0|UINT32|0x0000008E
-gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableActive|FALSE|BOOLEAN|0x0000008F
-gBoardModuleTokenSpaceGuid.PcdPcie3GpioSupport|0|UINT8|0x00000130
-gBoardModuleTokenSpaceGuid.PcdPcie3WakeGpioNo|0|UINT32|0x00000131
-gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstExpanderNo|0|UINT8|0x00000132
-gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstGpioNo|0|UINT32|0x00000133
-gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstActive|FALSE|BOOLEAN|0x00000134
-gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableExpanderNo|0|UINT8|0x00000135
-gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableGpioNo|0|UINT32|0x00000136
-gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableActive|FALSE|BOOLEAN|0x00000137
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortDev|0xFF|UINT8|0x00000076
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortFunc|0xFF|UINT8|0x00000077
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortIndex|0xFF|UINT8|0x00000104
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0GpioSupport|0|UINT8|0x00000078
+
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1GpioSupport|0|UINT8|0x00000080
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1WakeGpioNo|0|UINT32|0x00000081
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstExpanderNo|0|UINT8|0x00000082
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstGpioNo|0|UINT32|0x00000083
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstActive|FALSE|BOOLEAN|0x00000084
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableExpanderNo|0|UINT8|0x00000085
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableGpioNo|0|UINT32|0x00000086
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableActive|FALSE|BOOLEAN|0x00000087
+
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2GpioSupport|0|UINT8|0x00000088
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2WakeGpioNo|0|UINT32|0x00000089
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstExpanderNo|0|UINT8|0x0000008A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstGpioNo|0|UINT32|0x0000008B
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstActive|FALSE|BOOLEAN|0x0000008C
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableExpanderNo|0|UINT8|0x0000008D
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableGpioNo|0|UINT32|0x0000008E
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableActive|FALSE|BOOLEAN|0x0000008F
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3GpioSupport|0|UINT8|0x00000130
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3WakeGpioNo|0|UINT32|0x00000131
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstExpanderNo|0|UINT8|0x00000132
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstGpioNo|0|UINT32|0x00000133
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstActive|FALSE|BOOLEAN|0x00000134
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableExpanderNo|0|UINT8|0x00000135
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableGpioNo|0|UINT32|0x00000136
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableActive|FALSE|BOOLEAN|0x00000137
 
 # Root Port Clock Info
-gBoardModuleTokenSpaceGuid.PcdPcieClock0|0|UINT64|0x0000009E
-gBoardModuleTokenSpaceGuid.PcdPcieClock1|0|UINT64|0x0000009F
-gBoardModuleTokenSpaceGuid.PcdPcieClock2|0|UINT64|0x000000A0
-gBoardModuleTokenSpaceGuid.PcdPcieClock3|0|UINT64|0x000000A1
-gBoardModuleTokenSpaceGuid.PcdPcieClock4|0|UINT64|0x000000A2
-gBoardModuleTokenSpaceGuid.PcdPcieClock5|0|UINT64|0x000000A3
-gBoardModuleTokenSpaceGuid.PcdPcieClock6|0|UINT64|0x000000A4
-gBoardModuleTokenSpaceGuid.PcdPcieClock7|0|UINT64|0x000000A5
-gBoardModuleTokenSpaceGuid.PcdPcieClock8|0|UINT64|0x000000A6
-gBoardModuleTokenSpaceGuid.PcdPcieClock9|0|UINT64|0x000000A7
-gBoardModuleTokenSpaceGuid.PcdPcieClock10|0|UINT64|0x000000A8
-gBoardModuleTokenSpaceGuid.PcdPcieClock11|0|UINT64|0x000000A9
-gBoardModuleTokenSpaceGuid.PcdPcieClock12|0|UINT64|0x000000AA
-gBoardModuleTokenSpaceGuid.PcdPcieClock13|0|UINT64|0x000000AB
-gBoardModuleTokenSpaceGuid.PcdPcieClock14|0|UINT64|0x000000AC
-gBoardModuleTokenSpaceGuid.PcdPcieClock15|0|UINT64|0x000000AD
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock0|0|UINT64|0x0000009E
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock1|0|UINT64|0x0000009F
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock2|0|UINT64|0x000000A0
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock3|0|UINT64|0x000000A1
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock4|0|UINT64|0x000000A2
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock5|0|UINT64|0x000000A3
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock6|0|UINT64|0x000000A4
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock7|0|UINT64|0x000000A5
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock8|0|UINT64|0x000000A6
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock9|0|UINT64|0x000000A7
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock10|0|UINT64|0x000000A8
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock11|0|UINT64|0x000000A9
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock12|0|UINT64|0x000000AA
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock13|0|UINT64|0x000000AB
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock14|0|UINT64|0x000000AC
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock15|0|UINT64|0x000000AD
 
 # GPIO Group Tier
-gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw0|0|UINT32|0x000000E9
-gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw1|0|UINT32|0x000000EA
-gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw2|0|UINT32|0x000000EB
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw0|0|UINT32|0x000000E9
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw1|0|UINT32|0x000000EA
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw2|0|UINT32|0x000000EB
 
 # Board related PCH PmConfig
-gBoardModuleTokenSpaceGuid.PcdSlpS0VmRuntimeControl|FALSE|BOOLEAN|0x000000F6
-gBoardModuleTokenSpaceGuid.PcdSlpS0Vm070VSupport|FALSE|BOOLEAN|0x000000F7
-gBoardModuleTokenSpaceGuid.PcdSlpS0Vm075VSupport|FALSE|BOOLEAN|0x000000F8
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0VmRuntimeControl|FALSE|BOOLEAN|0x000000F6
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0Vm070VSupport|FALSE|BOOLEAN|0x000000F7
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0Vm075VSupport|FALSE|BOOLEAN|0x000000F8
 
 # Misc
-gBoardModuleTokenSpaceGuid.PcdPc8374SioKbcPresent|FALSE|BOOLEAN|0x000000ED
-gBoardModuleTokenSpaceGuid.PcdOddPowerInitEnable|FALSE|BOOLEAN|0x000000EE
-gBoardModuleTokenSpaceGuid.PcdIvCamInitPresent|FALSE|BOOLEAN|0x000000EF
-gBoardModuleTokenSpaceGuid.PcdRecoveryModeGpio|0|UINT64|0x000000F0
-gBoardModuleTokenSpaceGuid.PcdMobileDramPresent|FALSE|BOOLEAN|0x000000F1
-gBoardModuleTokenSpaceGuid.PcdCpuVboostEnable|FALSE|BOOLEAN|0x000000F2
-gBoardModuleTokenSpaceGuid.PcdGpioTier2WakeEnable|FALSE|BOOLEAN|0x000000F9
-#gBoardModuleTokenSpaceGuid.PcdxxxNotInUse|FALSE|BOOLEAN|0x000000FC
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPc8374SioKbcPresent|FALSE|BOOLEAN|0x000000ED
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdOddPowerInitEnable|FALSE|BOOLEAN|0x000000EE
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIvCamInitPresent|FALSE|BOOLEAN|0x000000EF
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRecoveryModeGpio|0|UINT64|0x000000F0
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMobileDramPresent|FALSE|BOOLEAN|0x000000F1
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCpuVboostEnable|FALSE|BOOLEAN|0x000000F2
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioTier2WakeEnable|FALSE|BOOLEAN|0x000000F9
+#gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdxxxNotInUse|FALSE|BOOLEAN|0x000000FC
 
 #PlatformInfoPcd
-gBoardModuleTokenSpaceGuid.PcdEnableVoltageMargining|FALSE|BOOLEAN|0x00101000
-gBoardModuleTokenSpaceGuid.PcdGfxCrbDetect|FALSE|BOOLEAN|0x00101001
-gBoardModuleTokenSpaceGuid.PcdHsioBoardPresent|FALSE|BOOLEAN|0x00101002
-gBoardModuleTokenSpaceGuid.PcdHsioBoardType|0x0|UINT8|0x00101003
-gBoardModuleTokenSpaceGuid.PcdWakeupType|0x0|UINT8|0x00101004
-gBoardModuleTokenSpaceGuid.PcdMfgMode|FALSE|BOOLEAN|0x00101005
-gBoardModuleTokenSpaceGuid.PcdBoardName|L"0123456789ABCDEF0123456789ABCDEF"|VOID*|0x00101007
-gBoardModuleTokenSpaceGuid.PcdEcMajorRevision|0x0|UINT8|0x00101008
-gBoardModuleTokenSpaceGuid.PcdEcMinorRevision|0x0|UINT8|0x00101009
-gBoardModuleTokenSpaceGuid.PcdBiosVersion|L"0123456789012345678901234567890123456789"|VOID*|0x0010100E
-gBoardModuleTokenSpaceGuid.PcdReleaseDate|L"01234567890123456789"|VOID*|0x0010100F
-gBoardModuleTokenSpaceGuid.PcdReleaseTime|L"01234567890123456789"|VOID*|0x00101010
-gBoardModuleTokenSpaceGuid.PcdPlatformGeneration|0x0|UINT8|0x00101011
-gBoardModuleTokenSpaceGuid.PcdSpdPresent|FALSE|BOOLEAN|0x00101012
-gBoardModuleTokenSpaceGuid.PcdDockAttached|FALSE|BOOLEAN|0x00101013
-gBoardModuleTokenSpaceGuid.PcdPlatformType|0x0|UINT8|0x00101014
-gBoardModuleTokenSpaceGuid.PcdPlatformFlavor|0x0|UINT8|0x00101015
-gBoardModuleTokenSpaceGuid.PcdBoardRev|0x0|UINT8|0x00101016
-gBoardModuleTokenSpaceGuid.PcdBoardBomId|0x0|UINT8|0x00101017
-gBoardModuleTokenSpaceGuid.PcdBoardId|0x0|UINT8|0x00101018
-gBoardModuleTokenSpaceGuid.PcdBoardType|0x0|UINT8|0x00101019
-gBoardModuleTokenSpaceGuid.PcdEcPresent|FALSE|BOOLEAN|0x0010101A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEnableVoltageMargining|FALSE|BOOLEAN|0x00101000
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGfxCrbDetect|FALSE|BOOLEAN|0x00101001
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHsioBoardPresent|FALSE|BOOLEAN|0x00101002
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHsioBoardType|0x0|UINT8|0x00101003
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWakeupType|0x0|UINT8|0x00101004
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMfgMode|FALSE|BOOLEAN|0x00101005
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardName|L"0123456789ABCDEF0123456789ABCDEF"|VOID*|0x00101007
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcMajorRevision|0x0|UINT8|0x00101008
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcMinorRevision|0x0|UINT8|0x00101009
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBiosVersion|L"0123456789012345678901234567890123456789"|VOID*|0x0010100E
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdReleaseDate|L"01234567890123456789"|VOID*|0x0010100F
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdReleaseTime|L"01234567890123456789"|VOID*|0x00101010
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPlatformGeneration|0x0|UINT8|0x00101011
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpdPresent|FALSE|BOOLEAN|0x00101012
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDockAttached|FALSE|BOOLEAN|0x00101013
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPlatformType|0x0|UINT8|0x00101014
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPlatformFlavor|0x0|UINT8|0x00101015
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardRev|0x0|UINT8|0x00101016
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardBomId|0x0|UINT8|0x00101017
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardId|0x0|UINT8|0x00101018
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardType|0x0|UINT8|0x00101019
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcPresent|FALSE|BOOLEAN|0x0010101A
 
 # PCH Misc Configuration
-gBoardModuleTokenSpaceGuid.PcdDebugUsbUartEnable|FALSE|BOOLEAN|0x00000061
-gBoardModuleTokenSpaceGuid.PcdMipiCamGpioEnable|FALSE|BOOLEAN|0x00000065
-gBoardModuleTokenSpaceGuid.PcdSmbiosFabBoardName|0|UINT64|0x00000102
-gBoardModuleTokenSpaceGuid.PcdSmbiosMainSlotEntry|0|UINT64|0x00000103
-gBoardModuleTokenSpaceGuid.PcdUsbcEcPdNegotiation|FALSE|BOOLEAN|0x00000110
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDebugUsbUartEnable|FALSE|BOOLEAN|0x00000061
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCamGpioEnable|FALSE|BOOLEAN|0x00000065
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmbiosFabBoardName|0|UINT64|0x00000102
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmbiosMainSlotEntry|0|UINT64|0x00000103
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbcEcPdNegotiation|FALSE|BOOLEAN|0x00000110
 
 # Control PCD to dump default silicon policy
 gPlatformModuleTokenSpaceGuid.PcdDumpDefaultSiliconPolicy|FALSE|BOOLEAN|0x00010064
 
 # Pch SerialIo I2c Pads Termination
-gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c0PadInternalTerm|0x1|UINT8|0x00000020
-gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c1PadInternalTerm|0x1|UINT8|0x00000021
-gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c2PadInternalTerm|0x1|UINT8|0x00000022
-gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c3PadInternalTerm|0x1|UINT8|0x00000023
-gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c4PadInternalTerm|0x1|UINT8|0x00000030
-gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c5PadInternalTerm|0x1|UINT8|0x00000031
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c0PadInternalTerm|0x1|UINT8|0x00000020
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c1PadInternalTerm|0x1|UINT8|0x00000021
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c2PadInternalTerm|0x1|UINT8|0x00000022
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c3PadInternalTerm|0x1|UINT8|0x00000023
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c4PadInternalTerm|0x1|UINT8|0x00000030
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c5PadInternalTerm|0x1|UINT8|0x00000031
 #
 # The PCD which holds the pointer of Smbios Platform Info table
 #
-gBoardModuleTokenSpaceGuid.PcdSmbiosPlatformInfo|0|UINT64|0x0010101B
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmbiosPlatformInfo|0|UINT64|0x0010101B
 #
 # The PCD which used to enable / disable the code to use RVP Smbios Board Info
 #
-gBoardModuleTokenSpaceGuid.PcdSmbiosBoardInfoEnable|FALSE|BOOLEAN|0x0010101C
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmbiosBoardInfoEnable|FALSE|BOOLEAN|0x0010101C
 #
 # The PCD which holds the pointer of RVP Smbios Board Info
 #
-gBoardModuleTokenSpaceGuid.PcdSmbiosBoardInfo|0|UINT64|0x0010101D
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmbiosBoardInfo|0|UINT64|0x0010101D
 #
 # CoEngineering Custom Defaults PCD
 #
-gBoardModuleTokenSpaceGuid.PcdCoEngEnableCustomDefaults|0x0|UINT8|0x00100227
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCoEngEnableCustomDefaults|0x0|UINT8|0x00100227
 #
 # The PCD which is defined to enable/disable the SMBus Alert function.
 #
-gBoardModuleTokenSpaceGuid.PcdSmbusAlertEnable|FALSE|BOOLEAN|0x0010101E
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmbusAlertEnable|FALSE|BOOLEAN|0x0010101E
 #
 # The PCD which is defined to enable/disable the SATA LED function.
 #
-gBoardModuleTokenSpaceGuid.PcdSataLedEnable|FALSE|BOOLEAN|0x0010101F
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSataLedEnable|FALSE|BOOLEAN|0x0010101F
 #
 # The PCD which is defined to enable/disable the VR Alert function.
 #
-gBoardModuleTokenSpaceGuid.PcdVrAlertEnable|FALSE|BOOLEAN|0x00101020
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVrAlertEnable|FALSE|BOOLEAN|0x00101020
 #
 # The PCD which is defined to enable/disable the PCH thermal hot threshold function.
 #
-gBoardModuleTokenSpaceGuid.PcdPchThermalHotEnable|FALSE|BOOLEAN|0x00101021
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchThermalHotEnable|FALSE|BOOLEAN|0x00101021
 #
 # The PCD which is defined to enable/disable the memory thermal sensor GPIO C/D function.
 #
-gBoardModuleTokenSpaceGuid.PcdMemoryThermalSensorGpioCPmsyncEnable|TRUE|BOOLEAN|0x00101022
-gBoardModuleTokenSpaceGuid.PcdMemoryThermalSensorGpioDPmsyncEnable|TRUE|BOOLEAN|0x00101023
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMemoryThermalSensorGpioCPmsyncEnable|TRUE|BOOLEAN|0x00101022
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMemoryThermalSensorGpioDPmsyncEnable|TRUE|BOOLEAN|0x00101023
 #
 # The PCD defines the I2C bus number to which PSS chip connected.
 #
-gBoardModuleTokenSpaceGuid.PcdPssReadSN|FALSE|BOOLEAN|0x00101024
-gBoardModuleTokenSpaceGuid.PcdPssI2cBusNumber|0x04|UINT8|0x00101025
-gBoardModuleTokenSpaceGuid.PcdPssI2cSlaveAddress|0x6E|UINT8|0x00101026
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPssReadSN|FALSE|BOOLEAN|0x00101024
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPssI2cBusNumber|0x04|UINT8|0x00101025
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPssI2cSlaveAddress|0x6E|UINT8|0x00101026
 #
 # The PCD defines the USB port number to which BLE connected.
 #
-gBoardModuleTokenSpaceGuid.PcdBleUsbPortNumber                     |0x0|UINT8|0x00101028
-gBoardModuleTokenSpaceGuid.PcdEcHotKeyF3Support                    |0x00|UINT8|0x00100113
-gBoardModuleTokenSpaceGuid.PcdEcHotKeyF4Support                    |0x00|UINT8|0x00100114
-gBoardModuleTokenSpaceGuid.PcdEcHotKeyF5Support                    |0x00|UINT8|0x00100115
-gBoardModuleTokenSpaceGuid.PcdEcHotKeyF6Support                    |0x00|UINT8|0x00100116
-gBoardModuleTokenSpaceGuid.PcdEcHotKeyF7Support                    |0x00|UINT8|0x00100117
-gBoardModuleTokenSpaceGuid.PcdEcHotKeyF8Support                    |0x00|UINT8|0x00100118
-gBoardModuleTokenSpaceGuid.PcdVirtualButtonVolumeUpSupport         |FALSE|BOOLEAN|0x00100119
-gBoardModuleTokenSpaceGuid.PcdVirtualButtonVolumeDownSupport       |FALSE|BOOLEAN|0x0010011A
-gBoardModuleTokenSpaceGuid.PcdVirtualButtonHomeButtonSupport       |FALSE|BOOLEAN|0x0010011B
-gBoardModuleTokenSpaceGuid.PcdVirtualButtonRotationLockSupport     |FALSE|BOOLEAN|0x0010011C
-gBoardModuleTokenSpaceGuid.PcdSlateModeSwitchSupport               |FALSE|BOOLEAN|0x0010011D
-gBoardModuleTokenSpaceGuid.PcdAcDcAutoSwitchSupport                |FALSE|BOOLEAN|0x0010011F
-gBoardModuleTokenSpaceGuid.PcdPmPowerButtonGpioPin                 |0x00|UINT32|0x00100120
-gBoardModuleTokenSpaceGuid.PcdAcpiEnableAllButtonSupport           |FALSE|BOOLEAN|0x00100121
-gBoardModuleTokenSpaceGuid.PcdAcpiHidDriverButtonSupport           |FALSE|BOOLEAN|0x00100122
-gBoardModuleTokenSpaceGuid.PcdTsOnDimmTemperature                  |FALSE|BOOLEAN|0x00100123
-gBoardModuleTokenSpaceGuid.PcdBatteryPresent                       |0x0|UINT8|0x00100124
-gBoardModuleTokenSpaceGuid.PcdUsbTypeCSupport|FALSE|BOOLEAN|0x00100212
-gBoardModuleTokenSpaceGuid.PcdUsbTypeCEcLess|FALSE|BOOLEAN|0x00100213
-gBoardModuleTokenSpaceGuid.PcdXhciAcpiTableSignature|0x0|UINT64|0x00100204
-gBoardModuleTokenSpaceGuid.PcdPreferredPmProfile|0x0|UINT8|0x00100205
-gBoardModuleTokenSpaceGuid.PcdFingerPrintSleepGpio|0x0|UINT32|0x00100209
-gBoardModuleTokenSpaceGuid.PcdFingerPrintIrqGpio|0x0|UINT32|0x0010020A
-gBoardModuleTokenSpaceGuid.PcdGnssResetGpio|0x0|UINT32|0x0010020B
-gBoardModuleTokenSpaceGuid.PcdTouchpadIrqGpio|0x0|UINT32|0x0010020F
-gBoardModuleTokenSpaceGuid.PcdTouchpanelIrqGpio|0x0|UINT32|0x00100210
-
-gBoardModuleTokenSpaceGuid.PcdHdaI2sCodecIrqGpio                   |0x0|UINT32|0x00100126
-gBoardModuleTokenSpaceGuid.PcdHdaI2sCodecI2cBusNumber              |0x0|UINT8|0x00100127
-gBoardModuleTokenSpaceGuid.PcdEcSmiGpio|0x0|UINT32|0x00100200
-gBoardModuleTokenSpaceGuid.PcdEcLowPowerExitGpio                   |0x0|UINT32|0x00100125
-gBoardModuleTokenSpaceGuid.PcdHidI2cIntPad|0x0|UINT32|0x00100201
-gBoardModuleTokenSpaceGuid.PcdDetectPs2KbOnCmdAck|FALSE|BOOLEAN|0x00100202
-gBoardModuleTokenSpaceGuid.PcdSpdAddressOverride|FALSE|BOOLEAN|0x00100203
-gBoardModuleTokenSpaceGuid.PcdDDISelection|0x0|UINT8|0x00100215
-gBoardModuleTokenSpaceGuid.PcdGfxCrbDetectGpio|0x0|UINT64|0x00100217
-gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort1|0x00|UINT8|0x00100039
-gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort1Pch|0x00|UINT8|0x0010003A
-gBoardModuleTokenSpaceGuid.PcdUsbCPort1Proterties|0x00|UINT8|0x0010003B
-gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort2|0x00|UINT8|0x0010003C
-gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort2Pch|0x00|UINT8|0x0010003D
-gBoardModuleTokenSpaceGuid.PcdUsbCPort2Proterties|0x00|UINT8|0x0010003E
-gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort3|0x00|UINT8|0x0010003F
-gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort3Pch|0x00|UINT8|0x00100040
-gBoardModuleTokenSpaceGuid.PcdUsbCPort3Proterties|0x00|UINT8|0x00100041
-gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort4|0x00|UINT8|0x00100042
-gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort4Pch|0x00|UINT8|0x00100043
-gBoardModuleTokenSpaceGuid.PcdUsbCPort4Proterties|0x00|UINT8|0x00100044
-gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort5|0x00|UINT8|0x00100045
-gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort5Pch|0x00|UINT8|0x00100046
-gBoardModuleTokenSpaceGuid.PcdUsbCPort5Proterties|0x00|UINT8|0x00100047
-gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort6|0x00|UINT8|0x00100048
-gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort6Pch|0x00|UINT8|0x00100049
-gBoardModuleTokenSpaceGuid.PcdUsbCPort6Proterties|0x00|UINT8|0x0010004A
-gBoardModuleTokenSpaceGuid.PcdMipiCam0LinkUsed                     |0x0|UINT8|0x00100128
-gBoardModuleTokenSpaceGuid.PcdMipiCam1LinkUsed                     |0x0|UINT8|0x00100129
-gBoardModuleTokenSpaceGuid.PcdMipiCam2LinkUsed                     |0x0|UINT8|0x0010012A
-gBoardModuleTokenSpaceGuid.PcdMipiCam3LinkUsed                     |0x0|UINT8|0x0010012B
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBleUsbPortNumber                     |0x0|UINT8|0x00101028
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcHotKeyF3Support                    |0x00|UINT8|0x00100113
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcHotKeyF4Support                    |0x00|UINT8|0x00100114
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcHotKeyF5Support                    |0x00|UINT8|0x00100115
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcHotKeyF6Support                    |0x00|UINT8|0x00100116
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcHotKeyF7Support                    |0x00|UINT8|0x00100117
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcHotKeyF8Support                    |0x00|UINT8|0x00100118
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonVolumeUpSupport         |FALSE|BOOLEAN|0x00100119
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonVolumeDownSupport       |FALSE|BOOLEAN|0x0010011A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonHomeButtonSupport       |FALSE|BOOLEAN|0x0010011B
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonRotationLockSupport     |FALSE|BOOLEAN|0x0010011C
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlateModeSwitchSupport               |FALSE|BOOLEAN|0x0010011D
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcDcAutoSwitchSupport                |FALSE|BOOLEAN|0x0010011F
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPmPowerButtonGpioPin                 |0x00|UINT32|0x00100120
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiEnableAllButtonSupport           |FALSE|BOOLEAN|0x00100121
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiHidDriverButtonSupport           |FALSE|BOOLEAN|0x00100122
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTsOnDimmTemperature                  |FALSE|BOOLEAN|0x00100123
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBatteryPresent                       |0x0|UINT8|0x00100124
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCSupport|FALSE|BOOLEAN|0x00100212
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCEcLess|FALSE|BOOLEAN|0x00100213
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdXhciAcpiTableSignature|0x0|UINT64|0x00100204
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPreferredPmProfile|0x0|UINT8|0x00100205
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdFingerPrintSleepGpio|0x0|UINT32|0x00100209
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdFingerPrintIrqGpio|0x0|UINT32|0x0010020A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGnssResetGpio|0x0|UINT32|0x0010020B
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTouchpadIrqGpio|0x0|UINT32|0x0010020F
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTouchpanelIrqGpio|0x0|UINT32|0x00100210
+
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHdaI2sCodecIrqGpio                   |0x0|UINT32|0x00100126
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHdaI2sCodecI2cBusNumber              |0x0|UINT8|0x00100127
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcSmiGpio|0x0|UINT32|0x00100200
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcLowPowerExitGpio                   |0x0|UINT32|0x00100125
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHidI2cIntPad|0x0|UINT32|0x00100201
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDetectPs2KbOnCmdAck|FALSE|BOOLEAN|0x00100202
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpdAddressOverride|FALSE|BOOLEAN|0x00100203
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDDISelection|0x0|UINT8|0x00100215
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGfxCrbDetectGpio|0x0|UINT64|0x00100217
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort1|0x00|UINT8|0x00100039
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort1Pch|0x00|UINT8|0x0010003A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort1Proterties|0x00|UINT8|0x0010003B
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort2|0x00|UINT8|0x0010003C
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort2Pch|0x00|UINT8|0x0010003D
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort2Proterties|0x00|UINT8|0x0010003E
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort3|0x00|UINT8|0x0010003F
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort3Pch|0x00|UINT8|0x00100040
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort3Proterties|0x00|UINT8|0x00100041
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort4|0x00|UINT8|0x00100042
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort4Pch|0x00|UINT8|0x00100043
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort4Proterties|0x00|UINT8|0x00100044
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort5|0x00|UINT8|0x00100045
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort5Pch|0x00|UINT8|0x00100046
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort5Proterties|0x00|UINT8|0x00100047
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort6|0x00|UINT8|0x00100048
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort6Pch|0x00|UINT8|0x00100049
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort6Proterties|0x00|UINT8|0x0010004A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCam0LinkUsed                     |0x0|UINT8|0x00100128
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCam1LinkUsed                     |0x0|UINT8|0x00100129
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCam2LinkUsed                     |0x0|UINT8|0x0010012A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCam3LinkUsed                     |0x0|UINT8|0x0010012B
 
 # Super IO Pcd
 gPlatformModuleTokenSpaceGuid.PcdH8S2113Present|TRUE|BOOLEAN|0xF0000100
 gPlatformModuleTokenSpaceGuid.PcdNat87393Present|TRUE|BOOLEAN|0xF0000104
 gPlatformModuleTokenSpaceGuid.PcdNct677FPresent|TRUE|BOOLEAN|0xF0000105
-gBoardModuleTokenSpaceGuid.PcdConvertableDockSupport               |FALSE|BOOLEAN|0x00100112
-gBoardModuleTokenSpaceGuid.PcdSmcRuntimeSciPin                     |0x00|UINT32|0x00100111
-gBoardModuleTokenSpaceGuid.PcdRealBattery1Control                  |0x00|UINT8|0x00100103
-gBoardModuleTokenSpaceGuid.PcdRealBattery2Control                  |0x00|UINT8|0x00100104
-
-gBoardModuleTokenSpaceGuid.PcdDimmPopulationError|FALSE|BOOLEAN|0x00100221
-gBoardModuleTokenSpaceGuid.PcdBtIrqGpio|0x0|UINT32|0x0010020E
-gBoardModuleTokenSpaceGuid.PcdBtRfKillGpio|0x0|UINT32|0x0010020D
-gBoardModuleTokenSpaceGuid.PcdWhlErbRtd3TableEnable|FALSE|BOOLEAN|0x0010022C
-gBoardModuleTokenSpaceGuid.PcdTypeCPortsSupported|0x00|UINT8|0x0010004B
-gBoardModuleTokenSpaceGuid.PcdMipiCamSensor                        |FALSE|BOOLEAN|0x00100105
-gBoardModuleTokenSpaceGuid.PcdH8S2113SIO                           |FALSE|BOOLEAN|0x0010010A
-gBoardModuleTokenSpaceGuid.PcdNCT6776FCOM                          |FALSE|BOOLEAN|0x00100107
-gBoardModuleTokenSpaceGuid.PcdNCT6776FSIO                          |FALSE|BOOLEAN|0x00100108
-gBoardModuleTokenSpaceGuid.PcdNCT6776FHWMON                        |FALSE|BOOLEAN|0x00100109
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdConvertableDockSupport               |FALSE|BOOLEAN|0x00100112
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmcRuntimeSciPin                     |0x00|UINT32|0x00100111
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRealBattery1Control                  |0x00|UINT8|0x00100103
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRealBattery2Control                  |0x00|UINT8|0x00100104
+
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDimmPopulationError|FALSE|BOOLEAN|0x00100221
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBtIrqGpio|0x0|UINT32|0x0010020E
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBtRfKillGpio|0x0|UINT32|0x0010020D
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWhlErbRtd3TableEnable|FALSE|BOOLEAN|0x0010022C
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTypeCPortsSupported|0x00|UINT8|0x0010004B
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCamSensor                        |FALSE|BOOLEAN|0x00100105
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdH8S2113SIO                           |FALSE|BOOLEAN|0x0010010A
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdNCT6776FCOM                          |FALSE|BOOLEAN|0x00100107
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdNCT6776FSIO                          |FALSE|BOOLEAN|0x00100108
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdNCT6776FHWMON                        |FALSE|BOOLEAN|0x00100109
 
 [PcdsDynamicEx]
 
@@ -559,7 +559,7 @@ gBoardModuleTokenSpaceGuid.PcdNCT6776FHWMON                        |FALSE|BOOLEA
 [PcdsPatchableInModule]
 
 [PcdsFeatureFlag]
-gBoardModuleTokenSpaceGuid.PcdIntelGopEnable      |TRUE|BOOLEAN|0xF0000062
-gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport   |TRUE|BOOLEAN|0xF0000000
-gBoardModuleTokenSpaceGuid.PcdTbtEnable           |FALSE|BOOLEAN|0x000000115
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIntelGopEnable      |TRUE|BOOLEAN|0xF0000062
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport   |TRUE|BOOLEAN|0xF0000000
+gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable           |FALSE|BOOLEAN|0x000000115
 

+ 140 - 140
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib/PeiPolicyUpdateLib.inf

@@ -71,174 +71,174 @@
   gPlatformModuleTokenSpaceGuid.PcdGmAdrAddress      ## CONSUMES
   gPlatformModuleTokenSpaceGuid.PcdEdramBaseAddress  ## CONSUMES
   gSiPkgTokenSpaceGuid.PcdSmbusBaseAddress           ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdBoardBomId           ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent
-  gBoardModuleTokenSpaceGuid.PcdSaDdrFreqLimit       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardBomId           ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDdrFreqLimit       ## CONSUMES
 
   # SA Misc Config
-  gBoardModuleTokenSpaceGuid.PcdSaMiscUserBd                   ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget                 ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap                   ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMapSize               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram              ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize          ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleavedControl    ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleaved           ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdData                     ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdDataSize                 ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscUserBd                   ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget                 ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap                   ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMapSize               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram              ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize          ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleavedControl    ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleaved           ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData                     ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize                 ## CONSUMES
 
   # Display DDI
-  gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTable           ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTableSize       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTable           ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTableSize       ## CONSUMES
 
   # PEG Reset By GPIO
-  gBoardModuleTokenSpaceGuid.PcdPegGpioResetControl            ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPegGpioResetSupoort            ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPeg0ResetGpioPad               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPeg0ResetGpioActive            ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPeg3ResetGpioPad               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPeg3ResetGpioActive            ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPegGpioResetControl            ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPegGpioResetSupoort            ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg0ResetGpioPad               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg0ResetGpioActive            ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg3ResetGpioPad               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg3ResetGpioActive            ## CONSUMES
 
   # PCIE RTD3 GPIO
-  gBoardModuleTokenSpaceGuid.PcdRootPortDev                    ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdRootPortFunc                   ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdRootPortIndex                  ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortDev                    ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortFunc                   ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortIndex                  ## CONSUMES
 
-  gBoardModuleTokenSpaceGuid.PcdPcie0GpioSupport               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie0WakeGpioNo                ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstExpanderNo         ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstGpioNo             ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstActive             ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableGpioNo           ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableActive           ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0GpioSupport               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0WakeGpioNo                ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstExpanderNo         ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstGpioNo             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstActive             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableGpioNo           ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableActive           ## CONSUMES
 
-  gBoardModuleTokenSpaceGuid.PcdPcie1GpioSupport               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie1WakeGpioNo                ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstExpanderNo         ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstGpioNo             ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstActive             ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableExpanderNo       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableGpioNo           ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableActive           ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1GpioSupport               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1WakeGpioNo                ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstExpanderNo         ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstGpioNo             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstActive             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableExpanderNo       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableGpioNo           ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableActive           ## CONSUMES
 
-  gBoardModuleTokenSpaceGuid.PcdPcie2GpioSupport               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie2WakeGpioNo                ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstExpanderNo         ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstGpioNo             ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstActive             ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableExpanderNo       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableGpioNo           ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableActive           ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2GpioSupport               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2WakeGpioNo                ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstExpanderNo         ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstGpioNo             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstActive             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableExpanderNo       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableGpioNo           ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableActive           ## CONSUMES
 
-  gBoardModuleTokenSpaceGuid.PcdPcie3GpioSupport               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie3WakeGpioNo                ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstExpanderNo         ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstGpioNo             ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstActive             ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableExpanderNo       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableGpioNo           ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableActive           ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3GpioSupport               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3WakeGpioNo                ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstExpanderNo         ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstGpioNo             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstActive             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableExpanderNo       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableGpioNo           ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableActive           ## CONSUMES
 
   # SPD Address Table
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0            ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1            ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2            ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3            ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0            ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1            ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2            ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3            ## CONSUMES
 
   # CA Vref Configuration
-  gBoardModuleTokenSpaceGuid.PcdMrcCaVrefConfig                ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdDualDimmPerChannelBoardType    ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMobileDramPresent              ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcCaVrefConfig                ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDualDimmPerChannelBoardType    ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMobileDramPresent              ## CONSUMES
 
   # PCIe Clock Info
-  gBoardModuleTokenSpaceGuid.PcdPcieClock0                     ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock1                     ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock2                     ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock3                     ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock4                     ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock5                     ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock6                     ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock7                     ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock8                     ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock9                     ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock10                    ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock11                    ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock12                    ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock13                    ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock14                    ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPcieClock15                    ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock0                     ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock1                     ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock2                     ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock3                     ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock4                     ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock5                     ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock6                     ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock7                     ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock8                     ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock9                     ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock10                    ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock11                    ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock12                    ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock13                    ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock14                    ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock15                    ## CONSUMES
 
   # USB 2.0 Port AFE
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port0Afe                  ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port1Afe                  ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port2Afe                  ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port3Afe                  ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port4Afe                  ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port5Afe                  ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port6Afe                  ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port7Afe                  ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port8Afe                  ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port9Afe                  ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port10Afe                 ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port11Afe                 ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port12Afe                 ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port13Afe                 ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port14Afe                 ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port15Afe                 ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port0Afe                  ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port1Afe                  ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port2Afe                  ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port3Afe                  ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port4Afe                  ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port5Afe                  ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port6Afe                  ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port7Afe                  ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port8Afe                  ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port9Afe                  ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port10Afe                 ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port11Afe                 ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port12Afe                 ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port13Afe                 ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port14Afe                 ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port15Afe                 ## CONSUMES
 
   # USB 2.0 Port Over Current Pin
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort0       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort1       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort2       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort3       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort4       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort5       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort6       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort7       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort8       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort9       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort10      ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort11      ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort12      ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort13      ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort14      ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort15      ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort0       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort1       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort2       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort3       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort4       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort5       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort6       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort7       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort8       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort9       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort10      ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort11      ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort12      ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort13      ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort14      ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort15      ## CONSUMES
 
   # USB 3.0 Port Over Current Pin
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort0       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort1       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort2       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort3       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort4       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort5       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort6       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort7       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort8       ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort9       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort0       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort1       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort2       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort3       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort4       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort5       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort6       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort7       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort8       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort9       ## CONSUMES
 
   # Pch SerialIo I2c Pads Termination
-  gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c0PadInternalTerm ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c1PadInternalTerm ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c2PadInternalTerm ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c3PadInternalTerm ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c4PadInternalTerm ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c5PadInternalTerm ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c0PadInternalTerm ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c1PadInternalTerm ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c2PadInternalTerm ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c3PadInternalTerm ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c4PadInternalTerm ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c5PadInternalTerm ## CONSUMES
 
-  gBoardModuleTokenSpaceGuid.PcdEcPresent
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcPresent
 
-  gIntelSiliconPkgTokenSpaceGuid.PcdIntelGraphicsVbtFileGuid   ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdSmbusAlertEnable               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdSataLedEnable                  ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdVrAlertEnable                  ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdSlpS0VmRuntimeControl          ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdSlpS0Vm070VSupport             ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdSlpS0Vm075VSupport             ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPchThermalHotEnable            ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMemoryThermalSensorGpioCPmsyncEnable  ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMemoryThermalSensorGpioDPmsyncEnable  ## CONSUMES
+  gIntelSiliconPkgTokenSpaceGuid.PcdIntelGraphicsVbtFileGuid               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmbusAlertEnable               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSataLedEnable                  ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVrAlertEnable                  ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0VmRuntimeControl          ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0Vm070VSupport             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0Vm075VSupport             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchThermalHotEnable            ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMemoryThermalSensorGpioCPmsyncEnable  ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMemoryThermalSensorGpioDPmsyncEnable  ## CONSUMES
   gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid   ## CONSUMES
   gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber           ## CONSUMES
 

+ 82 - 82
Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDxe.inf

@@ -49,105 +49,105 @@
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress                     ## CONSUMES
   gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase                          ## CONSUMES
   gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize                          ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdIntelGopEnable
-  gBoardModuleTokenSpaceGuid.PcdPlatformFlavor
-  gBoardModuleTokenSpaceGuid.PcdPlatformType
-  gBoardModuleTokenSpaceGuid.PcdEcPresent
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIntelGopEnable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPlatformFlavor
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPlatformType
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcPresent
   gIntelSiliconPkgTokenSpaceGuid.PcdIntelGraphicsVbtFileGuid
-  gBoardModuleTokenSpaceGuid.PcdTbtEnable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable
   gSiPkgTokenSpaceGuid.PcdCpuSmmMsrSaveStateEnable                      ## CONSUMES
   gSiPkgTokenSpaceGuid.PcdCpuSmmCodeAccessCheckEnable                   ## CONSUMES
   gSiPkgTokenSpaceGuid.PcdCpuSmmUseDelayIndication                      ## CONSUMES
   gSiPkgTokenSpaceGuid.PcdCpuSmmUseBlockIndication                      ## CONSUMES
   gSiPkgTokenSpaceGuid.PcdCpuSmmUseSmmEnableIndication                  ## CONSUMES
 
-  gBoardModuleTokenSpaceGuid.PcdVirtualButtonVolumeUpSupport
-  gBoardModuleTokenSpaceGuid.PcdVirtualButtonVolumeDownSupport
-  gBoardModuleTokenSpaceGuid.PcdVirtualButtonHomeButtonSupport
-  gBoardModuleTokenSpaceGuid.PcdVirtualButtonRotationLockSupport
-  gBoardModuleTokenSpaceGuid.PcdSlateModeSwitchSupport
-  gBoardModuleTokenSpaceGuid.PcdAcDcAutoSwitchSupport
-  gBoardModuleTokenSpaceGuid.PcdPmPowerButtonGpioPin
-  gBoardModuleTokenSpaceGuid.PcdAcpiEnableAllButtonSupport
-  gBoardModuleTokenSpaceGuid.PcdAcpiHidDriverButtonSupport
-  gBoardModuleTokenSpaceGuid.PcdTsOnDimmTemperature
-  gBoardModuleTokenSpaceGuid.PcdBatteryPresent
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonVolumeUpSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonVolumeDownSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonHomeButtonSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonRotationLockSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlateModeSwitchSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcDcAutoSwitchSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPmPowerButtonGpioPin
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiEnableAllButtonSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiHidDriverButtonSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTsOnDimmTemperature
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBatteryPresent
 
-  gBoardModuleTokenSpaceGuid.PcdUsbTypeCSupport
-  gBoardModuleTokenSpaceGuid.PcdUsbTypeCEcLess
-  gBoardModuleTokenSpaceGuid.PcdEcHotKeyF3Support
-  gBoardModuleTokenSpaceGuid.PcdEcHotKeyF4Support
-  gBoardModuleTokenSpaceGuid.PcdEcHotKeyF5Support
-  gBoardModuleTokenSpaceGuid.PcdEcHotKeyF6Support
-  gBoardModuleTokenSpaceGuid.PcdEcHotKeyF7Support
-  gBoardModuleTokenSpaceGuid.PcdEcHotKeyF8Support
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCEcLess
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcHotKeyF3Support
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcHotKeyF4Support
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcHotKeyF5Support
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcHotKeyF6Support
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcHotKeyF7Support
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcHotKeyF8Support
 
   #
   # PSS Board Configuration.
   #
-  gBoardModuleTokenSpaceGuid.PcdPssReadSN
-  gBoardModuleTokenSpaceGuid.PcdPssI2cBusNumber
-  gBoardModuleTokenSpaceGuid.PcdPssI2cSlaveAddress
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPssReadSN
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPssI2cBusNumber
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPssI2cSlaveAddress
 
-  gBoardModuleTokenSpaceGuid.PcdXhciAcpiTableSignature
-  gBoardModuleTokenSpaceGuid.PcdPreferredPmProfile
-  gBoardModuleTokenSpaceGuid.PcdFingerPrintSleepGpio
-  gBoardModuleTokenSpaceGuid.PcdFingerPrintIrqGpio
-  gBoardModuleTokenSpaceGuid.PcdGnssResetGpio
-  gBoardModuleTokenSpaceGuid.PcdTouchpadIrqGpio
-  gBoardModuleTokenSpaceGuid.PcdTouchpanelIrqGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdXhciAcpiTableSignature
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPreferredPmProfile
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdFingerPrintSleepGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdFingerPrintIrqGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGnssResetGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTouchpadIrqGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTouchpanelIrqGpio
 
-  gBoardModuleTokenSpaceGuid.PcdHdaI2sCodecIrqGpio
-  gBoardModuleTokenSpaceGuid.PcdHdaI2sCodecI2cBusNumber
-  gBoardModuleTokenSpaceGuid.PcdBleUsbPortNumber
-  gBoardModuleTokenSpaceGuid.PcdEcSmiGpio
-  gBoardModuleTokenSpaceGuid.PcdEcLowPowerExitGpio
-  gBoardModuleTokenSpaceGuid.PcdHidI2cIntPad
-  gBoardModuleTokenSpaceGuid.PcdDetectPs2KbOnCmdAck
-  gBoardModuleTokenSpaceGuid.PcdSpdAddressOverride
-  gBoardModuleTokenSpaceGuid.PcdDDISelection
-  gBoardModuleTokenSpaceGuid.PcdGfxCrbDetectGpio
-  gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort1
-  gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort1Pch
-  gBoardModuleTokenSpaceGuid.PcdUsbCPort1Proterties
-  gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort2
-  gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort2Pch
-  gBoardModuleTokenSpaceGuid.PcdUsbCPort2Proterties
-  gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort3
-  gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort3Pch
-  gBoardModuleTokenSpaceGuid.PcdUsbCPort3Proterties
-  gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort4
-  gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort4Pch
-  gBoardModuleTokenSpaceGuid.PcdUsbCPort4Proterties
-  gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort5
-  gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort5Pch
-  gBoardModuleTokenSpaceGuid.PcdUsbCPort5Proterties
-  gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort6
-  gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort6Pch
-  gBoardModuleTokenSpaceGuid.PcdUsbCPort6Proterties
-  gBoardModuleTokenSpaceGuid.PcdMipiCam0LinkUsed
-  gBoardModuleTokenSpaceGuid.PcdMipiCam1LinkUsed
-  gBoardModuleTokenSpaceGuid.PcdMipiCam2LinkUsed
-  gBoardModuleTokenSpaceGuid.PcdMipiCam3LinkUsed
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHdaI2sCodecIrqGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHdaI2sCodecI2cBusNumber
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBleUsbPortNumber
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcSmiGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcLowPowerExitGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHidI2cIntPad
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDetectPs2KbOnCmdAck
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpdAddressOverride
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDDISelection
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGfxCrbDetectGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort1Pch
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort1Proterties
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort2Pch
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort2Proterties
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort3
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort3Pch
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort3Proterties
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort4
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort4Pch
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort4Proterties
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort5
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort5Pch
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort5Proterties
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort6
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort6Pch
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort6Proterties
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCam0LinkUsed
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCam1LinkUsed
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCam2LinkUsed
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCam3LinkUsed
   gPlatformModuleTokenSpaceGuid.PcdH8S2113Present
   gPlatformModuleTokenSpaceGuid.PcdNat87393Present
   gPlatformModuleTokenSpaceGuid.PcdNct677FPresent
-  gBoardModuleTokenSpaceGuid.PcdConvertableDockSupport
-  gBoardModuleTokenSpaceGuid.PcdSmcRuntimeSciPin
-  gBoardModuleTokenSpaceGuid.PcdRealBattery1Control
-  gBoardModuleTokenSpaceGuid.PcdRealBattery2Control
-  gBoardModuleTokenSpaceGuid.PcdDimmPopulationError
-  gBoardModuleTokenSpaceGuid.PcdBtIrqGpio
-  gBoardModuleTokenSpaceGuid.PcdBtRfKillGpio
-  gBoardModuleTokenSpaceGuid.PcdWhlErbRtd3TableEnable
-  gBoardModuleTokenSpaceGuid.PcdTypeCPortsSupported
-  gBoardModuleTokenSpaceGuid.PcdMipiCamSensor
-  gBoardModuleTokenSpaceGuid.PcdH8S2113SIO
-  gBoardModuleTokenSpaceGuid.PcdNCT6776FCOM
-  gBoardModuleTokenSpaceGuid.PcdNCT6776FSIO
-  gBoardModuleTokenSpaceGuid.PcdNCT6776FHWMON
-  gBoardModuleTokenSpaceGuid.PcdGpioTier2WakeEnable
-  gBoardModuleTokenSpaceGuid.PcdFunctionGopVbtSpecificUpdate
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdConvertableDockSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmcRuntimeSciPin
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRealBattery1Control
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRealBattery2Control
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDimmPopulationError
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBtIrqGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBtRfKillGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWhlErbRtd3TableEnable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTypeCPortsSupported
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCamSensor
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdH8S2113SIO
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdNCT6776FCOM
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdNCT6776FSIO
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdNCT6776FHWMON
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioTier2WakeEnable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdFunctionGopVbtSpecificUpdate
 
 [Sources]
   PolicyInitDxe.c

+ 6 - 6
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BasePlatformHookLib/BasePlatformHookLib.inf

@@ -37,16 +37,16 @@
 
 [Pcd]
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdLpcSioIndexPort                ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdLpcSioDataPort                 ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioIndexPort       ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioDataPort        ## CONSUMES
   gPlatformModuleTokenSpaceGuid.PcdDesktopLpcSioDataDefaultPort   ## CONSUMES
   gPlatformModuleTokenSpaceGuid.PcdDesktopLpcSioIndexDefaultPort  ## CONSUMES
 
 [FixedPcd]
-  gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort        ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdSioBaseAddress                 ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdLpcIoDecodeRange               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PchLpcIoEnableDecoding            ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort        ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSioBaseAddress                 ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcIoDecodeRange               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PchLpcIoEnableDecoding            ## CONSUMES
 
 [Sources]
   BasePlatformHookLib.c

+ 1 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf

@@ -38,7 +38,7 @@
   CoffeelakeSiliconPkg/SiPkg.dec
 
 [Pcd]
-  gBoardModuleTokenSpaceGuid.PcdSmcExtSmiBitPosition   ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmcExtSmiBitPosition   ## CONSUMES
 
 [Protocols]
 

+ 1 - 1
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf

@@ -38,7 +38,7 @@
   CoffeelakeSiliconPkg/SiPkg.dec
 
 [Pcd]
-  gBoardModuleTokenSpaceGuid.PcdSmcExtSmiBitPosition   ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmcExtSmiBitPosition   ## CONSUMES
 
 [Protocols]
 

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

@@ -42,14 +42,14 @@
   GpioTableWhiskeylakeUDdr4Rvp.c
 
 [Pcd]
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableSize
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableTouchPanel
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableTouchPanel
 
-  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable
-  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTableSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTableSize
 
-  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTable
-  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTableSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTableSize
 
   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2CurrentIrqNum

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

@@ -38,79 +38,79 @@
   PeiBoardInitPreMemLib.c
 
 [Pcd]
-  gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort
 
   # PCH-LP HSIO PTSS Table
-  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
-  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
-  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
-  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
 
   # SA Misc Config
-  gBoardModuleTokenSpaceGuid.PcdSaMiscUserBd
-  gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor
-  gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget
-  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap
-  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMapSize
-  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
-  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdData
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdDataSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscUserBd
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMapSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize
 
   # PEG Reset By GPIO
-  gBoardModuleTokenSpaceGuid.PcdPcie0WakeGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstActive
-  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0WakeGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableActive
 
 
   # SPD Address Table
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3
 
   # USB 2.0 Port AFE
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port0Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port1Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port2Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port3Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port4Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port5Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port6Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port7Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port8Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port9Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port0Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port1Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port2Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port3Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port4Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port5Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port6Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port7Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port8Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port9Afe
 
   # USB 2.0 Port Over Current Pin
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort0
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort1
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort2
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort3
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort4
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort5
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort6
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort7
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort8
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort9
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort10
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort11
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort12
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort13
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort0
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort3
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort4
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort5
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort6
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort7
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort8
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort9
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort10
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort11
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort12
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort13
 
   # USB 3.0 Port Over Current Pin
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort0
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort1
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort2
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort3
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort4
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort5
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort0
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort3
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort4
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort5
 
   # Misc
-  gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent
 
 
 

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

@@ -50,152 +50,152 @@
 [FixedPcd]
 
 [Pcd]
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableSize
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableTouchPanel
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableTouchPanel
 
-  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable
-  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTableSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTableSize
 
-  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTable
-  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTableSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTableSize
 
   #===========================================================
   gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryBase
   # Board Init Table List
 
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMem
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMemSize
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMem
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMemSize
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMem
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMemSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMem
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMemSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMem
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMemSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMem
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMemSize
 
   # WWAN Full Card Power Off and reset pins
-  gBoardModuleTokenSpaceGuid.PcdWwanFullCardPowerOffGpio
-  gBoardModuleTokenSpaceGuid.PcdWwanBbrstGpio
-  gBoardModuleTokenSpaceGuid.PcdWwanPerstGpio
-  gBoardModuleTokenSpaceGuid.PcdWwanPerstGpioPolarity
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanFullCardPowerOffGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanBbrstGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanPerstGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanPerstGpioPolarity
 
   # SA Misc Config
-  gBoardModuleTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment
-  gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleavedControl
-  gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleaved
-  gBoardModuleTokenSpaceGuid.PcdSaDdrFreqLimit
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleavedControl
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleaved
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDdrFreqLimit
 
   # Display DDI
-  gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTable           ## PRODUCES
-  gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTableSize       ## PRODUCES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTable           ## PRODUCES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTableSize       ## PRODUCES
 
   # PEG Reset By GPIO
-  gBoardModuleTokenSpaceGuid.PcdPegGpioResetControl
-  gBoardModuleTokenSpaceGuid.PcdPegGpioResetSupoort
-  gBoardModuleTokenSpaceGuid.PcdPeg0ResetGpioPad
-  gBoardModuleTokenSpaceGuid.PcdPeg0ResetGpioActive
-  gBoardModuleTokenSpaceGuid.PcdPeg3ResetGpioPad
-  gBoardModuleTokenSpaceGuid.PcdPeg3ResetGpioActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPegGpioResetControl
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPegGpioResetSupoort
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg0ResetGpioPad
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg0ResetGpioActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg3ResetGpioPad
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg3ResetGpioActive
 
   # PCIE RTD3 GPIO
-  gBoardModuleTokenSpaceGuid.PcdRootPortDev
-  gBoardModuleTokenSpaceGuid.PcdRootPortFunc
-  gBoardModuleTokenSpaceGuid.PcdRootPortIndex
-
-  gBoardModuleTokenSpaceGuid.PcdPcie0GpioSupport
-  gBoardModuleTokenSpaceGuid.PcdPcie1GpioSupport
-  gBoardModuleTokenSpaceGuid.PcdPcie1WakeGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstActive
-  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableActive
-
-  gBoardModuleTokenSpaceGuid.PcdPcie2GpioSupport
-  gBoardModuleTokenSpaceGuid.PcdPcie2WakeGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstActive
-  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableActive
-
-  gBoardModuleTokenSpaceGuid.PcdPcie3GpioSupport
-  gBoardModuleTokenSpaceGuid.PcdPcie3WakeGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstActive
-  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortDev
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortFunc
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortIndex
+
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0GpioSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1GpioSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1WakeGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableActive
+
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2GpioSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2WakeGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableActive
+
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3GpioSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3WakeGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableActive
 
   # CA Vref Configuration
-  gBoardModuleTokenSpaceGuid.PcdMrcCaVrefConfig
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcCaVrefConfig
 
   # PCIe Clock Info
-  gBoardModuleTokenSpaceGuid.PcdPcieClock0
-  gBoardModuleTokenSpaceGuid.PcdPcieClock1
-  gBoardModuleTokenSpaceGuid.PcdPcieClock2
-  gBoardModuleTokenSpaceGuid.PcdPcieClock3
-  gBoardModuleTokenSpaceGuid.PcdPcieClock4
-  gBoardModuleTokenSpaceGuid.PcdPcieClock5
-  gBoardModuleTokenSpaceGuid.PcdPcieClock6
-  gBoardModuleTokenSpaceGuid.PcdPcieClock7
-  gBoardModuleTokenSpaceGuid.PcdPcieClock8
-  gBoardModuleTokenSpaceGuid.PcdPcieClock9
-  gBoardModuleTokenSpaceGuid.PcdPcieClock10
-  gBoardModuleTokenSpaceGuid.PcdPcieClock11
-  gBoardModuleTokenSpaceGuid.PcdPcieClock12
-  gBoardModuleTokenSpaceGuid.PcdPcieClock13
-  gBoardModuleTokenSpaceGuid.PcdPcieClock14
-  gBoardModuleTokenSpaceGuid.PcdPcieClock15
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock0
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock3
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock4
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock5
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock6
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock7
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock8
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock9
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock10
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock11
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock12
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock13
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock14
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock15
 
   # USB 2.0 Port AFE
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port10Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port11Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port12Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port13Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port14Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port15Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port10Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port11Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port12Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port13Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port14Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port15Afe
 
   # USB 2.0 Port Over Current Pin
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort14
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort15
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort14
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort15
 
   # USB 3.0 Port Over Current Pin
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort6
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort7
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort8
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort9
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort6
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort7
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort8
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort9
 
   # GPIO Group Tier
-  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw0
-  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw1
-  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw0
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw2
 
   # Pch PmConfig Policy
-  gBoardModuleTokenSpaceGuid.PcdSlpS0VmRuntimeControl
-  gBoardModuleTokenSpaceGuid.PcdSlpS0Vm070VSupport
-  gBoardModuleTokenSpaceGuid.PcdSlpS0Vm075VSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0VmRuntimeControl
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0Vm070VSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0Vm075VSupport
 
   # Misc
-  gBoardModuleTokenSpaceGuid.PcdPc8374SioKbcPresent
-  gBoardModuleTokenSpaceGuid.PcdOddPowerInitEnable
-  gBoardModuleTokenSpaceGuid.PcdIvCamInitPresent
-  gBoardModuleTokenSpaceGuid.PcdRecoveryModeGpio
-  gBoardModuleTokenSpaceGuid.PcdMobileDramPresent
-  gBoardModuleTokenSpaceGuid.PcdCpuVboostEnable
-
-
-  gBoardModuleTokenSpaceGuid.PcdSpdPresent
-  gBoardModuleTokenSpaceGuid.PcdBoardRev
-  gBoardModuleTokenSpaceGuid.PcdBoardBomId
-  gBoardModuleTokenSpaceGuid.PcdPlatformType
-  gBoardModuleTokenSpaceGuid.PcdDualDimmPerChannelBoardType
-
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable2                   ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable2Size               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdDebugUsbUartEnable
-  gBoardModuleTokenSpaceGuid.PcdMipiCamGpioEnable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPc8374SioKbcPresent
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdOddPowerInitEnable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIvCamInitPresent
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRecoveryModeGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMobileDramPresent
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCpuVboostEnable
+
+
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpdPresent
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardRev
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardBomId
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPlatformType
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDualDimmPerChannelBoardType
+
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable2                   ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable2Size               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDebugUsbUartEnable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCamGpioEnable
   # TPM interrupt
   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2CurrentIrqNum
 

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

@@ -60,225 +60,225 @@
   gTcoWdtHobGuid                                ## CONSUMES
 
 [Pcd]
-  gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort
 
   # PCH-LP HSIO PTSS Table
-  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
-  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
-  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
-  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
 
   # PCH-H HSIO PTSS Table
-  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1
-  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2
-  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
-  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
+  #gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1
+  #gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2
+  #gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
+  #gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
 
   # SA Misc Config
-  gBoardModuleTokenSpaceGuid.PcdSaMiscUserBd
-  gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor
-  gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget
-  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap
-  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMapSize
-  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
-  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdData
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdDataSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscUserBd
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMapSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize
 
   # PEG Reset By GPIO
-  gBoardModuleTokenSpaceGuid.PcdPcie0WakeGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstActive
-  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0WakeGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableActive
 
 
   # SPD Address Table
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2
-  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3
 
   # USB 2.0 Port AFE
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port0Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port1Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port2Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port3Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port4Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port5Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port6Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port7Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port8Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port9Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port0Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port1Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port2Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port3Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port4Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port5Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port6Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port7Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port8Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port9Afe
 
   # USB 2.0 Port Over Current Pin
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort0
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort1
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort2
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort3
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort4
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort5
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort6
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort7
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort8
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort9
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort10
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort11
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort12
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort13
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort0
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort3
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort4
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort5
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort6
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort7
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort8
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort9
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort10
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort11
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort12
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort13
 
   # USB 3.0 Port Over Current Pin
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort0
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort1
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort2
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort3
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort4
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort5
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort0
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort3
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort4
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort5
 
   # Misc
-  gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent
 
   #===========================================================
   # Board Init Table List
 
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMem
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMemSize
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMem
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMemSize
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMem
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMemSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMem
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMemSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMem
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMemSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMem
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMemSize
 
   # WWAN Full Card Power Off and reset pins
-  gBoardModuleTokenSpaceGuid.PcdWwanFullCardPowerOffGpio
-  gBoardModuleTokenSpaceGuid.PcdWwanBbrstGpio
-  gBoardModuleTokenSpaceGuid.PcdWwanPerstGpio
-  gBoardModuleTokenSpaceGuid.PcdWwanPerstGpioPolarity
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanFullCardPowerOffGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanBbrstGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanPerstGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanPerstGpioPolarity
 
   # SA Misc Config
-  gBoardModuleTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment
-  gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleavedControl
-  gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleaved
-  gBoardModuleTokenSpaceGuid.PcdSaDdrFreqLimit
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleavedControl
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleaved
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDdrFreqLimit
 
   # Display DDI
-  gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTable           ## PRODUCES
-  gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTableSize       ## PRODUCES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTable           ## PRODUCES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTableSize       ## PRODUCES
 
   # PEG Reset By GPIO
-  gBoardModuleTokenSpaceGuid.PcdPegGpioResetControl
-  gBoardModuleTokenSpaceGuid.PcdPegGpioResetSupoort
-  gBoardModuleTokenSpaceGuid.PcdPeg0ResetGpioPad
-  gBoardModuleTokenSpaceGuid.PcdPeg0ResetGpioActive
-  gBoardModuleTokenSpaceGuid.PcdPeg3ResetGpioPad
-  gBoardModuleTokenSpaceGuid.PcdPeg3ResetGpioActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPegGpioResetControl
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPegGpioResetSupoort
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg0ResetGpioPad
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg0ResetGpioActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg3ResetGpioPad
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg3ResetGpioActive
 
   # PCIE RTD3 GPIO
-  gBoardModuleTokenSpaceGuid.PcdRootPortDev
-  gBoardModuleTokenSpaceGuid.PcdRootPortFunc
-  gBoardModuleTokenSpaceGuid.PcdRootPortIndex
-
-  gBoardModuleTokenSpaceGuid.PcdPcie0GpioSupport
-
-  gBoardModuleTokenSpaceGuid.PcdPcie1GpioSupport
-  gBoardModuleTokenSpaceGuid.PcdPcie1WakeGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstActive
-  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableActive
-
-  gBoardModuleTokenSpaceGuid.PcdPcie2GpioSupport
-  gBoardModuleTokenSpaceGuid.PcdPcie2WakeGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstActive
-  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableActive
-
-  gBoardModuleTokenSpaceGuid.PcdPcie3GpioSupport
-  gBoardModuleTokenSpaceGuid.PcdPcie3WakeGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstActive
-  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableExpanderNo
-  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableGpioNo
-  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortDev
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortFunc
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortIndex
+
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0GpioSupport
+
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1GpioSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1WakeGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableActive
+
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2GpioSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2WakeGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableActive
+
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3GpioSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3WakeGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstActive
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableExpanderNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableGpioNo
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableActive
 
   # CA Vref Configuration
-  gBoardModuleTokenSpaceGuid.PcdMrcCaVrefConfig
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcCaVrefConfig
 
   # PCIe Clock Info
-  gBoardModuleTokenSpaceGuid.PcdPcieClock0
-  gBoardModuleTokenSpaceGuid.PcdPcieClock1
-  gBoardModuleTokenSpaceGuid.PcdPcieClock2
-  gBoardModuleTokenSpaceGuid.PcdPcieClock3
-  gBoardModuleTokenSpaceGuid.PcdPcieClock4
-  gBoardModuleTokenSpaceGuid.PcdPcieClock5
-  gBoardModuleTokenSpaceGuid.PcdPcieClock6
-  gBoardModuleTokenSpaceGuid.PcdPcieClock7
-  gBoardModuleTokenSpaceGuid.PcdPcieClock8
-  gBoardModuleTokenSpaceGuid.PcdPcieClock9
-  gBoardModuleTokenSpaceGuid.PcdPcieClock10
-  gBoardModuleTokenSpaceGuid.PcdPcieClock11
-  gBoardModuleTokenSpaceGuid.PcdPcieClock12
-  gBoardModuleTokenSpaceGuid.PcdPcieClock13
-  gBoardModuleTokenSpaceGuid.PcdPcieClock14
-  gBoardModuleTokenSpaceGuid.PcdPcieClock15
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock0
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock3
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock4
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock5
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock6
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock7
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock8
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock9
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock10
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock11
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock12
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock13
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock14
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock15
 
   # USB 2.0 Port AFE
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port10Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port11Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port12Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port13Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port14Afe
-  gBoardModuleTokenSpaceGuid.PcdUsb20Port15Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port10Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port11Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port12Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port13Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port14Afe
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port15Afe
 
   # USB 2.0 Port Over Current Pin
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort14
-  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort15
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort14
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort15
 
   # USB 3.0 Port Over Current Pin
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort6
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort7
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort8
-  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort9
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort6
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort7
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort8
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort9
 
   # GPIO Group Tier
-  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw0
-  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw1
-  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw2
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw0
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw2
 
   # Pch PmConfig Policy
-  gBoardModuleTokenSpaceGuid.PcdSlpS0VmRuntimeControl
-  gBoardModuleTokenSpaceGuid.PcdSlpS0Vm070VSupport
-  gBoardModuleTokenSpaceGuid.PcdSlpS0Vm075VSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0VmRuntimeControl
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0Vm070VSupport
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0Vm075VSupport
 
   # Misc
-  gBoardModuleTokenSpaceGuid.PcdPc8374SioKbcPresent
-  gBoardModuleTokenSpaceGuid.PcdOddPowerInitEnable
-  gBoardModuleTokenSpaceGuid.PcdIvCamInitPresent
-  gBoardModuleTokenSpaceGuid.PcdRecoveryModeGpio
-  gBoardModuleTokenSpaceGuid.PcdMobileDramPresent
-  gBoardModuleTokenSpaceGuid.PcdCpuVboostEnable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPc8374SioKbcPresent
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdOddPowerInitEnable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIvCamInitPresent
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRecoveryModeGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMobileDramPresent
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCpuVboostEnable
 
 
-  gBoardModuleTokenSpaceGuid.PcdSpdPresent
-  gBoardModuleTokenSpaceGuid.PcdBoardRev
-  gBoardModuleTokenSpaceGuid.PcdBoardBomId
-  gBoardModuleTokenSpaceGuid.PcdPlatformType
-  gBoardModuleTokenSpaceGuid.PcdDualDimmPerChannelBoardType
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpdPresent
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardRev
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardBomId
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPlatformType
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDualDimmPerChannelBoardType
 
   gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaBaseAddress
   gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize
   gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress  ## CONSUMES
   gMinPlatformPkgTokenSpaceGuid.PcdPciExpressRegionLength     ## CONSUMES
 
-  gBoardModuleTokenSpaceGuid.PcdPcieWwanEnable
-  gBoardModuleTokenSpaceGuid.PcdWwanResetWorkaround    ## PRODUCES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieWwanEnable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanResetWorkaround    ## PRODUCES
   gSiPkgTokenSpaceGuid.PcdTcoBaseAddress
 
 

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

@@ -40,45 +40,45 @@
   CoffeelakeSiliconPkg/SiPkg.dec
 
 [Pcd]
-  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort        ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdSioBaseAddress                 ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent                 ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdDebugUsbUartEnable                ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdMipiCamGpioEnable                 ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable                    ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableSize                ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable2                   ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable2Size               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable                 ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTableSize             ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable2                ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable2Size            ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableTouchPanel          ## CONSUMES
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress                        ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort        ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSioBaseAddress                 ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent              ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDebugUsbUartEnable             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCamGpioEnable              ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable                 ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableSize             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable2                ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable2Size            ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable              ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTableSize          ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable2             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable2Size         ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableTouchPanel       ## CONSUMES
 
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMem
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMemSize
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMem
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMemSize
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMem
-  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMemSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMem
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMemSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMem
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMemSize
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMem
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMemSize
 
   # GPIO Group Tier
-  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw0              ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw1              ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw2              ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw0              ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw1              ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw2              ## CONSUMES
 
   # Misc
-  gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent              ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdPc8374SioKbcPresent            ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdOddPowerInitEnable             ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdIvCamInitPresent               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdRecoveryModeGpio               ## CONSUMES
-  gBoardModuleTokenSpaceGuid.PcdCpuVboostEnable                ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent              ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPc8374SioKbcPresent            ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdOddPowerInitEnable             ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIvCamInitPresent               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRecoveryModeGpio               ## CONSUMES
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCpuVboostEnable                ## CONSUMES
 
-  gBoardModuleTokenSpaceGuid.PcdWwanBbrstGpio
-  gBoardModuleTokenSpaceGuid.PcdPcieWwanEnable
-  gBoardModuleTokenSpaceGuid.PcdWwanResetWorkaround
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanBbrstGpio
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieWwanEnable
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanResetWorkaround
 
 [Sources]
   PeiPlatformHooklib.c

+ 7 - 7
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.dsc

@@ -130,7 +130,7 @@
   PlatformSecLib|$(PLATFORM_BOARD_PACKAGE)/FspWrapper/Library/SecFspWrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
   TimerLib|$(PLATFORM_BOARD_PACKAGE)/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
   # Thunderbolt
-!if gBoardModuleTokenSpaceGuid.PcdTbtEnable == TRUE
+!if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable == TRUE
   TbtCommonLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/PeiDxeSmmTbtCommonLib/TbtCommonLib.inf
 !endif
 
@@ -169,7 +169,7 @@
   # Board Package
   #######################################
   # Thunderbolt
-!if gBoardModuleTokenSpaceGuid.PcdTbtEnable == TRUE
+!if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable == TRUE
   PeiDTbtInitLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/Private/PeiDTbtInitLib/PeiDTbtInitLib.inf
   PeiTbtPolicyLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/PeiTbtPolicyLib/PeiTbtPolicyLib.inf
 !endif
@@ -282,7 +282,7 @@
   $(PLATFORM_PACKAGE)/PlatformInit/ReportFv/ReportFvPei.inf
   $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf {
     <LibraryClasses>
-      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport == FALSE
+      !if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport == FALSE
         BoardInitLib|$(PROJECT)/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
       !else
         NULL|$(PROJECT)/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
@@ -292,7 +292,7 @@
 
   $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPostMem.inf {
     <LibraryClasses>
-      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport == FALSE
+      !if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport == FALSE
         BoardInitLib|$(PROJECT)/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
       !else
         NULL|$(PROJECT)/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
@@ -318,7 +318,7 @@
   # Board Package
   #######################################
   # Thunderbolt
-!if gBoardModuleTokenSpaceGuid.PcdTbtEnable == TRUE
+!if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable == TRUE
   $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
 !endif
 
@@ -397,7 +397,7 @@
 
   $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf {
     <LibraryClasses>
-      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport == FALSE
+      !if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport == FALSE
         BoardAcpiEnableLib|$(PROJECT)/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.inf
       !else
         NULL|$(PROJECT)/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
@@ -417,7 +417,7 @@
   }
 
   # Thunderbolt
-!if gBoardModuleTokenSpaceGuid.PcdTbtEnable == TRUE
+!if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable == TRUE
   $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Smm/TbtSmm.inf
   $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
   $(PLATFORM_BOARD_PACKAGE)/Features/PciHotPlug/PciHotPlug.inf

+ 2 - 2
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.fdf

@@ -613,7 +613,7 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 FvNameGuid         = 6053D78A-457E-4490-A237-31D0FBE2F305
 
-!if gBoardModuleTokenSpaceGuid.PcdTbtEnable == TRUE
+!if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable == TRUE
 INF $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
 !endif
 
@@ -655,7 +655,7 @@ READ_LOCK_CAP      = TRUE
 READ_LOCK_STATUS   = TRUE
 FvNameGuid         = 11F6E304-43F9-4B2F-90AB-B8FFEAD6205D
 
-!if gBoardModuleTokenSpaceGuid.PcdTbtEnable == TRUE
+!if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable == TRUE
 INF  $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Dxe/TbtDxe.inf
 INF  $(PLATFORM_BOARD_PACKAGE)/Features/PciHotPlug/PciHotPlug.inf
 INF  $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Smm/TbtSmm.inf

+ 17 - 17
Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkgPcd.dsc

@@ -166,9 +166,9 @@
   ######################################
   # Board Configuration
   ######################################
-  gBoardModuleTokenSpaceGuid.PcdIntelGopEnable|TRUE
-  gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport|TRUE
-  gBoardModuleTokenSpaceGuid.PcdTbtEnable|FALSE
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIntelGopEnable|TRUE
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport|TRUE
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable|FALSE
 
 [PcdsFixedAtBuild.common]
   ######################################
@@ -367,20 +367,20 @@
   ######################################
 
   # Thunderbolt Configuration
-  gBoardModuleTokenSpaceGuid.PcdDTbtAcDcSwitch|0x0
-  gBoardModuleTokenSpaceGuid.PcdDTbtAspm|0x0
-  gBoardModuleTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad|0x02010011
-  gBoardModuleTokenSpaceGuid.PcdDTbtForcepowerGpioPad|13
-  gBoardModuleTokenSpaceGuid.PcdDTbtGpioLevel|0x1
-  gBoardModuleTokenSpaceGuid.PcdDTbtHotNotify|0x1
-  gBoardModuleTokenSpaceGuid.PcdDTbtHotSMI|0x1
-  gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax|26
-  gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax|28
-  gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemRsvd|100
-  gBoardModuleTokenSpaceGuid.PcdDTbtSetClkReq|0x1
-  gBoardModuleTokenSpaceGuid.PcdDTbtWakeupSupport|0x0
-  gBoardModuleTokenSpaceGuid.PcdRtd3Tbt|0x1
-  gBoardModuleTokenSpaceGuid.PcdRtd3TbtClkReq|0x1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAcDcSwitch|0x0
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAspm|0x0
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad|0x02010011
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtForcepowerGpioPad|13
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpioLevel|0x1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotNotify|0x1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotSMI|0x1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax|26
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax|28
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemRsvd|100
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtSetClkReq|0x1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtWakeupSupport|0x0
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3Tbt|0x1
+  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtClkReq|0x1
 
 [PcdsDynamicHii.X64.DEFAULT]
   ######################################