From mboxrd@z Thu Jan  1 00:00:00 1970
Authentication-Results: mx.groups.io;
 dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: chasel.chiu@intel.com)
Received: from mga11.intel.com (mga11.intel.com [192.55.52.93])
 by groups.io with SMTP; Tue, 08 Oct 2019 09:34:01 -0700
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from orsmga003.jf.intel.com ([10.7.209.27])
  by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Oct 2019 09:34:01 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.67,270,1566889200"; 
   d="scan'208";a="196642940"
Received: from pgsmsx114.gar.corp.intel.com ([10.108.55.203])
  by orsmga003.jf.intel.com with ESMTP; 08 Oct 2019 09:33:57 -0700
Received: from pgsmsx112.gar.corp.intel.com ([169.254.3.2]) by
 pgsmsx114.gar.corp.intel.com ([169.254.4.250]) with mapi id 14.03.0439.000;
 Wed, 9 Oct 2019 00:33:56 +0800
From: "Chiu, Chasel" <chasel.chiu@intel.com>
To: "Kubacki, Michael A" <michael.a.kubacki@intel.com>, "devel@edk2.groups.io"
	<devel@edk2.groups.io>
CC: "Desimone, Nathaniel L" <nathaniel.l.desimone@intel.com>
Subject: Re: [edk2-platforms][PATCH V1 13/17] WhiskeylakeOpenBoardPkg: Assign unique token namespace
Thread-Topic: [edk2-platforms][PATCH V1 13/17] WhiskeylakeOpenBoardPkg:
 Assign unique token namespace
Thread-Index: AQHVfZeuSUx7UJFvV0WlhTyO+ohQyKdQ8R0A
Date: Tue, 8 Oct 2019 16:33:55 +0000
Message-ID: <3C3EFB470A303B4AB093197B6777CCEC504F20E1@PGSMSX112.gar.corp.intel.com>
References: <20191008051645.22052-1-michael.a.kubacki@intel.com>
 <20191008051645.22052-14-michael.a.kubacki@intel.com>
In-Reply-To: <20191008051645.22052-14-michael.a.kubacki@intel.com>
Accept-Language: en-US
X-MS-Has-Attach: 
X-MS-TNEF-Correlator: 
dlp-product: dlpe-windows
dlp-version: 11.2.0.6
dlp-reaction: no-action
x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMjdjNjIwMDYtNGM2OC00ZWMxLTkyNDMtMmNmMzNhYzBkZDUxIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoicm4yRTFMOEExSDJKNGgyNFhJYW51ektRaURJWVVDeCtWcVVscUdwcG1kelVXQWxlZ3FDeFV5OERZUjNvV2VvQSJ9
x-ctpclassification: CTP_NT
x-originating-ip: [172.30.20.206]
MIME-Version: 1.0
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable


Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>

> -----Original Message-----
> From: Kubacki, Michael A <michael.a.kubacki@intel.com>
> Sent: Tuesday, October 8, 2019 1:17 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu@intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone@intel.com>
> Subject: [edk2-platforms][PATCH V1 13/17] WhiskeylakeOpenBoardPkg:
> Assign unique token namespace
>=20
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2248
>=20
> 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.
>=20
> This change assigns a unique GUID value and a name specific to the
> package to provide differentiation from PCDs in other board
> packages.
>=20
> 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>
> ---
>  Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
> | 684 ++++++++++----------
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.
> dsc                                                 |  14 +-
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg
> Pcd.dsc                                              |  34 +-
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardPkg.
> fdf                                                 |   4 +-
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe
> .inf                                               |  14 +-
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmm
> TbtCommonLib/TbtCommonLib.inf                      |  26 +-
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicy
> Lib/PeiTbtPolicyLib.inf                         |   2 +-
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSm
> m.inf                                              |   2 +-
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolicyI
> nitLib/PeiFspPolicyInitLib.inf                   |  22 +-
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPoli
> cyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf |  64 +-
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/PeiH
> daVerbTableLib.inf                                |  14 +-
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateLib
> /PeiPolicyUpdateLib.inf                         | 280 ++++----
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitDxe=
.
> inf                                           | 164 ++---
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BasePla
> tformHookLib/BasePlatformHookLib.inf              |  12 +-
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardA
> cpiLib/SmmBoardAcpiEnableLib.inf                   |   2 +-
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardA
> cpiLib/SmmMultiBoardAcpiSupportLib.inf             |   2 +-
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardI
> nitLib/PeiBoardInitPostMemLib.inf                  |  14 +-
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardI
> nitLib/PeiBoardInitPreMemLib.inf                   | 112 ++--
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardI
> nitLib/PeiMultiBoardInitPostMemLib.inf             | 214 +++---
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/BoardI
> nitLib/PeiMultiBoardInitPreMemLib.inf              | 316 ++++-----
>=20
> Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPlatf
> ormHookLib/PeiPlatformHooklib.inf                |  66 +-
>  21 files changed, 1031 insertions(+), 1031 deletions(-)
>=20
> diff --git a/Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
> index 8de48077f0..34494d0168 100644
> --- a/Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
> +++ b/Platform/Intel/WhiskeylakeOpenBoardPkg/OpenBoardPkg.dec
> @@ -26,7 +26,7 @@ WhiskeylakeURvp/Include
>=20
>  [Guids]
>=20
> -gBoardModuleTokenSpaceGuid            =3D  {0x72d1fff7, 0xa42a,
> 0x4219, {0xb9, 0x95, 0x5a, 0x67, 0x53, 0x6e, 0xa4, 0x2a}}
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid =3D {0xec265230, 0x3a23, 0x4650,
> {0xb7, 0xb6, 0x52, 0x1d, 0x33, 0xd6, 0x6f, 0x78}}
>=20
>  gTianoLogoGuid                        =3D  {0x7BB28B99, 0x61BB,
> 0x11D5, {0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}}
>=20
> @@ -72,8 +72,8 @@ gPeiTbtPolicyBoardInitDonePpiGuid     =3D
> {0x970f9c60, 0x8547, 0x49d7, { 0xa4, 0x
>=20
>  [PcdsFixedAtBuild]
>=20
> -gBoardModuleTokenSpaceGuid.PcdLpcIoDecodeRange|0x0010|UINT16|0x1
> 0001004
> -gBoardModuleTokenSpaceGuid.PchLpcIoEnableDecoding|0x3c03|UINT16|0x
> 10001005
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcIoDecodeRange|0x0010
> |UINT16|0x10001004
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PchLpcIoEnableDecoding|0x3c
> 03|UINT16|0x10001005
>=20
>=20
> gPlatformModuleTokenSpaceGuid.PcdDmiBaseAddress|0xFED18000|UINT64
> |0x90000003
>=20
> gPlatformModuleTokenSpaceGuid.PcdDmiMmioSize|0x1000|UINT32|0x9000
> 0004
> @@ -102,455 +102,455 @@
> gPlatformModuleTokenSpaceGuid.PcdRuntimeUpdateFvHeaderLength|0x48|
> UINT8|0x900000
>=20
> gPlatformModuleTokenSpaceGuid.PcdEcExtraIoBase|0x6A0|UINT16|0x20000
> 505
>=20
> gPlatformModuleTokenSpaceGuid.PcdFspTemporaryRamSize|0x1000|UINT32
> |0x10001003
>=20
> -gBoardModuleTokenSpaceGuid.PcdSmcExtSmiBitPosition|0x01|UINT8|0x90
> 000015
> -gBoardModuleTokenSpaceGuid.PcdLpcSioIndexPort|0x4e|UINT16|0x900000
> 18
> -gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort|0x164E|UINT16
> |0x9000001C
> -gBoardModuleTokenSpaceGuid.PcdSioBaseAddress|0x0680|UINT16|0x9000
> 001D
> -gBoardModuleTokenSpaceGuid.PcdLpcSioDataPort|0x4f|UINT16|0x9000001
> F
> -gBoardModuleTokenSpaceGuid.PcdLpcSioIndexDefaultPort|0x164E|UINT16|
> 0x90000021
> -gBoardModuleTokenSpaceGuid.PcdLpcSioDataDefaultPort|0x164F|UINT16|0
> x90000022
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmcExtSmiBitPosition|0x0
> 1|UINT8|0x90000015
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioIndexPort|0x4e|UIN
> T16|0x90000018
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort|0
> x164E|UINT16|0x9000001C
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSioBaseAddress|0x0680|UI
> NT16|0x9000001D
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioDataPort|0x4f|UINT
> 16|0x9000001F
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioIndexDefaultPort|0x
> 164E|UINT16|0x90000021
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioDataDefaultPort|0x1
> 64F|UINT16|0x90000022
>=20
>  [PcdsDynamic]
>  # Board GPIO Table
> -gBoardModuleTokenSpaceGuid.PcdBoardGpioTable|0|UINT32|0x00000040
> -gBoardModuleTokenSpaceGuid.PcdBoardGpioTableSize|0|UINT16|0x00000
> 041
> -gBoardModuleTokenSpaceGuid.PcdBoardGpioTable2|0|UINT32|0x00000042
> -gBoardModuleTokenSpaceGuid.PcdBoardGpioTable2Size|0|UINT16|0x0000
> 0043
> -gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMem|0|UINT32|0x00
> 0000113
> -gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMemSize|0|UINT16|
> 0x000000114
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable|0|UINT32
> |0x00000040
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableSize|0|UIN
> T16|0x00000041
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable2|0|UINT3
> 2|0x00000042
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable2Size|0|UI
> NT16|0x00000043
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMem|0
> |UINT32|0x000000113
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMemSiz
> e|0|UINT16|0x000000114
>=20
>  # Board Expander GPIO Table
> -gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable|0|UINT32|0x000000
> 44
> -gBoardModuleTokenSpaceGuid.PcdGpioExpanderTableSize|0|UINT16|0x000
> 00045
> -gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable2|0|UINT32|0x00000
> 046
> -gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable2Size|0|UINT16|0x00
> 000047
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable|0|UIN
> T32|0x00000044
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTableSize|0|
> UINT16|0x00000045
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable2|0|UI
> NT32|0x00000046
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable2Size|0
> |UINT16|0x00000047
>=20
>  # TouchPanel & SDHC CD GPIO Table
> -gBoardModuleTokenSpaceGuid.PcdBoardGpioTableTouchPanel|0|UINT32|0
> x00000048
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableTouchPane
> l|0|UINT32|0x00000048
>=20
>  # PCH-LP HSIO PTSS Table
> -gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable1|0|UINT32|0x0
> 000004A
> -gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable2|0|UINT32|0x0
> 000004B
> -gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Size|0|UINT16|
> 0x0000004C
> -gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Size|0|UINT16|
> 0x0000004D
> -gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1|0|UINT32|0x00
> 00004E
> -gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2|0|UINT32|0x00
> 00004F
> -gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size|0|UINT16|
> 0x00000050
> -gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size|0|UINT16|
> 0x00000051
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1|
> 0|UINT32|0x0000004A
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2|
> 0|UINT32|0x0000004B
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Si
> ze|0|UINT16|0x0000004C
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Si
> ze|0|UINT16|0x0000004D
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1|0
> |UINT32|0x0000004E
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2|0
> |UINT32|0x0000004F
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Siz
> e|0|UINT16|0x00000050
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Siz
> e|0|UINT16|0x00000051
>=20
>  # PCH-H HSIO PTSS Table
> -gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1|0|UINT32|0x00
> 000052
> -gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2|0|UINT32|0x00
> 000053
> -gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size|0|UINT16|
> 0x00000054
> -gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size|0|UINT16|
> 0x00000055
> -gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable1|0|UINT32|0x00
> 000056
> -gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable2|0|UINT32|0x00
> 000057
> -gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable1Size|0|UINT16|0
> x00000058
> -gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable2Size|0|UINT16|0
> x00000059
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1|0
> |UINT32|0x00000052
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2|0
> |UINT32|0x00000053
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1Siz
> e|0|UINT16|0x00000054
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2Siz
> e|0|UINT16|0x00000055
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1|0|
> UINT32|0x00000056
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2|0|
> UINT32|0x00000057
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1Siz
> e|0|UINT16|0x00000058
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2Siz
> e|0|UINT16|0x00000059
>=20
>  # HDA Verb Table
> -gBoardModuleTokenSpaceGuid.PcdHdaVerbTable|0|UINT32|0x0000005A
> -gBoardModuleTokenSpaceGuid.PcdHdaVerbTable2|0|UINT32|0x0000005B
> -gBoardModuleTokenSpaceGuid.PcdExtHdaVerbTable|0|UINT32|0x0000005C
> -gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable1|0|UINT32|0x00
> 00005D
> -gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable2|0|UINT32|0x00
> 00005E
> -gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable3|0|UINT32|0x00
> 00005F
> -gBoardModuleTokenSpaceGuid.PcdDisplayAudioHdaVerbTable|0|UINT32|0x
> 00000060
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable|0|UINT32|0
> x0000005A
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable2|0|UINT32|
> 0x0000005B
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdExtHdaVerbTable|0|UINT3
> 2|0x0000005C
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable1|0
> |UINT32|0x0000005D
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable2|0
> |UINT32|0x0000005E
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable3|0
> |UINT32|0x0000005F
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisplayAudioHdaVerbTable
> |0|UINT32|0x00000060
>=20
>  # SA Misc Configuration
> -gBoardModuleTokenSpaceGuid.PcdSaMiscUserBd|0|UINT8|0x00000066
> -gBoardModuleTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment|0|UINT16|
> 0x00000067
> -gBoardModuleTokenSpaceGuid.PcdSaDdrFreqLimit|0|UINT16|0x00000101
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscUserBd|0|UINT8|0x
> 00000066
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscMmioSizeAdjustmen
> t|0|UINT16|0x00000067
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDdrFreqLimit|0|UINT16|
> 0x00000101
>=20
>  # DRAM Configuration
> -gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor|0|UINT32|0x000000
> 68
> -gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget|0|UINT32|0x00000069
> -gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap|0|UINT32|0x0000006A
> -gBoardModuleTokenSpaceGuid.PcdMrcDqByteMapSize|0|UINT16|0x000000
> 6B
> -gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram|0|UINT32|0x000
> 0006C
> -gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize|0|UINT16|0x
> 0000006D
> -gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleavedControl|FALSE|BO
> OLEAN|0x0000006E
> -gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleaved|FALSE|BOOLEAN|
> 0x0000006F
> -gBoardModuleTokenSpaceGuid.PcdMrcSpdData|0|UINT32|0x00000070
> -gBoardModuleTokenSpaceGuid.PcdMrcSpdDataSize|0|UINT16|0x00000071
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor|0|UINT
> 32|0x00000068
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget|0|UINT3
> 2|0x00000069
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap|0|UINT32|
> 0x0000006A
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMapSize|0|UIN
> T16|0x0000006B
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram|0|
> UINT32|0x0000006C
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize
> |0|UINT16|0x0000006D
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleavedContr
> ol|FALSE|BOOLEAN|0x0000006E
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleaved|FALS
> E|BOOLEAN|0x0000006F
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData|0|UINT32|0x0
> 0000070
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize|0|UINT16
> |0x00000071
>=20
>  # PEG RESET GPIO
> -gBoardModuleTokenSpaceGuid.PcdPegGpioResetControl|FALSE|BOOLEAN|0
> x00000072
> -gBoardModuleTokenSpaceGuid.PcdPegGpioResetSupoort|FALSE|BOOLEAN|
> 0x00000073
> -gBoardModuleTokenSpaceGuid.PcdPcie0WakeGpioNo|0|UINT32|0x0000007
> 9
> -gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstExpanderNo|0|UINT8|0x00
> 00007A
> -gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstGpioNo|0|UINT32|0x00000
> 07B
> -gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstActive|FALSE|BOOLEAN|0x
> 0000007C
> -gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo|0|UINT8|0x
> 0000007D
> -gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableGpioNo|0|UINT32|0x00
> 00007E
> -gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableActive|FALSE|BOOLEAN|
> 0x0000007F
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPegGpioResetControl|FALS
> E|BOOLEAN|0x00000072
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPegGpioResetSupoort|FAL
> SE|BOOLEAN|0x00000073
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0WakeGpioNo|0|UINT
> 32|0x00000079
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstExpanderNo|
> 0|UINT8|0x0000007A
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstGpioNo|0|UI
> NT32|0x0000007B
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstActive|FALSE|
> BOOLEAN|0x0000007C
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableExpanderN
> o|0|UINT8|0x0000007D
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableGpioNo|0|
> UINT32|0x0000007E
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableActive|FAL
> SE|BOOLEAN|0x0000007F
>=20
>  # SPD Address Table
> -gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0|0|UINT8|0x00000
> 099
> -gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1|0|UINT8|0x00000
> 09A
> -gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2|0|UINT8|0x00000
> 09B
> -gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3|0|UINT8|0x00000
> 09C
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0|0|U
> INT8|0x00000099
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1|0|U
> INT8|0x0000009A
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2|0|U
> INT8|0x0000009B
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3|0|U
> INT8|0x0000009C
>=20
>  # CA Vref Configuration
> -gBoardModuleTokenSpaceGuid.PcdMrcCaVrefConfig|0|UINT8|0x0000009D
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcCaVrefConfig|0|UINT8|
> 0x0000009D
>=20
>  # 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
>=20
>  # USB 2.0 Port Over Current Pin
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort0|0|UINT8|0x
> 000000CF
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort1|0|UINT8|0x
> 000000D0
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort2|0|UINT8|0x
> 000000D1
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort3|0|UINT8|0x
> 000000D2
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort4|0|UINT8|0x
> 000000D3
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort5|0|UINT8|0x
> 000000D4
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort6|0|UINT8|0x
> 000000D5
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort7|0|UINT8|0x
> 000000D6
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort8|0|UINT8|0x
> 000000D7
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort9|0|UINT8|0x
> 000000D8
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort10|0|UINT8|0
> x000000D9
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort11|0|UINT8|0
> x000000DA
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort12|0|UINT8|0
> x000000DB
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort13|0|UINT8|0
> x000000DC
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort14|0|UINT8|0
> x000000DD
> -gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort15|0|UINT8|0
> x000000DE
> +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.PcdUsb20OverCurrentPinPort1
> 0|0|UINT8|0x000000D9
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort1
> 1|0|UINT8|0x000000DA
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort1
> 2|0|UINT8|0x000000DB
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort1
> 3|0|UINT8|0x000000DC
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort1
> 4|0|UINT8|0x000000DD
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort1
> 5|0|UINT8|0x000000DE
>=20
>  # USB 3.0 Port Over Current Pin
> -gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort0|0|UINT8|0x
> 000000DF
> -gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort1|0|UINT8|0x
> 000000E0
> -gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort2|0|UINT8|0x
> 000000E1
> -gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort3|0|UINT8|0x
> 000000E2
> -gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort4|0|UINT8|0x
> 000000E3
> -gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort5|0|UINT8|0x
> 000000E4
> -gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort6|0|UINT8|0x
> 000000E5
> -gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort7|0|UINT8|0x
> 000000E6
> -gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort8|0|UINT8|0x
> 000000E7
> -gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort9|0|UINT8|0x
> 000000E8
> +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
>=20
>  # Misc
> -gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent|FALSE|BOOLEAN|0x0
> 00000EC
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent|FALSE|
> BOOLEAN|0x000000EC
>=20
>  # 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|0
> x000000FD
> +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.PcdDTbtPciePMemAddrRngMa
> x |0|UINT8|0x00000109
>=20
>  # UCMC GPIO Table
> -gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTable|0|UINT32|0x0000
> 00111
> -gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTableSize|0|UINT16|0x0
> 00000112
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTable|0|UI
> NT32|0x000000111
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTableSize|
> 0|UINT16|0x000000112
>=20
> -gBoardModuleTokenSpaceGuid.PcdAcpiSleepState|1|UINT8|0x40000002
> -gBoardModuleTokenSpaceGuid.PcdAcpiHibernate|1|UINT8|0x40000003
> -gBoardModuleTokenSpaceGuid.PcdLowPowerS0Idle|0|UINT8|0x40000004
> -gBoardModuleTokenSpaceGuid.PcdPciExpNative|0|UINT8|0x40000005
> -gBoardModuleTokenSpaceGuid.PcdNativeAspmEnable|1|UINT8|0x4000000
> 6
> -gBoardModuleTokenSpaceGuid.PcdPs2KbMsEnable|0|UINT8|0x40000009
> -gBoardModuleTokenSpaceGuid.PcdDisableActiveTripPoints|1|UINT8|0x400
> 0000A
> -gBoardModuleTokenSpaceGuid.PcdDisablePassiveTripPoints|0|UINT8|0x400
> 0000B
> -gBoardModuleTokenSpaceGuid.PcdDisableCriticalTripPoints|1|UINT8|0x400
> 0000C
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiSleepState|1|UINT8|0
> x40000002
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiHibernate|1|UINT8|0x
> 40000003
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle|0|UINT8|
> 0x40000004
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative|0|UINT8|0x4
> 0000005
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable|1|UINT
> 8|0x40000006
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable|0|UINT8|
> 0x40000009
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisableActiveTripPoints|1|
> UINT8|0x4000000A
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisablePassiveTripPoints|0
> |UINT8|0x4000000B
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisableCriticalTripPoints|1
> |UINT8|0x4000000C
>=20
>  # 0: Type-C
>  # 1: Stacked-Jack
> -gBoardModuleTokenSpaceGuid.PcdAudioConnector|0|UINT8|0x40000012
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAudioConnector|0|UINT8|
> 0x40000012
>=20
> -gBoardModuleTokenSpaceGuid.PcdAcpiGnvsAddress|0|UINT64|0x40000013
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiGnvsAddress|0|UINT6
> 4|0x40000013
>=20
>  # gIntelPeiGraphicsVbtGuid =3D  {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, 0=
xa0,
> 0x2d, 0xb0}|VOID*|0x40000014
>  #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>  #
>  # The PCD which indicates the Memory Slot Population.
>  #
> -gBoardModuleTokenSpaceGuid.PcdDualDimmPerChannelBoardType|FALSE|
> BOOLEAN|0x00101027
> -gBoardModuleTokenSpaceGuid.PcdFunctionGopVbtSpecificUpdate|0|UINT6
> 4|0x00000010
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDualDimmPerChannelBoar
> dType|FALSE|BOOLEAN|0x00101027
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdFunctionGopVbtSpecificUp
> date|0|UINT64|0x00000010
>=20
>  # Board GPIO Table
> -gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMem|0
> |UINT32|0x001000115
> -gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMemSi
> ze|0|UINT16|0x001000116
> -gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMem|0
> |UINT32|0x001000117
> -gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMemSi
> ze|0|UINT16|0x001000118
> -gBoardModuleTokenSpaceGuid.PcdWwanFullCardPowerOffGpio|0x0|UINT3
> 2|0x0010020C
> -gBoardModuleTokenSpaceGuid.PcdWwanPerstGpioPolarity|0x0|UINT8|0x0
> 010022E
> -gBoardModuleTokenSpaceGuid.PcdWwanPerstGpio|0x0|UINT32|0x0010022
> F
> -gBoardModuleTokenSpaceGuid.PcdWwanBbrstGpio|0x0|UINT32|0x001002
> 30
> -gBoardModuleTokenSpaceGuid.PcdPcieWwanEnable|FALSE|BOOLEAN|0x00
> 100231
> -gBoardModuleTokenSpaceGuid.PcdWlanWakeGpio|0x0|UINT32|0x0010023
> 4
> -gBoardModuleTokenSpaceGuid.PcdWlanRootPortNumber|0x0|UINT8|0x00
> 100235
> -gBoardModuleTokenSpaceGuid.PcdWwanResetWorkaround|FALSE|BOOLEA
> N|0x00100236
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnE
> arlyPreMem|0|UINT32|0x001000115
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnE
> arlyPreMemSize|0|UINT16|0x001000116
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffE
> arlyPreMem|0|UINT32|0x001000117
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffE
> arlyPreMemSize|0|UINT16|0x001000118
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanFullCardPowerOffGpi
> o|0x0|UINT32|0x0010020C
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanPerstGpioPolarity|0x
> 0|UINT8|0x0010022E
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanPerstGpio|0x0|UINT
> 32|0x0010022F
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanBbrstGpio|0x0|UINT
> 32|0x00100230
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieWwanEnable|FALSE|B
> OOLEAN|0x00100231
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWlanWakeGpio|0x0|UINT3
> 2|0x00100234
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWlanRootPortNumber|0x0
> |UINT8|0x00100235
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanResetWorkaround|F
> ALSE|BOOLEAN|0x00100236
>=20
>  # UCMC GPIO Table
> -gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTable|0|UINT32|0x00100
> 033
> -gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTableSize|0|UINT16|0x0
> 0100034
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTable|0|UI
> NT32|0x00100033
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTableSize|0
> |UINT16|0x00100034
>=20
>  # PEG RESET GPIO
> -gBoardModuleTokenSpaceGuid.PcdPeg0ResetGpioPad|0|UINT32|0x000000
> 74
> -gBoardModuleTokenSpaceGuid.PcdPeg0ResetGpioActive|FALSE|BOOLEAN|0
> x00000075
> -gBoardModuleTokenSpaceGuid.PcdPeg3ResetGpioPad|0|UINT32|0x000001
> 05
> -gBoardModuleTokenSpaceGuid.PcdPeg3ResetGpioActive|FALSE|BOOLEAN|0
> x00000106
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg0ResetGpioPad|0|UINT
> 32|0x00000074
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg0ResetGpioActive|FALS
> E|BOOLEAN|0x00000075
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg3ResetGpioPad|0|UINT
> 32|0x00000105
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPeg3ResetGpioActive|FALS
> E|BOOLEAN|0x00000106
>=20
>  # PCIE RTD3 GPIO
> -gBoardModuleTokenSpaceGuid.PcdRootPortDev|0xFF|UINT8|0x00000076
> -gBoardModuleTokenSpaceGuid.PcdRootPortFunc|0xFF|UINT8|0x00000077
> -gBoardModuleTokenSpaceGuid.PcdRootPortIndex|0xFF|UINT8|0x00000104
> -gBoardModuleTokenSpaceGuid.PcdPcie0GpioSupport|0|UINT8|0x00000078
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortDev|0xFF|UINT8|
> 0x00000076
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortFunc|0xFF|UINT8
> |0x00000077
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortIndex|0xFF|UINT8
> |0x00000104
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0GpioSupport|0|UINT
> 8|0x00000078
>=20
> -gBoardModuleTokenSpaceGuid.PcdPcie1GpioSupport|0|UINT8|0x00000080
> -gBoardModuleTokenSpaceGuid.PcdPcie1WakeGpioNo|0|UINT32|0x0000008
> 1
> -gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstExpanderNo|0|UINT8|0x00
> 000082
> -gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstGpioNo|0|UINT32|0x00000
> 083
> -gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstActive|FALSE|BOOLEAN|0x
> 00000084
> -gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableExpanderNo|0|UINT8|0x
> 00000085
> -gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableGpioNo|0|UINT32|0x00
> 000086
> -gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableActive|FALSE|BOOLEAN|
> 0x00000087
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1GpioSupport|0|UINT
> 8|0x00000080
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1WakeGpioNo|0|UINT
> 32|0x00000081
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstExpanderNo|
> 0|UINT8|0x00000082
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstGpioNo|0|UI
> NT32|0x00000083
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstActive|FALSE|
> BOOLEAN|0x00000084
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableExpanderN
> o|0|UINT8|0x00000085
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableGpioNo|0|
> UINT32|0x00000086
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableActive|FAL
> SE|BOOLEAN|0x00000087
>=20
> -gBoardModuleTokenSpaceGuid.PcdPcie2GpioSupport|0|UINT8|0x00000088
> -gBoardModuleTokenSpaceGuid.PcdPcie2WakeGpioNo|0|UINT32|0x0000008
> 9
> -gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstExpanderNo|0|UINT8|0x00
> 00008A
> -gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstGpioNo|0|UINT32|0x00000
> 08B
> -gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstActive|FALSE|BOOLEAN|0x
> 0000008C
> -gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableExpanderNo|0|UINT8|0x
> 0000008D
> -gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableGpioNo|0|UINT32|0x00
> 00008E
> -gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableActive|FALSE|BOOLEAN|
> 0x0000008F
> -gBoardModuleTokenSpaceGuid.PcdPcie3GpioSupport|0|UINT8|0x00000130
> -gBoardModuleTokenSpaceGuid.PcdPcie3WakeGpioNo|0|UINT32|0x0000013
> 1
> -gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstExpanderNo|0|UINT8|0x00
> 000132
> -gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstGpioNo|0|UINT32|0x00000
> 133
> -gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstActive|FALSE|BOOLEAN|0x
> 00000134
> -gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableExpanderNo|0|UINT8|0x
> 00000135
> -gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableGpioNo|0|UINT32|0x00
> 000136
> -gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableActive|FALSE|BOOLEAN|
> 0x00000137
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2GpioSupport|0|UINT
> 8|0x00000088
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2WakeGpioNo|0|UINT
> 32|0x00000089
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstExpanderNo|
> 0|UINT8|0x0000008A
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstGpioNo|0|UI
> NT32|0x0000008B
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstActive|FALSE|
> BOOLEAN|0x0000008C
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableExpanderN
> o|0|UINT8|0x0000008D
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableGpioNo|0|
> UINT32|0x0000008E
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableActive|FAL
> SE|BOOLEAN|0x0000008F
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3GpioSupport|0|UINT
> 8|0x00000130
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3WakeGpioNo|0|UINT
> 32|0x00000131
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstExpanderNo|
> 0|UINT8|0x00000132
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstGpioNo|0|UI
> NT32|0x00000133
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstActive|FALSE|
> BOOLEAN|0x00000134
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableExpanderN
> o|0|UINT8|0x00000135
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableGpioNo|0|
> UINT32|0x00000136
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableActive|FAL
> SE|BOOLEAN|0x00000137
>=20
>  # 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|0x00
> 00009E
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock1|0|UINT64|0x00
> 00009F
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock2|0|UINT64|0x00
> 0000A0
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock3|0|UINT64|0x00
> 0000A1
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock4|0|UINT64|0x00
> 0000A2
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock5|0|UINT64|0x00
> 0000A3
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock6|0|UINT64|0x00
> 0000A4
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock7|0|UINT64|0x00
> 0000A5
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock8|0|UINT64|0x00
> 0000A6
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock9|0|UINT64|0x00
> 0000A7
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock10|0|UINT64|0x0
> 00000A8
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock11|0|UINT64|0x0
> 00000A9
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock12|0|UINT64|0x0
> 00000AA
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock13|0|UINT64|0x0
> 00000AB
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock14|0|UINT64|0x0
> 00000AC
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieClock15|0|UINT64|0x0
> 00000AD
>=20
>  # GPIO Group Tier
> -gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw0|0|UINT32|0x0000
> 00E9
> -gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw1|0|UINT32|0x0000
> 00EA
> -gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw2|0|UINT32|0x0000
> 00EB
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw0|0|U
> INT32|0x000000E9
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw1|0|U
> INT32|0x000000EA
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw2|0|U
> INT32|0x000000EB
>=20
>  # Board related PCH PmConfig
> -gBoardModuleTokenSpaceGuid.PcdSlpS0VmRuntimeControl|FALSE|BOOLEA
> N|0x000000F6
> -gBoardModuleTokenSpaceGuid.PcdSlpS0Vm070VSupport|FALSE|BOOLEAN|
> 0x000000F7
> -gBoardModuleTokenSpaceGuid.PcdSlpS0Vm075VSupport|FALSE|BOOLEAN|
> 0x000000F8
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0VmRuntimeControl|F
> ALSE|BOOLEAN|0x000000F6
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0Vm070VSupport|FALS
> E|BOOLEAN|0x000000F7
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0Vm075VSupport|FALS
> E|BOOLEAN|0x000000F8
>=20
>  # Misc
> -gBoardModuleTokenSpaceGuid.PcdPc8374SioKbcPresent|FALSE|BOOLEAN|0
> x000000ED
> -gBoardModuleTokenSpaceGuid.PcdOddPowerInitEnable|FALSE|BOOLEAN|0
> x000000EE
> -gBoardModuleTokenSpaceGuid.PcdIvCamInitPresent|FALSE|BOOLEAN|0x00
> 0000EF
> -gBoardModuleTokenSpaceGuid.PcdRecoveryModeGpio|0|UINT64|0x000000
> F0
> -gBoardModuleTokenSpaceGuid.PcdMobileDramPresent|FALSE|BOOLEAN|0x
> 000000F1
> -gBoardModuleTokenSpaceGuid.PcdCpuVboostEnable|FALSE|BOOLEAN|0x0
> 00000F2
> -gBoardModuleTokenSpaceGuid.PcdGpioTier2WakeEnable|FALSE|BOOLEAN|
> 0x000000F9
> -#gBoardModuleTokenSpaceGuid.PcdxxxNotInUse|FALSE|BOOLEAN|0x00000
> 0FC
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPc8374SioKbcPresent|FALS
> E|BOOLEAN|0x000000ED
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdOddPowerInitEnable|FALSE
> |BOOLEAN|0x000000EE
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIvCamInitPresent|FALSE|B
> OOLEAN|0x000000EF
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRecoveryModeGpio|0|UIN
> T64|0x000000F0
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMobileDramPresent|FALSE
> |BOOLEAN|0x000000F1
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCpuVboostEnable|FALSE|B
> OOLEAN|0x000000F2
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioTier2WakeEnable|FAL
> SE|BOOLEAN|0x000000F9
> +#gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdxxxNotInUse|FALSE|BOOL
> EAN|0x000000FC
>=20
>  #PlatformInfoPcd
> -gBoardModuleTokenSpaceGuid.PcdEnableVoltageMargining|FALSE|BOOLEA
> N|0x00101000
> -gBoardModuleTokenSpaceGuid.PcdGfxCrbDetect|FALSE|BOOLEAN|0x00101
> 001
> -gBoardModuleTokenSpaceGuid.PcdHsioBoardPresent|FALSE|BOOLEAN|0x00
> 101002
> -gBoardModuleTokenSpaceGuid.PcdHsioBoardType|0x0|UINT8|0x00101003
> -gBoardModuleTokenSpaceGuid.PcdWakeupType|0x0|UINT8|0x00101004
> -gBoardModuleTokenSpaceGuid.PcdMfgMode|FALSE|BOOLEAN|0x00101005
> -gBoardModuleTokenSpaceGuid.PcdBoardName|L"0123456789ABCDEF01234
> 56789ABCDEF"|VOID*|0x00101007
> -gBoardModuleTokenSpaceGuid.PcdEcMajorRevision|0x0|UINT8|0x0010100
> 8
> -gBoardModuleTokenSpaceGuid.PcdEcMinorRevision|0x0|UINT8|0x0010100
> 9
> -gBoardModuleTokenSpaceGuid.PcdBiosVersion|L"012345678901234567890
> 1234567890123456789"|VOID*|0x0010100E
> -gBoardModuleTokenSpaceGuid.PcdReleaseDate|L"01234567890123456789"
> |VOID*|0x0010100F
> -gBoardModuleTokenSpaceGuid.PcdReleaseTime|L"01234567890123456789"
> |VOID*|0x00101010
> -gBoardModuleTokenSpaceGuid.PcdPlatformGeneration|0x0|UINT8|0x00101
> 011
> -gBoardModuleTokenSpaceGuid.PcdSpdPresent|FALSE|BOOLEAN|0x0010101
> 2
> -gBoardModuleTokenSpaceGuid.PcdDockAttached|FALSE|BOOLEAN|0x00101
> 013
> -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|F
> ALSE|BOOLEAN|0x00101000
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGfxCrbDetect|FALSE|BOOL
> EAN|0x00101001
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHsioBoardPresent|FALSE|B
> OOLEAN|0x00101002
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHsioBoardType|0x0|UINT8
> |0x00101003
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWakeupType|0x0|UINT8|0
> x00101004
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMfgMode|FALSE|BOOLEAN
> |0x00101005
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardName|L"0123456789
> ABCDEF0123456789ABCDEF"|VOID*|0x00101007
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcMajorRevision|0x0|UINT
> 8|0x00101008
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcMinorRevision|0x0|UINT
> 8|0x00101009
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBiosVersion|L"0123456789
> 012345678901234567890123456789"|VOID*|0x0010100E
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdReleaseDate|L"0123456789
> 0123456789"|VOID*|0x0010100F
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdReleaseTime|L"012345678
> 90123456789"|VOID*|0x00101010
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPlatformGeneration|0x0|U
> INT8|0x00101011
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpdPresent|FALSE|BOOLEA
> N|0x00101012
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDockAttached|FALSE|BOOL
> EAN|0x00101013
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPlatformType|0x0|UINT8|0
> x00101014
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPlatformFlavor|0x0|UINT8
> |0x00101015
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardRev|0x0|UINT8|0x00
> 101016
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardBomId|0x0|UINT8|0
> x00101017
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardId|0x0|UINT8|0x001
> 01018
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardType|0x0|UINT8|0x0
> 0101019
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcPresent|FALSE|BOOLEAN
> |0x0010101A
>=20
>  # PCH Misc Configuration
> -gBoardModuleTokenSpaceGuid.PcdDebugUsbUartEnable|FALSE|BOOLEAN|
> 0x00000061
> -gBoardModuleTokenSpaceGuid.PcdMipiCamGpioEnable|FALSE|BOOLEAN|0
> x00000065
> -gBoardModuleTokenSpaceGuid.PcdSmbiosFabBoardName|0|UINT64|0x000
> 00102
> -gBoardModuleTokenSpaceGuid.PcdSmbiosMainSlotEntry|0|UINT64|0x0000
> 0103
> -gBoardModuleTokenSpaceGuid.PcdUsbcEcPdNegotiation|FALSE|BOOLEAN|0
> x00000110
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDebugUsbUartEnable|FALS
> E|BOOLEAN|0x00000061
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCamGpioEnable|FALS
> E|BOOLEAN|0x00000065
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmbiosFabBoardName|0|
> UINT64|0x00000102
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmbiosMainSlotEntry|0|UI
> NT64|0x00000103
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbcEcPdNegotiation|FALS
> E|BOOLEAN|0x00000110
>=20
>  # Control PCD to dump default silicon policy
>=20
> gPlatformModuleTokenSpaceGuid.PcdDumpDefaultSiliconPolicy|FALSE|BOOL
> EAN|0x00010064
>=20
>  # Pch SerialIo I2c Pads Termination
> -gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c0PadInternalTerm|0x1|UIN
> T8|0x00000020
> -gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c1PadInternalTerm|0x1|UIN
> T8|0x00000021
> -gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c2PadInternalTerm|0x1|UIN
> T8|0x00000022
> -gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c3PadInternalTerm|0x1|UIN
> T8|0x00000023
> -gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c4PadInternalTerm|0x1|UIN
> T8|0x00000030
> -gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c5PadInternalTerm|0x1|UIN
> T8|0x00000031
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c0PadInternalT
> erm|0x1|UINT8|0x00000020
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c1PadInternalT
> erm|0x1|UINT8|0x00000021
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c2PadInternalT
> erm|0x1|UINT8|0x00000022
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c3PadInternalT
> erm|0x1|UINT8|0x00000023
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c4PadInternalT
> erm|0x1|UINT8|0x00000030
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c5PadInternalT
> erm|0x1|UINT8|0x00000031
>  #
>  # The PCD which holds the pointer of Smbios Platform Info table
>  #
> -gBoardModuleTokenSpaceGuid.PcdSmbiosPlatformInfo|0|UINT64|0x001010
> 1B
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmbiosPlatformInfo|0|UIN
> T64|0x0010101B
>  #
>  # The PCD which used to enable / disable the code to use RVP Smbios
> Board Info
>  #
> -gBoardModuleTokenSpaceGuid.PcdSmbiosBoardInfoEnable|FALSE|BOOLEA
> N|0x0010101C
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmbiosBoardInfoEnable|F
> ALSE|BOOLEAN|0x0010101C
>  #
>  # The PCD which holds the pointer of RVP Smbios Board Info
>  #
> -gBoardModuleTokenSpaceGuid.PcdSmbiosBoardInfo|0|UINT64|0x0010101D
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmbiosBoardInfo|0|UINT6
> 4|0x0010101D
>  #
>  # CoEngineering Custom Defaults PCD
>  #
> -gBoardModuleTokenSpaceGuid.PcdCoEngEnableCustomDefaults|0x0|UINT8
> |0x00100227
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdCoEngEnableCustomDefaul
> ts|0x0|UINT8|0x00100227
>  #
>  # The PCD which is defined to enable/disable the SMBus Alert function.
>  #
> -gBoardModuleTokenSpaceGuid.PcdSmbusAlertEnable|FALSE|BOOLEAN|0x0
> 010101E
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmbusAlertEnable|FALSE|
> BOOLEAN|0x0010101E
>  #
>  # The PCD which is defined to enable/disable the SATA LED function.
>  #
> -gBoardModuleTokenSpaceGuid.PcdSataLedEnable|FALSE|BOOLEAN|0x0010
> 101F
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSataLedEnable|FALSE|BOO
> LEAN|0x0010101F
>  #
>  # The PCD which is defined to enable/disable the VR Alert function.
>  #
> -gBoardModuleTokenSpaceGuid.PcdVrAlertEnable|FALSE|BOOLEAN|0x00101
> 020
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVrAlertEnable|FALSE|BOOL
> EAN|0x00101020
>  #
>  # The PCD which is defined to enable/disable the PCH thermal hot
> threshold function.
>  #
> -gBoardModuleTokenSpaceGuid.PcdPchThermalHotEnable|FALSE|BOOLEAN|
> 0x00101021
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchThermalHotEnable|FAL
> SE|BOOLEAN|0x00101021
>  #
>  # The PCD which is defined to enable/disable the memory thermal sensor
> GPIO C/D function.
>  #
> -gBoardModuleTokenSpaceGuid.PcdMemoryThermalSensorGpioCPmsyncEna
> ble|TRUE|BOOLEAN|0x00101022
> -gBoardModuleTokenSpaceGuid.PcdMemoryThermalSensorGpioDPmsyncEna
> ble|TRUE|BOOLEAN|0x00101023
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMemoryThermalSensorGpi
> oCPmsyncEnable|TRUE|BOOLEAN|0x00101022
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMemoryThermalSensorGpi
> oDPmsyncEnable|TRUE|BOOLEAN|0x00101023
>  #
>  # The PCD defines the I2C bus number to which PSS chip connected.
>  #
> -gBoardModuleTokenSpaceGuid.PcdPssReadSN|FALSE|BOOLEAN|0x0010102
> 4
> -gBoardModuleTokenSpaceGuid.PcdPssI2cBusNumber|0x04|UINT8|0x00101
> 025
> -gBoardModuleTokenSpaceGuid.PcdPssI2cSlaveAddress|0x6E|UINT8|0x0010
> 1026
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPssReadSN|FALSE|BOOLEA
> N|0x00101024
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPssI2cBusNumber|0x04|UI
> NT8|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|0x0
> 0100212
> -gBoardModuleTokenSpaceGuid.PcdUsbTypeCEcLess|FALSE|BOOLEAN|0x001
> 00213
> -gBoardModuleTokenSpaceGuid.PcdXhciAcpiTableSignature|0x0|UINT64|0x0
> 0100204
> -gBoardModuleTokenSpaceGuid.PcdPreferredPmProfile|0x0|UINT8|0x00100
> 205
> -gBoardModuleTokenSpaceGuid.PcdFingerPrintSleepGpio|0x0|UINT32|0x001
> 00209
> -gBoardModuleTokenSpaceGuid.PcdFingerPrintIrqGpio|0x0|UINT32|0x00100
> 20A
> -gBoardModuleTokenSpaceGuid.PcdGnssResetGpio|0x0|UINT32|0x0010020
> B
> -gBoardModuleTokenSpaceGuid.PcdTouchpadIrqGpio|0x0|UINT32|0x001002
> 0F
> -gBoardModuleTokenSpaceGuid.PcdTouchpanelIrqGpio|0x0|UINT32|0x0010
> 0210
> +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.PcdVirtualButtonVolumeUpSu
> pport         |FALSE|BOOLEAN|0x00100119
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonVolumeDown
> Support       |FALSE|BOOLEAN|0x0010011A
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonHomeButton
> Support       |FALSE|BOOLEAN|0x0010011B
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonRotationLock
> Support     |FALSE|BOOLEAN|0x0010011C
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlateModeSwitchSupport
> |FALSE|BOOLEAN|0x0010011D
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcDcAutoSwitchSupport
> |FALSE|BOOLEAN|0x0010011F
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPmPowerButtonGpioPin
> |0x00|UINT32|0x00100120
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiEnableAllButtonSuppo
> rt           |FALSE|BOOLEAN|0x00100121
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiHidDriverButtonSuppo
> rt           |FALSE|BOOLEAN|0x00100122
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTsOnDimmTemperature
> |FALSE|BOOLEAN|0x00100123
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBatteryPresent
> |0x0|UINT8|0x00100124
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCSupport|FALSE|B
> OOLEAN|0x00100212
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCEcLess|FALSE|BO
> OLEAN|0x00100213
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdXhciAcpiTableSignature|0x
> 0|UINT64|0x00100204
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPreferredPmProfile|0x0|UI
> NT8|0x00100205
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdFingerPrintSleepGpio|0x0|
> UINT32|0x00100209
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdFingerPrintIrqGpio|0x0|UI
> NT32|0x0010020A
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGnssResetGpio|0x0|UINT3
> 2|0x0010020B
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTouchpadIrqGpio|0x0|UIN
> T32|0x0010020F
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTouchpanelIrqGpio|0x0|UI
> NT32|0x00100210
>=20
> -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|0
> x00100203
> -gBoardModuleTokenSpaceGuid.PcdDDISelection|0x0|UINT8|0x00100215
> -gBoardModuleTokenSpaceGuid.PcdGfxCrbDetectGpio|0x0|UINT64|0x00100
> 217
> -gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort1|0x00|UINT8|0x0010003
> 9
> -gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort1Pch|0x00|UINT8|0x0010
> 003A
> -gBoardModuleTokenSpaceGuid.PcdUsbCPort1Proterties|0x00|UINT8|0x001
> 0003B
> -gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort2|0x00|UINT8|0x0010003
> C
> -gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort2Pch|0x00|UINT8|0x0010
> 003D
> -gBoardModuleTokenSpaceGuid.PcdUsbCPort2Proterties|0x00|UINT8|0x001
> 0003E
> -gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort3|0x00|UINT8|0x0010003
> F
> -gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort3Pch|0x00|UINT8|0x0010
> 0040
> -gBoardModuleTokenSpaceGuid.PcdUsbCPort3Proterties|0x00|UINT8|0x001
> 00041
> -gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort4|0x00|UINT8|0x0010004
> 2
> -gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort4Pch|0x00|UINT8|0x0010
> 0043
> -gBoardModuleTokenSpaceGuid.PcdUsbCPort4Proterties|0x00|UINT8|0x001
> 00044
> -gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort5|0x00|UINT8|0x0010004
> 5
> -gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort5Pch|0x00|UINT8|0x0010
> 0046
> -gBoardModuleTokenSpaceGuid.PcdUsbCPort5Proterties|0x00|UINT8|0x001
> 00047
> -gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort6|0x00|UINT8|0x0010004
> 8
> -gBoardModuleTokenSpaceGuid.PcdUsbTypeCPort6Pch|0x00|UINT8|0x0010
> 0049
> -gBoardModuleTokenSpaceGuid.PcdUsbCPort6Proterties|0x00|UINT8|0x001
> 0004A
> -gBoardModuleTokenSpaceGuid.PcdMipiCam0LinkUsed
> |0x0|UINT8|0x00100128
> -gBoardModuleTokenSpaceGuid.PcdMipiCam1LinkUsed
> |0x0|UINT8|0x00100129
> -gBoardModuleTokenSpaceGuid.PcdMipiCam2LinkUsed
> |0x0|UINT8|0x0010012A
> -gBoardModuleTokenSpaceGuid.PcdMipiCam3LinkUsed
> |0x0|UINT8|0x0010012B
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHdaI2sCodecIrqGpio
> |0x0|UINT32|0x00100126
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHdaI2sCodecI2cBusNumbe
> r              |0x0|UINT8|0x00100127
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcSmiGpio|0x0|UINT32|0x
> 00100200
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcLowPowerExitGpio
> |0x0|UINT32|0x00100125
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdHidI2cIntPad|0x0|UINT32|
> 0x00100201
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDetectPs2KbOnCmdAck|FA
> LSE|BOOLEAN|0x00100202
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpdAddressOverride|FALSE
> |BOOLEAN|0x00100203
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDDISelection|0x0|UINT8|0
> x00100215
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGfxCrbDetectGpio|0x0|UI
> NT64|0x00100217
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort1|0x00|UINT
> 8|0x00100039
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort1Pch|0x00|U
> INT8|0x0010003A
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort1Proterties|0x00|
> UINT8|0x0010003B
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort2|0x00|UINT
> 8|0x0010003C
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort2Pch|0x00|U
> INT8|0x0010003D
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort2Proterties|0x00|
> UINT8|0x0010003E
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort3|0x00|UINT
> 8|0x0010003F
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort3Pch|0x00|U
> INT8|0x00100040
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort3Proterties|0x00|
> UINT8|0x00100041
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort4|0x00|UINT
> 8|0x00100042
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort4Pch|0x00|U
> INT8|0x00100043
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort4Proterties|0x00|
> UINT8|0x00100044
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort5|0x00|UINT
> 8|0x00100045
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort5Pch|0x00|U
> INT8|0x00100046
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbCPort5Proterties|0x00|
> UINT8|0x00100047
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort6|0x00|UINT
> 8|0x00100048
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsbTypeCPort6Pch|0x00|U
> INT8|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
>=20
>  # Super IO Pcd
>=20
> gPlatformModuleTokenSpaceGuid.PcdH8S2113Present|TRUE|BOOLEAN|0xF0
> 000100
>=20
> gPlatformModuleTokenSpaceGuid.PcdNat87393Present|TRUE|BOOLEAN|0xF
> 0000104
>=20
> gPlatformModuleTokenSpaceGuid.PcdNct677FPresent|TRUE|BOOLEAN|0xF0
> 000105
> -gBoardModuleTokenSpaceGuid.PcdConvertableDockSupport
> |FALSE|BOOLEAN|0x00100112
> -gBoardModuleTokenSpaceGuid.PcdSmcRuntimeSciPin
> |0x00|UINT32|0x00100111
> -gBoardModuleTokenSpaceGuid.PcdRealBattery1Control
> |0x00|UINT8|0x00100103
> -gBoardModuleTokenSpaceGuid.PcdRealBattery2Control
> |0x00|UINT8|0x00100104
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdConvertableDockSupport
> |FALSE|BOOLEAN|0x00100112
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmcRuntimeSciPin
> |0x00|UINT32|0x00100111
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRealBattery1Control
> |0x00|UINT8|0x00100103
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRealBattery2Control
> |0x00|UINT8|0x00100104
>=20
> -gBoardModuleTokenSpaceGuid.PcdDimmPopulationError|FALSE|BOOLEAN|
> 0x00100221
> -gBoardModuleTokenSpaceGuid.PcdBtIrqGpio|0x0|UINT32|0x0010020E
> -gBoardModuleTokenSpaceGuid.PcdBtRfKillGpio|0x0|UINT32|0x0010020D
> -gBoardModuleTokenSpaceGuid.PcdWhlErbRtd3TableEnable|FALSE|BOOLEA
> N|0x0010022C
> -gBoardModuleTokenSpaceGuid.PcdTypeCPortsSupported|0x00|UINT8|0x00
> 10004B
> -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.PcdDimmPopulationError|FAL
> SE|BOOLEAN|0x00100221
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBtIrqGpio|0x0|UINT32|0x0
> 010020E
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBtRfKillGpio|0x0|UINT32|0
> x0010020D
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWhlErbRtd3TableEnable|F
> ALSE|BOOLEAN|0x0010022C
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTypeCPortsSupported|0x0
> 0|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
>=20
>  [PcdsDynamicEx]
>=20
> @@ -559,7 +559,7 @@
> gBoardModuleTokenSpaceGuid.PcdNCT6776FHWMON
> |FALSE|BOOLEA
>  [PcdsPatchableInModule]
>=20
>  [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
>=20
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kg.dsc
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kg.dsc
> index d6eb66a880..423fa88c12 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kg.dsc
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kg.dsc
> @@ -130,7 +130,7 @@
>=20
> PlatformSecLib|$(PLATFORM_BOARD_PACKAGE)/FspWrapper/Library/SecFsp
> WrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
>=20
> TimerLib|$(PLATFORM_BOARD_PACKAGE)/Library/AcpiTimerLib/BaseAcpiTim
> erLib.inf
>    # Thunderbolt
> -!if gBoardModuleTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
> +!if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
>=20
> TbtCommonLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/PeiDx
> eSmmTbtCommonLib/TbtCommonLib.inf
>  !endif
>=20
> @@ -169,7 +169,7 @@
>    # Board Package
>    #######################################
>    # Thunderbolt
> -!if gBoardModuleTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
> +!if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
>=20
> PeiDTbtInitLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/Private/
> PeiDTbtInitLib/PeiDTbtInitLib.inf
>=20
> PeiTbtPolicyLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/PeiTbt
> PolicyLib/PeiTbtPolicyLib.inf
>  !endif
> @@ -282,7 +282,7 @@
>    $(PLATFORM_PACKAGE)/PlatformInit/ReportFv/ReportFvPei.inf
>=20
> $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf
> {
>      <LibraryClasses>
> -      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport =3D=3D FALSE
> +      !if
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport =3D=3D
> FALSE
>=20
> BoardInitLib|$(PROJECT)/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
>        !else
>=20
> NULL|$(PROJECT)/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
> @@ -292,7 +292,7 @@
>=20
>=20
> $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPostMem.in
> f {
>      <LibraryClasses>
> -      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport =3D=3D FALSE
> +      !if
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport =3D=3D
> FALSE
>=20
> BoardInitLib|$(PROJECT)/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
>        !else
>=20
> NULL|$(PROJECT)/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
> @@ -318,7 +318,7 @@
>    # Board Package
>    #######################################
>    # Thunderbolt
> -!if gBoardModuleTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
> +!if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
>    $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
>  !endif
>=20
> @@ -397,7 +397,7 @@
>=20
>    $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf {
>      <LibraryClasses>
> -      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport =3D=3D FALSE
> +      !if
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport =3D=3D
> FALSE
>=20
> BoardAcpiEnableLib|$(PROJECT)/Library/BoardAcpiLib/SmmBoardAcpiEnabl
> eLib.inf
>        !else
>=20
> NULL|$(PROJECT)/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
> @@ -417,7 +417,7 @@
>    }
>=20
>    # Thunderbolt
> -!if gBoardModuleTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
> +!if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D 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
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kgPcd.dsc
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kgPcd.dsc
> index 5cf0aa9d86..adbd48f6d7 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kgPcd.dsc
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kgPcd.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
>=20
>  [PcdsFixedAtBuild.common]
>    ######################################
> @@ -367,20 +367,20 @@
>    ######################################
>=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|0
> x02010011
> +
> 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
>=20
>  [PcdsDynamicHii.X64.DEFAULT]
>    ######################################
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kg.fdf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kg.fdf
> index 30ce0b9b79..320e444aae 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kg.fdf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/OpenBoardP
> kg.fdf
> @@ -613,7 +613,7 @@ READ_LOCK_CAP      =3D TRUE
>  READ_LOCK_STATUS   =3D TRUE
>  FvNameGuid         =3D 6053D78A-457E-4490-A237-31D0FBE2F305
>=20
> -!if gBoardModuleTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
> +!if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
>  INF $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
>  !endif
>=20
> @@ -655,7 +655,7 @@ READ_LOCK_CAP      =3D TRUE
>  READ_LOCK_STATUS   =3D TRUE
>  FvNameGuid         =3D 11F6E304-43F9-4B2F-90AB-B8FFEAD6205D
>=20
> -!if gBoardModuleTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
> +!if gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D 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
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiD
> xe.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiD
> xe.inf
> index 2bbc3cb9e2..af5c8f1c06 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiD
> xe.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiD
> xe.inf
> @@ -51,14 +51,14 @@
>    gEfiGlobalNvsAreaProtocolGuid
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdAcpiGnvsAddress
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiGnvsAddress
>=20
> -  gBoardModuleTokenSpaceGuid.PcdAcpiSleepState
> -  gBoardModuleTokenSpaceGuid.PcdAcpiHibernate
> -  gBoardModuleTokenSpaceGuid.PcdLowPowerS0Idle
> -  gBoardModuleTokenSpaceGuid.PcdDisableActiveTripPoints
> -  gBoardModuleTokenSpaceGuid.PcdDisablePassiveTripPoints
> -  gBoardModuleTokenSpaceGuid.PcdDisableCriticalTripPoints
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiSleepState
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiHibernate
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisableActiveTripPoints
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisablePassiveTripPoints
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDisableCriticalTripPoints
>=20
>  [Depex]
>    gEfiAcpiTableProtocolGuid           AND
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSm
> mTbtCommonLib/TbtCommonLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSm
> mTbtCommonLib/TbtCommonLib.inf
> index f2330b5b71..75c4f8118d 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSm
> mTbtCommonLib/TbtCommonLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSm
> mTbtCommonLib/TbtCommonLib.inf
> @@ -40,19 +40,19 @@
>=20
>=20
>  [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.PcdDTbtPciePMemAddrRngMa
> x  ## CONSUMES
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieRpNumber
>=20
>  [Sources]
>    TbtCommonLib.c
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPoli
> cyLib/PeiTbtPolicyLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPoli
> cyLib/PeiTbtPolicyLib.inf
> index b74e641e16..7ede75d14e 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPoli
> cyLib/PeiTbtPolicyLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPoli
> cyLib/PeiTbtPolicyLib.inf
> @@ -37,7 +37,7 @@ GpioLib
>    IntelSiliconPkg/IntelSiliconPkg.dec
>=20
>  [Pcd]
> -gBoardModuleTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad    ##
> CONSUMES
> +gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad
> ## CONSUMES
>=20
>  [Sources]
>  PeiTbtPolicyLib.c
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtS
> mm.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtS
> mm.inf
> index 3d4e6ceea0..bfe299d733 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtS
> mm.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtS
> mm.inf
> @@ -45,7 +45,7 @@
>    CoffeelakeSiliconPkg/SiPkg.dec
>=20
>  [Pcd]
> -#  gBoardModuleTokenSpaceGuid.PcdSwSmiDTbtEnumerate ## CONSUMES
> +#  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSwSmiDTbtEnumerate
> ## CONSUMES
>    gMinPlatformPkgTokenSpaceGuid.PcdPciExpressRegionLength      ##
> CONSUMES
>=20
>  [FixedPcd]
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolic
> yInitLib/PeiFspPolicyInitLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPoli
> cyInitLib/PeiFspPolicyInitLib.inf
> index bd39cd60b7..8146d0fa03 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPolic
> yInitLib/PeiFspPolicyInitLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiFspPoli
> cyInitLib/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
>=20
>  [Ppis]
>    gSiPolicyPpiGuid                        ## CONSUMES
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconP
> olicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconP
> olicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> index 994cf93e33..c6dea37402 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconP
> olicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconP
> olicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> @@ -90,45 +90,45 @@
>    PeiLib
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor       ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget         ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap           ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram      ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdData
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdDataSize
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize
>=20
>=20
> -  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress      ##
> CONSUMES
> -  gSiPkgTokenSpaceGuid.PcdSerialIoUartDebugEnable        ##
> CONSUMES
> -  gSiPkgTokenSpaceGuid.PcdSerialIoUartNumber             ##
> CONSUMES
> -  gSiPkgTokenSpaceGuid.PcdSmmbaseSwSmi                   ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdSaDdrFreqLimit           ##
> CONSUMES
> +  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress         ##
> CONSUMES
> +  gSiPkgTokenSpaceGuid.PcdSerialIoUartDebugEnable           ##
> CONSUMES
> +  gSiPkgTokenSpaceGuid.PcdSerialIoUartNumber                ##
> CONSUMES
> +  gSiPkgTokenSpaceGuid.PcdSmmbaseSwSmi                      ##
> CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDdrFreqLimit  ##
> CONSUMES
>=20
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Siz
> e
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Siz
> e
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
>=20
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable2Size
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1Size
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2Size
>=20
> -  gBoardModuleTokenSpaceGuid.PcdGraphicsVbtGuid
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGraphicsVbtGuid
>=20
>    # SPD Address Table
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3
>=20
>  [Guids]
>    gFspNonVolatileStorageHobGuid                 ## CONSUMES
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/Pei
> HdaVerbTableLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/Pei
> HdaVerbTableLib.inf
> index b09dc6b139..31b42bf4ab 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/Pei
> HdaVerbTableLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Library/PeiHdaVerbTableLib/Pei
> HdaVerbTableLib.inf
> @@ -59,10 +59,10 @@
>    PcdLib
>=20
>  [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
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateL
> ib/PeiPolicyUpdateLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateL
> ib/PeiPolicyUpdateLib.inf
> index 3095a7333e..ad3146dc7b 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateL
> ib/PeiPolicyUpdateLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/Library/PeiPolicyUpdateL
> ib/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
>=20
>    # 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.PcdMrcDqPinsInterleavedContr
> ol    ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleaved
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize
> ## CONSUMES
>=20
>    # Display DDI
> -  gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTable           ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTableSize       ##
> CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTable
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTableSize
> ## CONSUMES
>=20
>    # 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
>=20
>    # PCIE RTD3 GPIO
> -  gBoardModuleTokenSpaceGuid.PcdRootPortDev
> ## CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdRootPortFunc
> ## CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdRootPortIndex                  ##
> CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortDev
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortFunc
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortIndex
> ## CONSUMES
>=20
> -  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
>=20
> -  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
>=20
> -  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
>=20
> -  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
>=20
>    # 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
>=20
>    # CA Vref Configuration
> -  gBoardModuleTokenSpaceGuid.PcdMrcCaVrefConfig                ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdDualDimmPerChannelBoardType
> ## CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMobileDramPresent
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcCaVrefConfig
> ## CONSUMES
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDualDimmPerChannelBoard
> Type    ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMobileDramPresent
> ## CONSUMES
>=20
>    # 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
>=20
>    # 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
>=20
>    # 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
>=20
>    # 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
>=20
>    # Pch SerialIo I2c Pads Termination
> -  gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c0PadInternalTerm ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c1PadInternalTerm ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c2PadInternalTerm ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c3PadInternalTerm ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c4PadInternalTerm ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdPchSerialIoI2c5PadInternalTerm ##
> CONSUMES
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c0PadInternalTe
> rm ## CONSUMES
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c1PadInternalTe
> rm ## CONSUMES
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c2PadInternalTe
> rm ## CONSUMES
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c3PadInternalTe
> rm ## CONSUMES
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c4PadInternalTe
> rm ## CONSUMES
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPchSerialIoI2c5PadInternalTe
> rm ## CONSUMES
>=20
> -  gBoardModuleTokenSpaceGuid.PcdEcPresent
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdEcPresent
>=20
> -  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.PcdMemoryThermalSensorGpioCPmsyncEna
> ble  ## CONSUMES
> -
> gBoardModuleTokenSpaceGuid.PcdMemoryThermalSensorGpioDPmsyncEna
> ble  ## 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.PcdMemoryThermalSensorGpio
> CPmsyncEnable  ## CONSUMES
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMemoryThermalSensorGpio
> DPmsyncEnable  ## CONSUMES
>=20
> gEfiMdeModulePkgTokenSpaceGuid.PcdSystemFmpCapsuleImageTypeIdGuid
> ## CONSUMES
>    gUefiCpuPkgTokenSpaceGuid.PcdCpuMaxLogicalProcessorNumber
> ## CONSUMES
>=20
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitD=
x
> e.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitD
> xe.inf
> index 65c531a532..3233375d65 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitD=
x
> e.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/Policy/PolicyInitDxe/PolicyInitD
> xe.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
>=20
> -  gBoardModuleTokenSpaceGuid.PcdVirtualButtonVolumeUpSupport
> -  gBoardModuleTokenSpaceGuid.PcdVirtualButtonVolumeDownSupport
> -  gBoardModuleTokenSpaceGuid.PcdVirtualButtonHomeButtonSupport
> -  gBoardModuleTokenSpaceGuid.PcdVirtualButtonRotationLockSupport
> -  gBoardModuleTokenSpaceGuid.PcdSlateModeSwitchSupport
> -  gBoardModuleTokenSpaceGuid.PcdAcDcAutoSwitchSupport
> -  gBoardModuleTokenSpaceGuid.PcdPmPowerButtonGpioPin
> -  gBoardModuleTokenSpaceGuid.PcdAcpiEnableAllButtonSupport
> -  gBoardModuleTokenSpaceGuid.PcdAcpiHidDriverButtonSupport
> -  gBoardModuleTokenSpaceGuid.PcdTsOnDimmTemperature
> -  gBoardModuleTokenSpaceGuid.PcdBatteryPresent
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonVolumeUpSup
> port
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonVolumeDownS
> upport
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonHomeButtonS
> upport
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdVirtualButtonRotationLockS
> upport
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlateModeSwitchSupport
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcDcAutoSwitchSupport
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPmPowerButtonGpioPin
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiEnableAllButtonSuppor
> t
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiHidDriverButtonSuppor
> t
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdTsOnDimmTemperature
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBatteryPresent
>=20
> -  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
>=20
>    #
>    # PSS Board Configuration.
>    #
> -  gBoardModuleTokenSpaceGuid.PcdPssReadSN
> -  gBoardModuleTokenSpaceGuid.PcdPssI2cBusNumber
> -  gBoardModuleTokenSpaceGuid.PcdPssI2cSlaveAddress
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPssReadSN
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPssI2cBusNumber
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPssI2cSlaveAddress
>=20
> -  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
>=20
> -  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.PcdFunctionGopVbtSpecificUpd
> ate
>=20
>  [Sources]
>    PolicyInitDxe.c
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Base
> PlatformHookLib/BasePlatformHookLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Base
> PlatformHookLib/BasePlatformHookLib.inf
> index 143bb89c63..9f45d6ca4b 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Base
> PlatformHookLib/BasePlatformHookLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Base
> PlatformHookLib/BasePlatformHookLib.inf
> @@ -37,16 +37,16 @@
>=20
>  [Pcd]
>    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
> ## CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioIndexPort                ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioDataPort                 ##
> CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioIndexPort
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioDataPort
> ## CONSUMES
>    gPlatformModuleTokenSpaceGuid.PcdDesktopLpcSioDataDefaultPort
> ## CONSUMES
>    gPlatformModuleTokenSpaceGuid.PcdDesktopLpcSioIndexDefaultPort
> ## CONSUMES
>=20
>  [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
>=20
>  [Sources]
>    BasePlatformHookLib.c
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dAcpiLib/SmmBoardAcpiEnableLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dAcpiLib/SmmBoardAcpiEnableLib.inf
> index 8ad32a55dc..c3fd60007a 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dAcpiLib/SmmBoardAcpiEnableLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dAcpiLib/SmmBoardAcpiEnableLib.inf
> @@ -38,7 +38,7 @@
>    CoffeelakeSiliconPkg/SiPkg.dec
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdSmcExtSmiBitPosition   ##
> CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmcExtSmiBitPosition
> ## CONSUMES
>=20
>  [Protocols]
>=20
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dAcpiLib/SmmMultiBoardAcpiSupportLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dAcpiLib/SmmMultiBoardAcpiSupportLib.inf
> index 27001c3b7f..eaf46ad4ef 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dAcpiLib/SmmMultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dAcpiLib/SmmMultiBoardAcpiSupportLib.inf
> @@ -38,7 +38,7 @@
>    CoffeelakeSiliconPkg/SiPkg.dec
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdSmcExtSmiBitPosition   ##
> CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSmcExtSmiBitPosition
> ## CONSUMES
>=20
>  [Protocols]
>=20
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiBoardInitPostMemLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiBoardInitPostMemLib.inf
> index 91cc569388..9bf4d127c5 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiBoardInitPostMemLib.inf
> @@ -42,14 +42,14 @@
>    GpioTableWhiskeylakeUDdr4Rvp.c
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableSize
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableTouchPanel
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableSize
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableTouchPanel
>=20
> -  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable
> -  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTableSize
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTableSize
>=20
> -  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTable
> -  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTableSize
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTable
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTableSize
>=20
>    gEfiSecurityPkgTokenSpaceGuid.PcdTpm2CurrentIrqNum
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiBoardInitPreMemLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiBoardInitPreMemLib.inf
> index 9361c3df3e..4ab80f9eb3 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiBoardInitPreMemLib.inf
> @@ -38,79 +38,79 @@
>    PeiBoardInitPreMemLib.c
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort
>=20
>    # PCH-LP HSIO PTSS Table
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
>=20
>    # 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
>=20
>    # 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
>=20
>=20
>    # SPD Address Table
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3
>=20
>    # 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
>=20
>    # 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
>=20
>    # 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
>=20
>    # Misc
> -  gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent
>=20
>=20
>=20
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiMultiBoardInitPostMemLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiMultiBoardInitPostMemLib.inf
> index c7330439fb..c043e32638 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiMultiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiMultiBoardInitPostMemLib.inf
> @@ -50,152 +50,152 @@
>  [FixedPcd]
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableSize
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableTouchPanel
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableSize
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableTouchPanel
>=20
> -  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable
> -  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTableSize
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTableSize
>=20
> -  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTable
> -  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTableSize
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTable
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTableSize
>=20
>    #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>    gMinPlatformPkgTokenSpaceGuid.PcdFlashFvPostMemoryBase
>    # Board Init Table List
>=20
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMem
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMemSize
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMem
> -
> gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMemSiz
> e
> -
> gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMem
> -
> gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMemSiz
> e
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMem
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMemSize
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnEar
> lyPreMem
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnEar
> lyPreMemSize
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffEa
> rlyPreMem
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffEa
> rlyPreMemSize
>=20
>    # WWAN Full Card Power Off and reset pins
> -  gBoardModuleTokenSpaceGuid.PcdWwanFullCardPowerOffGpio
> -  gBoardModuleTokenSpaceGuid.PcdWwanBbrstGpio
> -  gBoardModuleTokenSpaceGuid.PcdWwanPerstGpio
> -  gBoardModuleTokenSpaceGuid.PcdWwanPerstGpioPolarity
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanFullCardPowerOffGpi
> o
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanBbrstGpio
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanPerstGpio
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanPerstGpioPolarity
>=20
>    # SA Misc Config
> -  gBoardModuleTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleavedControl
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleaved
> -  gBoardModuleTokenSpaceGuid.PcdSaDdrFreqLimit
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleavedContr
> ol
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleaved
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDdrFreqLimit
>=20
>    # Display DDI
> -  gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTable           ##
> PRODUCES
> -  gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTableSize       ##
> PRODUCES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTable
> ## PRODUCES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTableSize
> ## PRODUCES
>=20
>    # 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
>=20
>    # PCIE RTD3 GPIO
> -  gBoardModuleTokenSpaceGuid.PcdRootPortDev
> -  gBoardModuleTokenSpaceGuid.PcdRootPortFunc
> -  gBoardModuleTokenSpaceGuid.PcdRootPortIndex
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortDev
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortFunc
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortIndex
>=20
> -  gBoardModuleTokenSpaceGuid.PcdPcie0GpioSupport
> -  gBoardModuleTokenSpaceGuid.PcdPcie1GpioSupport
> -  gBoardModuleTokenSpaceGuid.PcdPcie1WakeGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstActive
> -  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableActive
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0GpioSupport
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1GpioSupport
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1WakeGpioNo
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstExpanderNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstGpioNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstActive
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableExpanderNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableGpioNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableActive
>=20
> -  gBoardModuleTokenSpaceGuid.PcdPcie2GpioSupport
> -  gBoardModuleTokenSpaceGuid.PcdPcie2WakeGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstActive
> -  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableActive
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2GpioSupport
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2WakeGpioNo
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstExpanderNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstGpioNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstActive
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableExpanderNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableGpioNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableActive
>=20
> -  gBoardModuleTokenSpaceGuid.PcdPcie3GpioSupport
> -  gBoardModuleTokenSpaceGuid.PcdPcie3WakeGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstActive
> -  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableActive
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3GpioSupport
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3WakeGpioNo
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstExpanderNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstGpioNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstActive
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableExpanderNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableGpioNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableActive
>=20
>    # CA Vref Configuration
> -  gBoardModuleTokenSpaceGuid.PcdMrcCaVrefConfig
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcCaVrefConfig
>=20
>    # 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
>=20
>    # 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
>=20
>    # USB 2.0 Port Over Current Pin
> -  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort14
> -  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort15
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort14
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort15
>=20
>    # USB 3.0 Port Over Current Pin
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort6
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort7
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort8
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort9
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort6
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort7
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort8
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort9
>=20
>    # GPIO Group Tier
> -  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw0
> -  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw1
> -  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw2
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw0
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw1
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw2
>=20
>    # Pch PmConfig Policy
> -  gBoardModuleTokenSpaceGuid.PcdSlpS0VmRuntimeControl
> -  gBoardModuleTokenSpaceGuid.PcdSlpS0Vm070VSupport
> -  gBoardModuleTokenSpaceGuid.PcdSlpS0Vm075VSupport
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0VmRuntimeControl
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0Vm070VSupport
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0Vm075VSupport
>=20
>    # 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
>=20
>=20
> -  gBoardModuleTokenSpaceGuid.PcdSpdPresent
> -  gBoardModuleTokenSpaceGuid.PcdBoardRev
> -  gBoardModuleTokenSpaceGuid.PcdBoardBomId
> -  gBoardModuleTokenSpaceGuid.PcdPlatformType
> -  gBoardModuleTokenSpaceGuid.PcdDualDimmPerChannelBoardType
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpdPresent
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardRev
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardBomId
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPlatformType
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDualDimmPerChannelBoard
> Type
>=20
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable2
> ## CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable2Size
> ## CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdDebugUsbUartEnable
> -  gBoardModuleTokenSpaceGuid.PcdMipiCamGpioEnable
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable2
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable2Size
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDebugUsbUartEnable
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMipiCamGpioEnable
>    # TPM interrupt
>    gEfiSecurityPkgTokenSpaceGuid.PcdTpm2CurrentIrqNum
>=20
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiMultiBoardInitPreMemLib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiMultiBoardInitPreMemLib.inf
> index 927a89d401..cd0315377a 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiMultiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/Boar
> dInitLib/PeiMultiBoardInitPreMemLib.inf
> @@ -60,225 +60,225 @@
>    gTcoWdtHobGuid                                ## CONSUMES
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort
>=20
>    # PCH-LP HSIO PTSS Table
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
>=20
>    # PCH-H HSIO PTSS Table
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
> +
> #gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> +
> #gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> +
> #gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1Siz
> e
> +
> #gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2Siz
> e
>=20
>    # 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
>=20
>    # 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
>=20
>=20
>    # SPD Address Table
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3
>=20
>    # 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
>=20
>    # 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
>=20
>    # 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
>=20
>    # Misc
> -  gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent
>=20
>    #=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>    # Board Init Table List
>=20
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMem
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMemSize
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMem
> -
> gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMemSiz
> e
> -
> gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMem
> -
> gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMemSiz
> e
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMem
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMemSize
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnEar
> lyPreMem
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnEar
> lyPreMemSize
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffEa
> rlyPreMem
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffEa
> rlyPreMemSize
>=20
>    # WWAN Full Card Power Off and reset pins
> -  gBoardModuleTokenSpaceGuid.PcdWwanFullCardPowerOffGpio
> -  gBoardModuleTokenSpaceGuid.PcdWwanBbrstGpio
> -  gBoardModuleTokenSpaceGuid.PcdWwanPerstGpio
> -  gBoardModuleTokenSpaceGuid.PcdWwanPerstGpioPolarity
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanFullCardPowerOffGpi
> o
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanBbrstGpio
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanPerstGpio
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanPerstGpioPolarity
>=20
>    # SA Misc Config
> -  gBoardModuleTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleavedControl
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleaved
> -  gBoardModuleTokenSpaceGuid.PcdSaDdrFreqLimit
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleavedContr
> ol
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleaved
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDdrFreqLimit
>=20
>    # Display DDI
> -  gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTable           ##
> PRODUCES
> -  gBoardModuleTokenSpaceGuid.PcdSaDisplayConfigTableSize       ##
> PRODUCES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTable
> ## PRODUCES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSaDisplayConfigTableSize
> ## PRODUCES
>=20
>    # 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
>=20
>    # PCIE RTD3 GPIO
> -  gBoardModuleTokenSpaceGuid.PcdRootPortDev
> -  gBoardModuleTokenSpaceGuid.PcdRootPortFunc
> -  gBoardModuleTokenSpaceGuid.PcdRootPortIndex
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortDev
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortFunc
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortIndex
>=20
> -  gBoardModuleTokenSpaceGuid.PcdPcie0GpioSupport
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0GpioSupport
>=20
> -  gBoardModuleTokenSpaceGuid.PcdPcie1GpioSupport
> -  gBoardModuleTokenSpaceGuid.PcdPcie1WakeGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie1HoldRstActive
> -  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie1PwrEnableActive
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1GpioSupport
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1WakeGpioNo
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstExpanderNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstGpioNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1HoldRstActive
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableExpanderNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableGpioNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie1PwrEnableActive
>=20
> -  gBoardModuleTokenSpaceGuid.PcdPcie2GpioSupport
> -  gBoardModuleTokenSpaceGuid.PcdPcie2WakeGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie2HoldRstActive
> -  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie2PwrEnableActive
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2GpioSupport
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2WakeGpioNo
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstExpanderNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstGpioNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2HoldRstActive
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableExpanderNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableGpioNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie2PwrEnableActive
>=20
> -  gBoardModuleTokenSpaceGuid.PcdPcie3GpioSupport
> -  gBoardModuleTokenSpaceGuid.PcdPcie3WakeGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie3HoldRstActive
> -  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie3PwrEnableActive
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3GpioSupport
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3WakeGpioNo
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstExpanderNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstGpioNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3HoldRstActive
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableExpanderNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableGpioNo
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcie3PwrEnableActive
>=20
>    # CA Vref Configuration
> -  gBoardModuleTokenSpaceGuid.PcdMrcCaVrefConfig
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdMrcCaVrefConfig
>=20
>    # 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
>=20
>    # 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
>=20
>    # USB 2.0 Port Over Current Pin
> -  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort14
> -  gBoardModuleTokenSpaceGuid.PcdUsb20OverCurrentPinPort15
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort14
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort15
>=20
>    # USB 3.0 Port Over Current Pin
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort6
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort7
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort8
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort9
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort6
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort7
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort8
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort9
>=20
>    # GPIO Group Tier
> -  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw0
> -  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw1
> -  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw2
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw0
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw1
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw2
>=20
>    # Pch PmConfig Policy
> -  gBoardModuleTokenSpaceGuid.PcdSlpS0VmRuntimeControl
> -  gBoardModuleTokenSpaceGuid.PcdSlpS0Vm070VSupport
> -  gBoardModuleTokenSpaceGuid.PcdSlpS0Vm075VSupport
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0VmRuntimeControl
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0Vm070VSupport
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSlpS0Vm075VSupport
>=20
>    # 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
>=20
>=20
> -  gBoardModuleTokenSpaceGuid.PcdSpdPresent
> -  gBoardModuleTokenSpaceGuid.PcdBoardRev
> -  gBoardModuleTokenSpaceGuid.PcdBoardBomId
> -  gBoardModuleTokenSpaceGuid.PcdPlatformType
> -  gBoardModuleTokenSpaceGuid.PcdDualDimmPerChannelBoardType
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdSpdPresent
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardRev
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardBomId
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPlatformType
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdDualDimmPerChannelBoard
> Type
>=20
>    gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaBaseAddress
>    gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaSize
>    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress  ## CONSUMES
>    gMinPlatformPkgTokenSpaceGuid.PcdPciExpressRegionLength     ##
> CONSUMES
>=20
> -  gBoardModuleTokenSpaceGuid.PcdPcieWwanEnable
> -  gBoardModuleTokenSpaceGuid.PcdWwanResetWorkaround    ##
> PRODUCES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieWwanEnable
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanResetWorkaround
> ## PRODUCES
>    gSiPkgTokenSpaceGuid.PcdTcoBaseAddress
>=20
>=20
> diff --git
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPl
> atformHookLib/PeiPlatformHooklib.inf
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPl
> atformHookLib/PeiPlatformHooklib.inf
> index 079fb70ecb..d66290e79b 100644
> ---
> a/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPl
> atformHookLib/PeiPlatformHooklib.inf
> +++
> b/Platform/Intel/WhiskeylakeOpenBoardPkg/WhiskeylakeURvp/Library/PeiPl
> atformHookLib/PeiPlatformHooklib.inf
> @@ -40,45 +40,45 @@
>    CoffeelakeSiliconPkg/SiPkg.dec
>=20
>  [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
>=20
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMem
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTablePreMemSize
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMem
> -
> gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOnEarlyPreMemSiz
> e
> -
> gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMem
> -
> gBoardModuleTokenSpaceGuid.PcdBoardGpioTableWwanOffEarlyPreMemSiz
> e
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMem
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMemSize
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnEar
> lyPreMem
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOnEar
> lyPreMemSize
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffEa
> rlyPreMem
> +
> gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableWwanOffEa
> rlyPreMemSize
>=20
>    # GPIO Group Tier
> -  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw0
> ## CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw1
> ## CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdGpioGroupToGpeDw2
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw0
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw1
> ## CONSUMES
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdGpioGroupToGpeDw2
> ## CONSUMES
>=20
>    # 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
>=20
> -  gBoardModuleTokenSpaceGuid.PcdWwanBbrstGpio
> -  gBoardModuleTokenSpaceGuid.PcdPcieWwanEnable
> -  gBoardModuleTokenSpaceGuid.PcdWwanResetWorkaround
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanBbrstGpio
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdPcieWwanEnable
> +  gWhiskeylakeOpenBoardPkgTokenSpaceGuid.PcdWwanResetWorkaround
>=20
>  [Sources]
>    PeiPlatformHooklib.c
> --
> 2.16.2.windows.1