From mboxrd@z Thu Jan  1 00:00:00 1970
Authentication-Results: mx.groups.io;
 dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: chasel.chiu@intel.com)
Received: from mga18.intel.com (mga18.intel.com [134.134.136.126])
 by groups.io with SMTP; Tue, 08 Oct 2019 09:29:35 -0700
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga001.fm.intel.com ([10.253.24.23])
  by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 08 Oct 2019 09:29:34 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.67,270,1566889200"; 
   d="scan'208";a="206671832"
Received: from pgsmsx101.gar.corp.intel.com ([10.221.44.78])
  by fmsmga001.fm.intel.com with ESMTP; 08 Oct 2019 09:29:30 -0700
Received: from pgsmsx112.gar.corp.intel.com ([169.254.3.2]) by
 PGSMSX101.gar.corp.intel.com ([169.254.1.57]) with mapi id 14.03.0439.000;
 Wed, 9 Oct 2019 00:29:29 +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>, Jeremy Soller
	<jeremy@system76.com>
Subject: Re: [edk2-platforms][PATCH V1 07/17] KabylakeOpenBoardPkg: Assign unique token namespace
Thread-Topic: [edk2-platforms][PATCH V1 07/17] KabylakeOpenBoardPkg: Assign
 unique token namespace
Thread-Index: AQHVfZeqwRulFqr6cUy7Iu6Xi1xwBKdQ7+Dw
Date: Tue, 8 Oct 2019 16:29:29 +0000
Message-ID: <3C3EFB470A303B4AB093197B6777CCEC504F2086@PGSMSX112.gar.corp.intel.com>
References: <20191008051645.22052-1-michael.a.kubacki@intel.com>
 <20191008051645.22052-8-michael.a.kubacki@intel.com>
In-Reply-To: <20191008051645.22052-8-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: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOWFhMjAyZmUtMTExYS00Y2ZkLTkwY2ItYmJiZTEyNjIxMWRhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiRzl2YllvZEJYT2wzTXpqdmZ6VTczQ3Y2bGJYT3lXcDJVY3BYRWY3ZnB6NzVVM1JDVWxDV0R5a2E3emtxQk5CUCJ9
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>; Jeremy Soller <jeremy@system76.com>
> Subject: [edk2-platforms][PATCH V1 07/17] KabylakeOpenBoardPkg: Assign
> unique token namespace
>=20
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2247
>=20
> PCDs declared in the KabylakeOpenBoardPkg 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>
> Cc: Jeremy Soller <jeremy@system76.com>
> Signed-off-by: Michael Kubacki <michael.a.kubacki@intel.com>
> ---
>  Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> | 408 ++++++++++----------
>  Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc
> |  18 +-
>  Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc
> |  60 +--
>  Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> |  18 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.dsc
> |  60 +--
>=20
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Include/Fdf/FlashMapInc
> lude.fdf                                                    |   4
> +-
>  Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf
> |   8 +-
>  Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
> |   4 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf
> |  16 +-
>  Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
> |   4 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyLib
> /DxeTbtPolicyLib.inf                                      |  40 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTbtC
> ommonLib/TbtCommonLib.inf                                   |
> 40 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLib/
> PeiTbtPolicyLib.inf                                      |  18 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm.in
> f                                                           |
> 4 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolicyN
> otifyLib/PeiPreMemSiliconPolicyNotifyLib.inf              |   8 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiS
> iliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf   |   8 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/PeiS
> iliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf   |  70 ++--
>=20
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BasePlatformHoo
> kLib/BasePlatformHookLib.inf                                |  18 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/Dx
> eBoardAcpiTableLib.inf                                      |   4 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/Dx
> eMultiBoardAcpiSupportLib.inf                               |  10 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/Sm
> mBoardAcpiEnableLib.inf                                     |   2
> +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/Sm
> mMultiBoardAcpiSupportLib.inf                               |   2
> +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/Pei
> BoardInitPostMemLib.inf                                    |  16 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/Pei
> BoardInitPreMemLib.inf                                     | 134
> +++----
>=20
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/Pei
> MultiBoardInitPostMemLib.inf                               |  16 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/Pei
> MultiBoardInitPreMemLib.inf                                | 132
> +++----
>=20
> Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilicon
> PolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf             |   4 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/P
> eiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf |  74 ++--
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatformH
> ookLib/BasePlatformHookLib.inf                              |  18 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/
> DxeBoardAcpiTableLib.inf                                    |  12 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/
> DxeMultiBoardAcpiSupportLib.inf                             |  14 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/S
> mmBoardAcpiEnableLib.inf                                   |   6
> +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib/S
> mmMultiBoardAcpiSupportLib.inf                             |   6 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/P
> eiBoardInitPostMemLib.inf                                  |  18 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/P
> eiBoardInitPreMemLib.inf                                   | 134
> +++----
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/P
> eiMultiBoardInitPostMemLib.inf                             |  18 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/P
> eiMultiBoardInitPreMemLib.inf                              | 136
> +++----
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSilic
> onPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf           |   6 +-
>=20
> Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSilico
> nPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf           |  54 +--
>=20
> Platform/Intel/KabylakeOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/PeiS
> erialPortLibSpiFlash.inf                                 |   4 +-
>  40 files changed, 813 insertions(+), 813 deletions(-)
>=20
> diff --git a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> index bdaf728af1..9680e63bad 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/OpenBoardPkg.dec
> @@ -26,7 +26,7 @@ Features/Tbt/Include
>=20
>  [Guids]
>=20
> -gBoardModuleTokenSpaceGuid            =3D  {0x72d1fff7, 0xa42a,
> 0x4219, {0xb9, 0x95, 0x5a, 0x67, 0x53, 0x6e, 0xa4, 0x2a}}
> +gKabylakeOpenBoardPkgTokenSpaceGuid   =3D  {0x7cdc8563, 0xe40d,
> 0x446b, {0x9f, 0x0d, 0xf3, 0x67, 0xfb, 0x01, 0xae, 0xc9}}
>=20
>  gTianoLogoGuid                        =3D  {0x7BB28B99, 0x61BB,
> 0x11D5, {0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}}
>=20
> @@ -51,260 +51,260 @@ gPeiTbtPolicyBoardInitDonePpiGuid     =3D
> {0x970f9c60, 0x8547, 0x49d7, { 0xa4, 0x
>=20
>  [PcdsFixedAtBuild]
>=20
> -gBoardModuleTokenSpaceGuid.PcdLpcIoDecodeRange|0x0010|UINT16|0x1
> 0001004
> -gBoardModuleTokenSpaceGuid.PchLpcIoEnableDecoding|0x3c03|UINT16|0x
> 10001005
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcIoDecodeRange|0x0010|UI
> NT16|0x10001004
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PchLpcIoEnableDecoding|0x3c03|
> UINT16|0x10001005
>=20
> -gBoardModuleTokenSpaceGuid.PcdLpcSioIndexPort|0x4e|UINT16|0x900000
> 18
> -gBoardModuleTokenSpaceGuid.PcdLpcSioDataPort|0x4f|UINT16|0x9000001
> F
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioIndexPort|0x4e|UINT16
> |0x90000018
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioDataPort|0x4f|UINT16|0
> x9000001F
>=20
> -gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort|0x164E|UINT16
> |0x9000001C
> -gBoardModuleTokenSpaceGuid.PcdSioBaseAddress|0x0680|UINT16|0x9000
> 001D
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort|0x16
> 4E|UINT16|0x9000001C
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSioBaseAddress|0x0680|UINT
> 16|0x9000001D
>=20
> -gBoardModuleTokenSpaceGuid.PcdLpcSioIndexDefaultPort|0x164E|UINT16|
> 0x90000021
> -gBoardModuleTokenSpaceGuid.PcdLpcSioDataDefaultPort|0x164F|UINT16|0
> x90000022
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioIndexDefaultPort|0x164
> E|UINT16|0x90000021
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioDataDefaultPort|0x164F
> |UINT16|0x90000022
>=20
>  ## Tbt SW_SMI_DTBT_ENUMERATEgSetupVariableGuid
> -gBoardModuleTokenSpaceGuid.PcdSwSmiDTbtEnumerate|0xF7|UINT8|0x00
> 0000110
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSwSmiDTbtEnumerate|0xF7|UI
> NT8|0x000000110
>=20
> -gBoardModuleTokenSpaceGuid.PcdSmcExtSmiBitPosition|0x01|UINT8|0x90
> 000015
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSmcExtSmiBitPosition|0x01|UI
> NT8|0x90000015
>=20
> -gBoardModuleTokenSpaceGuid.PcdFlashNvDebugMessageBase|0x00000000
> |UINT32|0x90000030
> -gBoardModuleTokenSpaceGuid.PcdFlashNvDebugMessageSize|0x00000000|
> UINT32|0x90000031
> -gBoardModuleTokenSpaceGuid.PcdFlashNvDebugMessageOffset|0x0000000
> 0|UINT32|0x90000032
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdFlashNvDebugMessageBase|0x
> 00000000|UINT32|0x90000030
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdFlashNvDebugMessageSize|0x
> 00000000|UINT32|0x90000031
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdFlashNvDebugMessageOffset|
> 0x00000000|UINT32|0x90000032
>=20
>  [PcdsDynamic]
>=20
>  # 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
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable|0|UINT32|0x
> 00000040
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableSize|0|UINT16
> |0x00000041
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable2|0|UINT32|0
> x00000042
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable2Size|0|UINT1
> 6|0x00000043
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMem|0|UI
> NT32|0x000000113
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTablePreMemSize|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
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable|0|UINT32
> |0x00000044
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTableSize|0|UIN
> T16|0x00000045
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable2|0|UINT3
> 2|0x00000046
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable2Size|0|UI
> NT16|0x00000047
>=20
>  # TouchPanel & SDHC CD GPIO Table
> -gBoardModuleTokenSpaceGuid.PcdBoardGpioTableTouchPanel|0|UINT32|0
> x00000048
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableTouchPanel|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
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1|0|UI
> NT32|0x0000004A
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2|0|UI
> NT32|0x0000004B
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Size|
> 0|UINT16|0x0000004C
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Size|
> 0|UINT16|0x0000004D
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1|0|UI
> NT32|0x0000004E
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2|0|UI
> NT32|0x0000004F
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size|0
> |UINT16|0x00000050
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size|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
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1|0|UI
> NT32|0x00000052
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2|0|UI
> NT32|0x00000053
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size|0
> |UINT16|0x00000054
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size|0
> |UINT16|0x00000055
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1|0|UIN
> T32|0x00000056
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2|0|UIN
> T32|0x00000057
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1Size|0|
> UINT16|0x00000058
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2Size|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
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable|0|UINT32|0x00
> 00005A
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable2|0|UINT32|0x0
> 000005B
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdExtHdaVerbTable|0|UINT32|0
> x0000005C
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable1|0|UI
> NT32|0x0000005D
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable2|0|UI
> NT32|0x0000005E
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable3|0|UI
> NT32|0x0000005F
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDisplayAudioHdaVerbTable|0|
> UINT32|0x00000060
>=20
>  # SA Misc Configuration
> -gBoardModuleTokenSpaceGuid.PcdSaMiscUserBd|0|UINT8|0x00000066
> -gBoardModuleTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment|0|UINT16|
> 0x00000067
> -gBoardModuleTokenSpaceGuid.PcdSaDdrFreqLimit|0|UINT16|0x00000101
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscUserBd|0|UINT8|0x000
> 00066
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscMmioSizeAdjustment|0
> |UINT16|0x00000067
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSaDdrFreqLimit|0|UINT16|0x0
> 0000101
>=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
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor|0|UINT32|
> 0x00000068
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget|0|UINT32|0x
> 00000069
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap|0|UINT32|0x0
> 000006A
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMapSize|0|UINT16
> |0x0000006B
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram|0|UIN
> T32|0x0000006C
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize|0|
> UINT16|0x0000006D
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleavedControl|
> FALSE|BOOLEAN|0x0000006E
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleaved|FALSE|B
> OOLEAN|0x0000006F
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData|0|UINT32|0x0000
> 0070
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize|0|UINT16|0x
> 00000071
>=20
>  # PEG RESET GPIO
> -gBoardModuleTokenSpaceGuid.PcdPegGpioResetControl|FALSE|BOOLEAN|0
> x00000072
> -gBoardModuleTokenSpaceGuid.PcdPegGpioResetSupoort|FALSE|BOOLEAN|
> 0x00000073
> -gBoardModuleTokenSpaceGuid.PcdPegResetGpioPad|0|UINT32|0x0000007
> 4
> -gBoardModuleTokenSpaceGuid.PcdPegResetGpioActive|FALSE|BOOLEAN|0x
> 00000075
> -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
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPegGpioResetControl|FALSE|B
> OOLEAN|0x00000072
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPegGpioResetSupoort|FALSE|
> BOOLEAN|0x00000073
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPegResetGpioPad|0|UINT32|0
> x00000074
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPegResetGpioActive|FALSE|BO
> OLEAN|0x00000075
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0WakeGpioNo|0|UINT32|
> 0x00000079
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstExpanderNo|0|UI
> NT8|0x0000007A
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstGpioNo|0|UINT3
> 2|0x0000007B
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstActive|FALSE|BO
> OLEAN|0x0000007C
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo|0
> |UINT8|0x0000007D
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableGpioNo|0|UIN
> T32|0x0000007E
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableActive|FALSE|
> 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
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0|0|UINT
> 8|0x00000099
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1|0|UINT
> 8|0x0000009A
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2|0|UINT
> 8|0x0000009B
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3|0|UINT
> 8|0x0000009C
>=20
>  # CA Vref Configuration
> -gBoardModuleTokenSpaceGuid.PcdMrcCaVrefConfig|0|UINT8|0x0000009D
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcCaVrefConfig|0|UINT8|0x0
> 000009D
>=20
>  # Root Port Clock Info
> -gBoardModuleTokenSpaceGuid.PcdRootPort0ClkInfo|0|UINT64|0x0000009E
> -gBoardModuleTokenSpaceGuid.PcdRootPort1ClkInfo|0|UINT64|0x0000009F
> -gBoardModuleTokenSpaceGuid.PcdRootPort2ClkInfo|0|UINT64|0x000000A0
> -gBoardModuleTokenSpaceGuid.PcdRootPort3ClkInfo|0|UINT64|0x000000A1
> -gBoardModuleTokenSpaceGuid.PcdRootPort4ClkInfo|0|UINT64|0x000000A2
> -gBoardModuleTokenSpaceGuid.PcdRootPort5ClkInfo|0|UINT64|0x000000A3
> -gBoardModuleTokenSpaceGuid.PcdRootPort6ClkInfo|0|UINT64|0x000000A4
> -gBoardModuleTokenSpaceGuid.PcdRootPort7ClkInfo|0|UINT64|0x000000A5
> -gBoardModuleTokenSpaceGuid.PcdRootPort8ClkInfo|0|UINT64|0x000000A6
> -gBoardModuleTokenSpaceGuid.PcdRootPort9ClkInfo|0|UINT64|0x000000A7
> -gBoardModuleTokenSpaceGuid.PcdRootPort10ClkInfo|0|UINT64|0x000000A
> 8
> -gBoardModuleTokenSpaceGuid.PcdRootPort11ClkInfo|0|UINT64|0x000000A
> 9
> -gBoardModuleTokenSpaceGuid.PcdRootPort12ClkInfo|0|UINT64|0x000000A
> A
> -gBoardModuleTokenSpaceGuid.PcdRootPort13ClkInfo|0|UINT64|0x000000A
> B
> -gBoardModuleTokenSpaceGuid.PcdRootPort14ClkInfo|0|UINT64|0x000000A
> C
> -gBoardModuleTokenSpaceGuid.PcdRootPort15ClkInfo|0|UINT64|0x000000A
> D
> -gBoardModuleTokenSpaceGuid.PcdRootPort16ClkInfo|0|UINT64|0x000000A
> E
> -gBoardModuleTokenSpaceGuid.PcdRootPort17ClkInfo|0|UINT64|0x000000A
> F
> -gBoardModuleTokenSpaceGuid.PcdRootPort18ClkInfo|0|UINT64|0x000000B
> 0
> -gBoardModuleTokenSpaceGuid.PcdRootPort19ClkInfo|0|UINT64|0x000000B
> 1
> -gBoardModuleTokenSpaceGuid.PcdRootPort20ClkInfo|0|UINT64|0x000000B
> 2
> -gBoardModuleTokenSpaceGuid.PcdRootPort21ClkInfo|0|UINT64|0x000000B
> 3
> -gBoardModuleTokenSpaceGuid.PcdRootPort22ClkInfo|0|UINT64|0x000000B
> 4
> -gBoardModuleTokenSpaceGuid.PcdRootPort23ClkInfo|0|UINT64|0x000000B
> 5
> -gBoardModuleTokenSpaceGuid.PcdRootPort24ClkInfo|0|UINT64|0x000000B
> 6
> -gBoardModuleTokenSpaceGuid.PcdRootPort25ClkInfo|0|UINT64|0x000000B
> 7
> -gBoardModuleTokenSpaceGuid.PcdRootPort26ClkInfo|0|UINT64|0x000000B
> 8
> -gBoardModuleTokenSpaceGuid.PcdRootPort27ClkInfo|0|UINT64|0x000000B
> 9
> -gBoardModuleTokenSpaceGuid.PcdRootPort28ClkInfo|0|UINT64|0x000000B
> A
> -gBoardModuleTokenSpaceGuid.PcdRootPort29ClkInfo|0|UINT64|0x000000B
> B
> -gBoardModuleTokenSpaceGuid.PcdRootPort30ClkInfo|0|UINT64|0x000000B
> C
> -gBoardModuleTokenSpaceGuid.PcdRootPort31ClkInfo|0|UINT64|0x000000B
> D
> -gBoardModuleTokenSpaceGuid.PcdRootPortLanClkInfo|0|UINT64|0x000000
> BE
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort0ClkInfo|0|UINT64|0
> x0000009E
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort1ClkInfo|0|UINT64|0
> x0000009F
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort2ClkInfo|0|UINT64|0
> x000000A0
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort3ClkInfo|0|UINT64|0
> x000000A1
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort4ClkInfo|0|UINT64|0
> x000000A2
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort5ClkInfo|0|UINT64|0
> x000000A3
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort6ClkInfo|0|UINT64|0
> x000000A4
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort7ClkInfo|0|UINT64|0
> x000000A5
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort8ClkInfo|0|UINT64|0
> x000000A6
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort9ClkInfo|0|UINT64|0
> x000000A7
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort10ClkInfo|0|UINT64|
> 0x000000A8
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort11ClkInfo|0|UINT64|
> 0x000000A9
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort12ClkInfo|0|UINT64|
> 0x000000AA
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort13ClkInfo|0|UINT64|
> 0x000000AB
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort14ClkInfo|0|UINT64|
> 0x000000AC
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort15ClkInfo|0|UINT64|
> 0x000000AD
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort16ClkInfo|0|UINT64|
> 0x000000AE
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort17ClkInfo|0|UINT64|
> 0x000000AF
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort18ClkInfo|0|UINT64|
> 0x000000B0
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort19ClkInfo|0|UINT64|
> 0x000000B1
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort20ClkInfo|0|UINT64|
> 0x000000B2
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort21ClkInfo|0|UINT64|
> 0x000000B3
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort22ClkInfo|0|UINT64|
> 0x000000B4
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort23ClkInfo|0|UINT64|
> 0x000000B5
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort24ClkInfo|0|UINT64|
> 0x000000B6
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort25ClkInfo|0|UINT64|
> 0x000000B7
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort26ClkInfo|0|UINT64|
> 0x000000B8
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort27ClkInfo|0|UINT64|
> 0x000000B9
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort28ClkInfo|0|UINT64|
> 0x000000BA
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort29ClkInfo|0|UINT64|
> 0x000000BB
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort30ClkInfo|0|UINT64|
> 0x000000BC
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort31ClkInfo|0|UINT64|
> 0x000000BD
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortLanClkInfo|0|UINT64
> |0x000000BE
>=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
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port0Afe|0|UINT32|0x0
> 00000BF
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port1Afe|0|UINT32|0x0
> 00000C0
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port2Afe|0|UINT32|0x0
> 00000C1
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port3Afe|0|UINT32|0x0
> 00000C2
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port4Afe|0|UINT32|0x0
> 00000C3
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port5Afe|0|UINT32|0x0
> 00000C4
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port6Afe|0|UINT32|0x0
> 00000C5
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port7Afe|0|UINT32|0x0
> 00000C6
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port8Afe|0|UINT32|0x0
> 00000C7
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port9Afe|0|UINT32|0x0
> 00000C8
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port10Afe|0|UINT32|0x
> 000000C9
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port11Afe|0|UINT32|0x
> 000000CA
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port12Afe|0|UINT32|0x
> 000000CB
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port13Afe|0|UINT32|0x
> 000000CC
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port14Afe|0|UINT32|0x
> 000000CD
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port15Afe|0|UINT32|0x
> 000000CE
>=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
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort0|0|
> UINT8|0x000000CF
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort1|0|
> UINT8|0x000000D0
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort2|0|
> UINT8|0x000000D1
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort3|0|
> UINT8|0x000000D2
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort4|0|
> UINT8|0x000000D3
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort5|0|
> UINT8|0x000000D4
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort6|0|
> UINT8|0x000000D5
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort7|0|
> UINT8|0x000000D6
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort8|0|
> UINT8|0x000000D7
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort9|0|
> UINT8|0x000000D8
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort10|0
> |UINT8|0x000000D9
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort11|0
> |UINT8|0x000000DA
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort12|0
> |UINT8|0x000000DB
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort13|0
> |UINT8|0x000000DC
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort14|0
> |UINT8|0x000000DD
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort15|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
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort0|0|
> UINT8|0x000000DF
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort1|0|
> UINT8|0x000000E0
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort2|0|
> UINT8|0x000000E1
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort3|0|
> UINT8|0x000000E2
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort4|0|
> UINT8|0x000000E3
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort5|0|
> UINT8|0x000000E4
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort6|0|
> UINT8|0x000000E5
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort7|0|
> UINT8|0x000000E6
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort8|0|
> UINT8|0x000000E7
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort9|0|
> UINT8|0x000000E8
>=20
>  # TBT
> -gBoardModuleTokenSpaceGuid.PcdDTbtBootOn |0|UINT8|0x000000E9
> -gBoardModuleTokenSpaceGuid.PcdDTbtUsbOn |0|UINT8|0x000000EA
> -gBoardModuleTokenSpaceGuid.PcdDTbtGpio3ForcePwr
> |0|UINT8|0x000000EB
> -gBoardModuleTokenSpaceGuid.PcdDTbtGpio3ForcePwrDly
> |0|UINT16|0x000000ED
> -gBoardModuleTokenSpaceGuid.PcdDTbtControllerEn |0|UINT8|0x000000EE
> -gBoardModuleTokenSpaceGuid.PcdDTbtControllerType
> |0|UINT8|0x000000EF
> -gBoardModuleTokenSpaceGuid.PcdDTbtPcieRpNumber
> |0|UINT8|0x000000F0
> -gBoardModuleTokenSpaceGuid.PcdDTbtGpioAccessType
> |0|UINT8|0x000000F1
> -gBoardModuleTokenSpaceGuid.PcdExpander |0|UINT8|0x000000F2
> -gBoardModuleTokenSpaceGuid.PcdDTbtGpioLevel |0|BOOLEAN|0x000000F3
> -gBoardModuleTokenSpaceGuid.PcdDTbtForcepowerGpioPad
> |0|UINT32|0x000000F4
> -gBoardModuleTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad
> |0|UINT32|0x000000F5
> -gBoardModuleTokenSpaceGuid.PcdDTbtAcpiGpeSignature
> |0|UINT32|0x000000F6
> -gBoardModuleTokenSpaceGuid.PcdDTbtAcpiGpeSignaturePorting
> |0|BOOLEAN|0x000000F7
> -gBoardModuleTokenSpaceGuid.PcdDTbtSecurityMode
> |0|UINT8|0x000000F8
> -gBoardModuleTokenSpaceGuid.PcdDTbtGpio5Filter |0|UINT8|0x000000F9
> -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.PcdDTbtWin10Support
> |0|UINT8|0x000000102
> -gBoardModuleTokenSpaceGuid.PcdRtd3TbtClkReqDelay
> |0|UINT16|0x00000103
> -gBoardModuleTokenSpaceGuid.PcdRtd3TbtOffDelay |0|UINT16|0x00000104
> -gBoardModuleTokenSpaceGuid.PcdDTbtPcieExtraBusRsvd
> |0|UINT8|0x00000105
> -gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemRsvd
> |0|UINT16|0x00000106
> -gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax
> |0|UINT8|0x00000107
> -gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemRsvd
> |0|UINT16|0x00000108
> -gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax
> |0|UINT8|0x00000109
> -gBoardModuleTokenSpaceGuid.PcdPchPcieRootPortHpe|0|UINT32|0x00000
> 117
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtBootOn
> |0|UINT8|0x000000E9
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtUsbOn
> |0|UINT8|0x000000EA
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpio3ForcePwr
> |0|UINT8|0x000000EB
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpio3ForcePwrDly
> |0|UINT16|0x000000ED
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtControllerEn
> |0|UINT8|0x000000EE
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtControllerType
> |0|UINT8|0x000000EF
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieRpNumber
> |0|UINT8|0x000000F0
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpioAccessType
> |0|UINT8|0x000000F1
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdExpander
> |0|UINT8|0x000000F2
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpioLevel
> |0|BOOLEAN|0x000000F3
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtForcepowerGpioPad
> |0|UINT32|0x000000F4
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad
> |0|UINT32|0x000000F5
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAcpiGpeSignature
> |0|UINT32|0x000000F6
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAcpiGpeSignaturePorting
> |0|BOOLEAN|0x000000F7
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtSecurityMode
> |0|UINT8|0x000000F8
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpio5Filter
> |0|UINT8|0x000000F9
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtWakeupSupport
> |0|UINT8|0x000000FA
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotSMI
> |0|UINT8|0x000000FB
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotNotify
> |0|UINT8|0x000000FC
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtSetClkReq|0|UINT8|0x00
> 0000FD
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAspm
> |0|UINT8|0x000000FE
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtLtr | 0 | UINT8|
> 0x00000116
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAcDcSwitch
> |0|UINT8|0x000000FF
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3Tbt |0|UINT8|0x00000100
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtClkReq
> |0|UINT8|0x0000010A
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtWin10Support
> |0|UINT8|0x000000102
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtClkReqDelay
> |0|UINT16|0x00000103
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtOffDelay
> |0|UINT16|0x00000104
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieExtraBusRsvd
> |0|UINT8|0x00000105
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieMemRsvd
> |0|UINT16|0x00000106
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax
> |0|UINT8|0x00000107
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemRsvd
> |0|UINT16|0x00000108
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax
> |0|UINT8|0x00000109
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPchPcieRootPortHpe|0|UINT3
> 2|0x00000117
>=20
>=20
>=20
>=20
>  # UCMC GPIO Table
> -gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTable|0|UINT32|0x0000
> 00111
> -gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTableSize|0|UINT16|0x0
> 00000112
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTable|0|UINT
> 32|0x000000111
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTableSize|0|UI
> NT16|0x000000112
>=20
>  # Misc
> -gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent|FALSE|BOOLEAN|0x0
> 00000EC
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent|FALSE|BO
> OLEAN|0x000000EC
>=20
> -  gBoardModuleTokenSpaceGuid.PcdPs2KbMsEnable|1|UINT8|0x40000009
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable|1|UINT8|0x40
> 000009
>=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|0x40000006
> -
> gBoardModuleTokenSpaceGuid.PcdDisableActiveTripPoints|1|UINT8|0x4000
> 000A
> -
> gBoardModuleTokenSpaceGuid.PcdDisablePassiveTripPoints|0|UINT8|0x400
> 0000B
> -
> gBoardModuleTokenSpaceGuid.PcdDisableCriticalTripPoints|1|UINT8|0x400
> 0000C
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiSleepState|1|UINT8|0x400
> 00002
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiHibernate|1|UINT8|0x4000
> 0003
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle|0|UINT8|0x40
> 000004
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative|0|UINT8|0x40000
> 005
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable|1|UINT8|0x
> 40000006
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDisableActiveTripPoints|1|UINT
> 8|0x4000000A
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDisablePassiveTripPoints|0|UIN
> T8|0x4000000B
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDisableCriticalTripPoints|1|UIN
> T8|0x4000000C
>    # 0: Type-C
>    # 1: Stacked-Jack
> -
> gBoardModuleTokenSpaceGuid.PcdAudioConnector|0|UINT8|0x40000012
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAudioConnector|0|UINT8|0x40
> 000012
>=20
> -
> gBoardModuleTokenSpaceGuid.PcdAcpiGnvsAddress|0|UINT64|0x40000013
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiGnvsAddress|0|UINT64|0x
> 40000013
>=20
> -  gBoardModuleTokenSpaceGuid.PcdGraphicsVbtGuid|{0x22, 0x61, 0xd4,
> 0x4a, 0xeb, 0xff, 0x52, 0x4a, 0xbf, 0xb0, 0x51, 0x8c, 0xfc, 0xa0, 0x2d,
> 0xb0}|VOID*|0x40000014
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGraphicsVbtGuid|{0x22,
> 0x61, 0xd4, 0x4a, 0xeb, 0xff, 0x52, 0x4a, 0xbf, 0xb0, 0x51, 0x8c, 0xfc, 0=
xa0,
> 0x2d, 0xb0}|VOID*|0x40000014
>=20
>  [PcdsDynamicEx]
>=20
> @@ -313,8 +313,8 @@
> gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent|FALSE|BOOLEAN|0x0
> 00000EC
>  [PcdsPatchableInModule]
>=20
>  [PcdsFeatureFlag]
> -  gBoardModuleTokenSpaceGuid.PcdIntelGopEnable
> |TRUE|BOOLEAN|0xF0000062
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdIntelGopEnable
> |TRUE|BOOLEAN|0xF0000062
>=20
> -  gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport
> |TRUE|BOOLEAN|0xF0000000
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport
> |TRUE|BOOLEAN|0xF0000000
>=20
> -  gBoardModuleTokenSpaceGuid.PcdTbtEnable
> |FALSE|BOOLEAN|0x000000115
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable
> |FALSE|BOOLEAN|0x000000115
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc
> index 5f77c8db0a..b6f9807e7e 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.dsc
> @@ -129,7 +129,7 @@
>=20
> PlatformSecLib|$(PLATFORM_BOARD_PACKAGE)/FspWrapper/Library/SecFsp
> WrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
>=20
>    # Thunderbolt
> -!if gBoardModuleTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
> +!if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
>=20
> DxeTbtPolicyLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/DxeTb
> tPolicyLib/DxeTbtPolicyLib.inf
>=20
> TbtCommonLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/PeiDx
> eSmmTbtCommonLib/TbtCommonLib.inf
>  !endif
> @@ -175,7 +175,7 @@
>    # Board Package
>    #######################################
>    # Thunderbolt
> -!if gBoardModuleTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
> +!if gKabylakeOpenBoardPkgTokenSpaceGuid.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
> @@ -262,7 +262,7 @@
>    $(PLATFORM_PACKAGE)/PlatformInit/ReportFv/ReportFvPei.inf
>=20
> $(PROJECT)/Override/Platform/Intel/MinPlatformPkg/PlatformInit/PlatformIn
> itPei/PlatformInitPreMem.inf {
>      <LibraryClasses>
> -      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport =3D=3D FALSE
> +      !if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport
> =3D=3D FALSE
>=20
> BoardInitLib|$(PROJECT)/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
>        !else
>=20
> NULL|$(PROJECT)/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
> @@ -271,7 +271,7 @@
>=20
>=20
> $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPostMem.in
> f {
>      <LibraryClasses>
> -      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport =3D=3D FALSE
> +      !if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport
> =3D=3D FALSE
>=20
> BoardInitLib|$(PROJECT)/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
>        !else
>=20
> NULL|$(PROJECT)/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
> @@ -295,7 +295,7 @@
>    # Board Package
>    #######################################
>    # Thunderbolt
> -!if gBoardModuleTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
> +!if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
>    $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
>  !endif
>=20
> @@ -369,7 +369,7 @@
>=20
>    $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf {
>      <LibraryClasses>
> -      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport =3D=3D FALSE
> +      !if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport
> =3D=3D FALSE
>=20
> BoardAcpiEnableLib|$(PROJECT)/Library/BoardAcpiLib/SmmBoardAcpiEnabl
> eLib.inf
>        !else
>=20
> NULL|$(PROJECT)/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
> @@ -378,7 +378,7 @@
>=20
>    $(PLATFORM_PACKAGE)/Acpi/AcpiTables/AcpiPlatform.inf {
>      <LibraryClasses>
> -      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport =3D=3D FALSE
> +      !if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport
> =3D=3D FALSE
>=20
> BoardAcpiTableLib|$(PROJECT)/Library/BoardAcpiLib/DxeBoardAcpiTableLib.i
> nf
>        !else
>=20
> NULL|$(PROJECT)/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf
> @@ -391,7 +391,7 @@
>    # Board Package
>    #######################################
>    # Thunderbolt
> -!if gBoardModuleTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
> +!if gKabylakeOpenBoardPkgTokenSpaceGuid.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
> @@ -400,7 +400,7 @@
>  !if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly =3D=3D FALSE
>    $(PLATFORM_BOARD_PACKAGE)/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf {
>      <LibraryClasses>
> -      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport =3D=3D FALSE
> +      !if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport
> =3D=3D FALSE
>=20
> BoardAcpiTableLib|$(PROJECT)/Library/BoardAcpiLib/DxeBoardAcpiTableLib.i
> nf
>        !else
>=20
> NULL|$(PROJECT)/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc
> index d13761e077..c68b8a49cf 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkgPcd.dsc
> @@ -168,8 +168,8 @@
>    ######################################
>    # Board Configuration
>    ######################################
> -  gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport|TRUE
> -  gBoardModuleTokenSpaceGuid.PcdTbtEnable|FALSE
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport|TRUE
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable|FALSE
>=20
>  [PcdsFixedAtBuild.common]
>    ######################################
> @@ -378,34 +378,34 @@
>    ######################################
>=20
>    # Thunderbolt Configuration
> -  gBoardModuleTokenSpaceGuid.PcdDTbtAcDcSwitch|0x0
> -  gBoardModuleTokenSpaceGuid.PcdDTbtAcpiGpeSignature|0
> -  gBoardModuleTokenSpaceGuid.PcdDTbtAcpiGpeSignaturePorting|0
> -  gBoardModuleTokenSpaceGuid.PcdDTbtAspm|0x0
> -
> gBoardModuleTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad|0x02010011
> -  gBoardModuleTokenSpaceGuid.PcdDTbtControllerEn|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtControllerType|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtForcepowerGpioPad|13
> -  gBoardModuleTokenSpaceGuid.PcdDTbtGpioAccessType|0x2
> -  gBoardModuleTokenSpaceGuid.PcdDTbtGpioLevel|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtHotNotify|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtHotSMI|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPcieExtraBusRsvd|56
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax|26
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemRsvd|100
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax|28
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemRsvd|100
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPcieRpNumber|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtSecurityMode|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtSetClkReq|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtWakeupSupport|0x0
> -  gBoardModuleTokenSpaceGuid.PcdDTbtWin10Support|0x0
> -  gBoardModuleTokenSpaceGuid.PcdExpander|0x0
> -  gBoardModuleTokenSpaceGuid.PcdPchPcieRootPortHpe|0x00000001
> -  gBoardModuleTokenSpaceGuid.PcdRtd3Tbt|0x1
> -  gBoardModuleTokenSpaceGuid.PcdRtd3TbtClkReq|0x1
> -  gBoardModuleTokenSpaceGuid.PcdRtd3TbtClkReqDelay|0x0
> -  gBoardModuleTokenSpaceGuid.PcdRtd3TbtOffDelay|5000
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAcDcSwitch|0x0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAcpiGpeSignature|0
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAcpiGpeSignaturePorting|0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAspm|0x0
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad|0x02
> 010011
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtControllerEn|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtControllerType|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtForcepowerGpioPad|13
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpioAccessType|0x2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpioLevel|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotNotify|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotSMI|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieExtraBusRsvd|56
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax|26
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieMemRsvd|100
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax|28
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemRsvd|100
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieRpNumber|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtSecurityMode|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtSetClkReq|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtWakeupSupport|0x0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtWin10Support|0x0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdExpander|0x0
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPchPcieRootPortHpe|0x0000000
> 1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3Tbt|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtClkReq|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtClkReqDelay|0x0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtOffDelay|5000
>=20
>  [PcdsDynamicHii.X64.DEFAULT]
>    ######################################
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> index efc4c2dca8..b412dc9eec 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.dsc
> @@ -169,7 +169,7 @@
>=20
> PlatformSecLib|$(PLATFORM_BOARD_PACKAGE)/FspWrapper/Library/SecFsp
> WrapperPlatformSecLib/SecFspWrapperPlatformSecLib.inf
>=20
>    # Thunderbolt
> -!if gBoardModuleTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
> +!if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
>=20
> DxeTbtPolicyLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/DxeTb
> tPolicyLib/DxeTbtPolicyLib.inf
>=20
> TbtCommonLib|$(PLATFORM_BOARD_PACKAGE)/Features/Tbt/Library/PeiDx
> eSmmTbtCommonLib/TbtCommonLib.inf
>  !endif
> @@ -213,7 +213,7 @@
>    # Board Package
>    #######################################
>    # Thunderbolt
> -!if gBoardModuleTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
> +!if gKabylakeOpenBoardPkgTokenSpaceGuid.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
> @@ -318,7 +318,7 @@
>    $(PLATFORM_PACKAGE)/PlatformInit/ReportFv/ReportFvPei.inf
>=20
> $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPreMem.inf
> {
>      <LibraryClasses>
> -      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport =3D=3D FALSE
> +      !if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport
> =3D=3D FALSE
>=20
> BoardInitLib|$(PROJECT)/Library/BoardInitLib/PeiBoardInitPreMemLib.inf
>        !else
>=20
> NULL|$(PROJECT)/Library/BoardInitLib/PeiMultiBoardInitPreMemLib.inf
> @@ -327,7 +327,7 @@
>=20
>=20
> $(PLATFORM_PACKAGE)/PlatformInit/PlatformInitPei/PlatformInitPostMem.in
> f {
>      <LibraryClasses>
> -      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport =3D=3D FALSE
> +      !if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport
> =3D=3D FALSE
>=20
> BoardInitLib|$(PROJECT)/Library/BoardInitLib/PeiBoardInitPostMemLib.inf
>        !else
>=20
> NULL|$(PROJECT)/Library/BoardInitLib/PeiMultiBoardInitPostMemLib.inf
> @@ -367,7 +367,7 @@
>    # Board Package
>    #######################################
>    # Thunderbolt
> -!if gBoardModuleTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
> +!if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
>    $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
>  !endif
>=20
> @@ -446,7 +446,7 @@
>=20
>    $(PLATFORM_PACKAGE)/Acpi/AcpiSmm/AcpiSmm.inf {
>      <LibraryClasses>
> -      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport =3D=3D FALSE
> +      !if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport
> =3D=3D FALSE
>=20
> BoardAcpiEnableLib|$(PROJECT)/Library/BoardAcpiLib/SmmBoardAcpiEnabl
> eLib.inf
>        !else
>=20
> NULL|$(PROJECT)/Library/BoardAcpiLib/SmmMultiBoardAcpiSupportLib.inf
> @@ -455,7 +455,7 @@
>=20
>    $(PLATFORM_PACKAGE)/Acpi/AcpiTables/AcpiPlatform.inf {
>      <LibraryClasses>
> -      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport =3D=3D FALSE
> +      !if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport
> =3D=3D FALSE
>=20
> BoardAcpiTableLib|$(PROJECT)/Library/BoardAcpiLib/DxeBoardAcpiTableLib.i
> nf
>        !else
>=20
> NULL|$(PROJECT)/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf
> @@ -468,7 +468,7 @@
>    # Board Package
>    #######################################
>    # Thunderbolt
> -!if gBoardModuleTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
> +!if gKabylakeOpenBoardPkgTokenSpaceGuid.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
> @@ -477,7 +477,7 @@
>  !if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly =3D=3D FALSE
>    $(PLATFORM_BOARD_PACKAGE)/Acpi/BoardAcpiDxe/BoardAcpiDxe.inf {
>      <LibraryClasses>
> -      !if gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport =3D=3D FALSE
> +      !if gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport
> =3D=3D FALSE
>=20
> BoardAcpiTableLib|$(PROJECT)/Library/BoardAcpiLib/DxeBoardAcpiTableLib.i
> nf
>        !else
>=20
> NULL|$(PROJECT)/Library/BoardAcpiLib/DxeMultiBoardAcpiSupportLib.inf
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.d
> sc
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.d
> sc
> index 15d05bea43..34cc731313 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.d
> sc
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkgPcd.d
> sc
> @@ -186,8 +186,8 @@
>    ######################################
>    # Board Configuration
>    ######################################
> -  gBoardModuleTokenSpaceGuid.PcdMultiBoardSupport|TRUE
> -  gBoardModuleTokenSpaceGuid.PcdTbtEnable|FALSE
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMultiBoardSupport|TRUE
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable|FALSE
>=20
>  [PcdsFixedAtBuild.common]
>    ######################################
> @@ -394,34 +394,34 @@
>    ######################################
>=20
>    # Thunderbolt Configuration
> -  gBoardModuleTokenSpaceGuid.PcdDTbtAcDcSwitch|0x0
> -  gBoardModuleTokenSpaceGuid.PcdDTbtAcpiGpeSignature|0
> -  gBoardModuleTokenSpaceGuid.PcdDTbtAcpiGpeSignaturePorting|0
> -  gBoardModuleTokenSpaceGuid.PcdDTbtAspm|0x0
> -
> gBoardModuleTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad|0x02010011
> -  gBoardModuleTokenSpaceGuid.PcdDTbtControllerEn|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtControllerType|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtForcepowerGpioPad|13
> -  gBoardModuleTokenSpaceGuid.PcdDTbtGpioAccessType|0x2
> -  gBoardModuleTokenSpaceGuid.PcdDTbtGpioLevel|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtHotNotify|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtHotSMI|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPcieExtraBusRsvd|56
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax|26
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemRsvd|100
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax|28
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemRsvd|100
> -  gBoardModuleTokenSpaceGuid.PcdDTbtPcieRpNumber|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtSecurityMode|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtSetClkReq|0x1
> -  gBoardModuleTokenSpaceGuid.PcdDTbtWakeupSupport|0x0
> -  gBoardModuleTokenSpaceGuid.PcdDTbtWin10Support|0x0
> -  gBoardModuleTokenSpaceGuid.PcdExpander|0x0
> -  gBoardModuleTokenSpaceGuid.PcdPchPcieRootPortHpe|0x00000001
> -  gBoardModuleTokenSpaceGuid.PcdRtd3Tbt|0x1
> -  gBoardModuleTokenSpaceGuid.PcdRtd3TbtClkReq|0x1
> -  gBoardModuleTokenSpaceGuid.PcdRtd3TbtClkReqDelay|0x0
> -  gBoardModuleTokenSpaceGuid.PcdRtd3TbtOffDelay|5000
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAcDcSwitch|0x0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAcpiGpeSignature|0
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAcpiGpeSignaturePorting|0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAspm|0x0
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad|0x02
> 010011
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtControllerEn|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtControllerType|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtForcepowerGpioPad|13
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpioAccessType|0x2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpioLevel|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotNotify|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotSMI|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieExtraBusRsvd|56
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax|26
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieMemRsvd|100
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax|28
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemRsvd|100
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieRpNumber|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtSecurityMode|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtSetClkReq|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtWakeupSupport|0x0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtWin10Support|0x0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdExpander|0x0
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPchPcieRootPortHpe|0x0000000
> 1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3Tbt|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtClkReq|0x1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtClkReqDelay|0x0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtOffDelay|5000
>=20
>  [PcdsDynamicHii.X64.DEFAULT]
>    ######################################
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Include/Fdf/FlashMapI
> nclude.fdf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Include/Fdf/FlashMapI
> nclude.fdf
> index e024dd127c..c7f314ffe4 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Include/Fdf/FlashMapI
> nclude.fdf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Include/Fdf/FlashMapI
> nclude.fdf
> @@ -24,8 +24,8 @@ SET
> gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingOffset =3D
> 0x0001E000
>  SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize
> =3D 0x00002000  #
>  SET gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset
> =3D 0x00020000  # Flash addr (0xFFA40000)
>  SET gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
> =3D 0x00020000  #
> -SET gBoardModuleTokenSpaceGuid.PcdFlashNvDebugMessageOffset
> =3D 0x00040000  # Flash addr (0xFFA60000)
> -SET gBoardModuleTokenSpaceGuid.PcdFlashNvDebugMessageSize
> =3D 0x00010000  #
> +SET
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdFlashNvDebugMessageOffset =3D
> 0x00040000  # Flash addr (0xFFA60000)
> +SET gKabylakeOpenBoardPkgTokenSpaceGuid.PcdFlashNvDebugMessageSize
> =3D 0x00010000  #
>  SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedOffset
> =3D 0x00050000  # Flash addr (0xFFA70000)
>  SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedSize
> =3D 0x00060000  #
>  SET gMinPlatformPkgTokenSpaceGuid.PcdFlashFvSecurityOffset
> =3D 0x000B0000  # Flash addr (0xFFAD0000)
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf
> index 56bb0edaad..c46f7a71e5 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf
> +++ b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/OpenBoardPkg.fdf
> @@ -133,8 +133,8 @@
> gMinPlatformPkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareOffset|gEfiMd
> eModulePkgTo
>=20
> gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|gEfiMd
> eModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize
>  #NV_FTW_SPARE
>=20
> -gBoardModuleTokenSpaceGuid.PcdFlashNvDebugMessageOffset|gBoardMo
> duleTokenSpaceGuid.PcdFlashNvDebugMessageSize
> -gBoardModuleTokenSpaceGuid.PcdFlashNvDebugMessageBase|gBoardMod
> uleTokenSpaceGuid.PcdFlashNvDebugMessageSize
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdFlashNvDebugMessageOffset|
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdFlashNvDebugMessageSize
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdFlashNvDebugMessageBase|gK
> abylakeOpenBoardPkgTokenSpaceGuid.PcdFlashNvDebugMessageSize
>  #DEBUG_MESSAGE_AREA
>=20
>=20
> gMinPlatformPkgTokenSpaceGuid.PcdFlashFvAdvancedOffset|gMinPlatformP
> kgTokenSpaceGuid.PcdFlashFvAdvancedSize
> @@ -621,7 +621,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 gKabylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
>  INF $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
>  !endif
>=20
> @@ -663,7 +663,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 gKabylakeOpenBoardPkgTokenSpaceGuid.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/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
> index 2b8eab36a1..c61b93db84 100644
> --- a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/OpenBoardPkg.fdf
> @@ -627,7 +627,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 gKabylakeOpenBoardPkgTokenSpaceGuid.PcdTbtEnable =3D=3D TRUE
>  INF $(PLATFORM_BOARD_PACKAGE)/Features/Tbt/TbtInit/Pei/PeiTbtInit.inf
>  !endif
>=20
> @@ -669,7 +669,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 gKabylakeOpenBoardPkgTokenSpaceGuid.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/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.i
> nf
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.i
> nf
> index 0eaf2fab49..7d2e105e54 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.i
> nf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Acpi/BoardAcpiDxe/BoardAcpiDxe.i
> nf
> @@ -1,7 +1,7 @@
>  ### @file
>  #  Component information file for AcpiPlatform module
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -50,14 +50,14 @@
>    gEfiGlobalNvsAreaProtocolGuid
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdAcpiGnvsAddress
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiGnvsAddress
>=20
> -  gBoardModuleTokenSpaceGuid.PcdAcpiSleepState
> -  gBoardModuleTokenSpaceGuid.PcdAcpiHibernate
> -  gBoardModuleTokenSpaceGuid.PcdLowPowerS0Idle
> -  gBoardModuleTokenSpaceGuid.PcdDisableActiveTripPoints
> -  gBoardModuleTokenSpaceGuid.PcdDisablePassiveTripPoints
> -  gBoardModuleTokenSpaceGuid.PcdDisableCriticalTripPoints
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiSleepState
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiHibernate
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDisableActiveTripPoints
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDisablePassiveTripPoints
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDisableCriticalTripPoints
>=20
>  [Depex]
>    gEfiAcpiTableProtocolGuid           AND
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
> index 4139721e5e..92e1425a3a 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/PciHotPlug/PciHotPlug.inf
> @@ -2,7 +2,7 @@
>  # This module will perform specific PCI-Express devices
>  # resource configuration.
>  #
> -# Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -54,7 +54,7 @@
>    gPcieRpConfigGuid                  ## CONSUMES
>=20
>  [Pcd]
> - gBoardModuleTokenSpaceGuid.PcdPchPcieRootPortHpe
> + gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPchPcieRootPortHpe
>=20
>  [Depex]
>    gDxeTbtPolicyProtocolGuid
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyL
> ib/DxeTbtPolicyLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyL
> ib/DxeTbtPolicyLib.inf
> index 931b1a3203..74bc98228e 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyL
> ib/DxeTbtPolicyLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/DxeTbtPolicyL
> ib/DxeTbtPolicyLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for Tbt functionality
>  #
> -# Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -33,25 +33,25 @@ HobLib
>    KabylakeSiliconPkg/SiPkg.dec
>=20
>  [Pcd]
> -gBoardModuleTokenSpaceGuid.PcdDTbtSecurityMode       ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtGpio5Filter        ## 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.PcdDTbtWin10Support       ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdRtd3TbtClkReqDelay     ## CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdRtd3TbtOffDelay        ## CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtPcieExtraBusRsvd   ## CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemRsvd        ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax  ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemRsvd       ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtPcieRpNumber       ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtSecurityMode       ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpio5Filter        ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtWakeupSupport      ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotSMI             ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotNotify          ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtSetClkReq          ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAspm               ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAcDcSwitch         ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3Tbt                ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtClkReq          ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtWin10Support       ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtClkReqDelay     ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtOffDelay        ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieExtraBusRsvd   ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieMemRsvd        ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax
> ## CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemRsvd       ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieRpNumber       ##
> CONSUMES
>=20
>=20
>  [Sources]
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTb
> tCommonLib/TbtCommonLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTb
> tCommonLib/TbtCommonLib.inf
> index ff1f7777ce..1f8bf1be2b 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTb
> tCommonLib/TbtCommonLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiDxeSmmTb
> tCommonLib/TbtCommonLib.inf
> @@ -1,7 +1,7 @@
>  ### @file
>  # Component information file for Tbt common library
>  #
> -# Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -38,25 +38,25 @@
>=20
>=20
>  [Pcd]
> -gBoardModuleTokenSpaceGuid.PcdDTbtSecurityMode           ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtGpio5Filter            ##
> 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.PcdDTbtWin10Support           ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdRtd3TbtClkReqDelay     ## CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdRtd3TbtOffDelay        ## CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtPcieExtraBusRsvd   ## CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemRsvd        ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax  ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemRsvd       ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtPcieRpNumber
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtSecurityMode       ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpio5Filter        ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtWakeupSupport      ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotSMI             ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtHotNotify          ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtSetClkReq          ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAspm               ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtAcDcSwitch         ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3Tbt                ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtClkReq          ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtWin10Support       ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtClkReqDelay     ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRtd3TbtOffDelay        ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieExtraBusRsvd   ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieMemRsvd        ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieMemAddrRngMax
> ## CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemRsvd       ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPciePMemAddrRngMax ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieRpNumber
>=20
>  [Sources]
>    TbtCommonLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLib.inf
> index 91cae945b8..58ccedf935 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/Library/PeiTbtPolicyLi
> b/PeiTbtPolicyLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component description file for Tbt policy
>  #
> -# Copyright (c) 2018, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2018 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -36,14 +36,14 @@ GpioLib
>    IntelSiliconPkg/IntelSiliconPkg.dec
>=20
>  [Pcd]
> -gBoardModuleTokenSpaceGuid.PcdDTbtControllerEn           ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtControllerType         ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtPcieRpNumber           ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtBootOn                 ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtUsbOn                  ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtGpio3ForcePwr          ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtGpio3ForcePwrDly       ##
> CONSUMES
> -gBoardModuleTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad    ##
> CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtControllerEn
> ## CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtControllerType
> ## CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtPcieRpNumber
> ## CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtBootOn
> ## CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtUsbOn
> ## CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpio3ForcePwr
> ## CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtGpio3ForcePwrDly
> ## CONSUMES
> +gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDTbtCioPlugEventGpioPad
> ## CONSUMES
>=20
>  [Sources]
>  PeiTbtPolicyLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm
> .inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm
> .inf
> index 8bc2f8729f..e6c185a4bd 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm
> .inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Features/Tbt/TbtInit/Smm/TbtSmm
> .inf
> @@ -43,11 +43,11 @@
>    KabylakeSiliconPkg/SiPkg.dec
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdSwSmiDTbtEnumerate ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSwSmiDTbtEnumerate ##
> CONSUMES
>=20
>  [FixedPcd]
>    gSiPkgTokenSpaceGuid.PcdAcpiBaseAddress       ## CONSUMES
> -
> +
>  [Sources]
>    TbtSmiHandler.h
>    TbtSmiHandler.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolic
> yNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolic
> yNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> index 13c12655f6..d2929118e5 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolic
> yNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/FspWrapper/Library/PeiSiliconPolic
> yNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> @@ -37,7 +37,7 @@
>=20
>  [Pcd]
>    # SPD Address Table
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/P
> eiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/P
> eiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> index 13c12655f6..d2929118e5 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/P
> eiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/P
> eiSiliconPolicyNotifyLib/PeiPreMemSiliconPolicyNotifyLib.inf
> @@ -37,7 +37,7 @@
>=20
>  [Pcd]
>    # SPD Address Table
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/P
> eiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/P
> eiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> index 41deee1c97..eb7fb82361 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/P
> eiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/FspWrapper/Library/P
> eiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> @@ -90,51 +90,51 @@
>    PeiLib
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor       ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget         ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap           ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram      ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdData
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdDataSize
> -  gBoardModuleTokenSpaceGuid.PcdMrcCaVrefConfig
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleavedControl
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleaved
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcCaVrefConfig
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleavedControl
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleaved
>=20
>    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress      ##
> CONSUMES
>    gSiPkgTokenSpaceGuid.PcdSerialIoUartDebugEnable        ##
> CONSUMES
>    gSiPkgTokenSpaceGuid.PcdSerialIoUartNumber             ##
> CONSUMES
>    gSiPkgTokenSpaceGuid.PcdSmmbaseSwSmi                   ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdSaDdrFreqLimit           ##
> CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSaDdrFreqLimit  ##
> CONSUMES
>=20
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Size
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
>=20
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2Size
>=20
> -  gBoardModuleTokenSpaceGuid.PcdHdaVerbTable
> -  gBoardModuleTokenSpaceGuid.PcdHdaVerbTable2
> -  gBoardModuleTokenSpaceGuid.PcdExtHdaVerbTable
> -  gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable1
> -  gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable2
> -  gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable3
> -  gBoardModuleTokenSpaceGuid.PcdDisplayAudioHdaVerbTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdExtHdaVerbTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDisplayAudioHdaVerbTable
>=20
> -  gBoardModuleTokenSpaceGuid.PcdAudioConnector
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAudioConnector
>=20
> -  gBoardModuleTokenSpaceGuid.PcdGraphicsVbtGuid
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGraphicsVbtGuid
>=20
>  [Guids]
>    gFspNonVolatileStorageHobGuid                 ## CONSUMES
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BasePlatformH
> ookLib/BasePlatformHookLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BasePlatformH
> ookLib/BasePlatformHookLib.inf
> index b985d23f80..1de10aa008 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BasePlatformH
> ookLib/BasePlatformHookLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BasePlatformH
> ookLib/BasePlatformHookLib.inf
> @@ -35,17 +35,17 @@
>    KabylakeSiliconPkg/SiPkg.dec
>=20
>  [Pcd]
> -  gSiPkgTokenSpaceGuid.PcdAcpiBaseAddress                      ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioIndexPort                ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioDataPort                 ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioIndexDefaultPort         ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioDataDefaultPort          ##
> CONSUMES
> +  gSiPkgTokenSpaceGuid.PcdAcpiBaseAddress
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioIndexPort
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioDataPort
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioIndexDefaultPort
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioDataDefaultPort
> ## CONSUMES
>=20
>  [FixedPcd]
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort        ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdSioBaseAddress                 ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdLpcIoDecodeRange
> ## CONSUMES
> -  gBoardModuleTokenSpaceGuid.PchLpcIoEnableDecoding            ##
> CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSioBaseAddress
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcIoDecodeRange
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PchLpcIoEnableDecoding
> ## CONSUMES
>=20
>  [Sources]
>    BasePlatformHookLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/
> DxeBoardAcpiTableLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/
> DxeBoardAcpiTableLib.inf
> index c527f3fc0e..a79bdcdbc6 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/
> DxeBoardAcpiTableLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/
> DxeBoardAcpiTableLib.inf
> @@ -35,11 +35,11 @@
>    KabylakeSiliconPkg/SiPkg.dec
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdPs2KbMsEnable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable
>    gMinPlatformPkgTokenSpaceGuid.PcdPciExpNative
>    gMinPlatformPkgTokenSpaceGuid.PcdNativeAspmEnable
>    gMinPlatformPkgTokenSpaceGuid.PcdLowPowerS0Idle
> -  gBoardModuleTokenSpaceGuid.PcdAcpiGnvsAddress
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiGnvsAddress
>=20
>  [Sources]
>    DxeGalagoPro3AcpiTableLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/
> DxeMultiBoardAcpiSupportLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/
> DxeMultiBoardAcpiSupportLib.inf
> index fba5053d47..db8ba7a822 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/
> DxeMultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/
> DxeMultiBoardAcpiSupportLib.inf
> @@ -36,11 +36,11 @@
>    KabylakeSiliconPkg/SiPkg.dec
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdPs2KbMsEnable
> -  gBoardModuleTokenSpaceGuid.PcdPciExpNative
> -  gBoardModuleTokenSpaceGuid.PcdNativeAspmEnable
> -  gBoardModuleTokenSpaceGuid.PcdLowPowerS0Idle
> -  gBoardModuleTokenSpaceGuid.PcdAcpiGnvsAddress
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiGnvsAddress
>=20
>  [Sources]
>    DxeGalagoPro3AcpiTableLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/S
> mmBoardAcpiEnableLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/
> SmmBoardAcpiEnableLib.inf
> index 36c4219bf8..8360d35e01 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/S
> mmBoardAcpiEnableLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/
> SmmBoardAcpiEnableLib.inf
> @@ -36,7 +36,7 @@
>    KabylakeSiliconPkg/SiPkg.dec
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdSmcExtSmiBitPosition   ##
> CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSmcExtSmiBitPosition   ##
> CONSUMES
>=20
>  [Protocols]
>=20
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/S
> mmMultiBoardAcpiSupportLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/
> SmmMultiBoardAcpiSupportLib.inf
> index ea15c7ffc2..7f8ad556e7 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/S
> mmMultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardAcpiLib/
> SmmMultiBoardAcpiSupportLib.inf
> @@ -37,7 +37,7 @@
>    KabylakeSiliconPkg/SiPkg.dec
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdSmcExtSmiBitPosition   ##
> CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSmcExtSmiBitPosition   ##
> CONSUMES
>=20
>  [Protocols]
>=20
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPostMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPostMemLib.inf
> index 8a57f1f6d0..0e7249bb13 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPostMemLib.inf
> @@ -40,14 +40,14 @@
>  [FixedPcd]
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableSize
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableTouchPanel
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableTouchPanel
>=20
> -  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable
> -  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTableSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTableSize
>=20
> -  gBoardModuleTokenSpaceGuid.PcdHdaVerbTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable
>=20
> -  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTable
> -  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTableSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTableSize
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPreMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPreMemLib.inf
> index 53e70310e4..cad057b416 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiBoardInitPreMemLib.inf
> @@ -37,95 +37,95 @@
>    PeiBoardInitPreMemLib.c
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort
>=20
>    # PCH-LP HSIO PTSS Table
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
>=20
>    # PCH-H HSIO PTSS Table
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
> +  #gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> +  #gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> +
> #gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> +
> #gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
>=20
>    # SA Misc Config
> -  gBoardModuleTokenSpaceGuid.PcdSaMiscUserBd
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMapSize
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdData
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdDataSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscUserBd
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMapSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize
>=20
>    # PEG Reset By GPIO
> -  gBoardModuleTokenSpaceGuid.PcdPcie0WakeGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstActive
> -  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableActive
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0WakeGpioNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstExpanderNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstGpioNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstActive
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableGpioNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableActive
>=20
>=20
>    # SPD Address Table
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3
>=20
>    # CA Vref Configuration
>=20
>    # Root Port Clock Info
> -  gBoardModuleTokenSpaceGuid.PcdRootPort0ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort4ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort5ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort7ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort8ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort9ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPortLanClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort0ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort4ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort5ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort7ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort8ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort9ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortLanClkInfo
>=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
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port0Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port1Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port2Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port3Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port4Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port5Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port6Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port7Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port8Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.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
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort4
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort5
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort6
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort7
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort8
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort9
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort10
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort11
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort12
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort13
>=20
>    # USB 3.0 Port Over Current Pin
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort0
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort1
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort2
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort3
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort4
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort5
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort4
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort5
>=20
>    # Misc
> -  gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent
>=20
>=20
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPostMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPostMemLib.inf
> index 19e8e0144c..2ea8b2fdb3 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPostMemLib.inf
> @@ -42,14 +42,14 @@
>  [FixedPcd]
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableSize
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableTouchPanel
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableTouchPanel
>=20
> -  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable
> -  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTableSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTableSize
>=20
> -  gBoardModuleTokenSpaceGuid.PcdHdaVerbTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable
>=20
> -  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTable
> -  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTableSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTableSize
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPreMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPreMemLib.inf
> index cba590b3e3..ccd385b354 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Library/BoardInitLib/P
> eiMultiBoardInitPreMemLib.inf
> @@ -39,92 +39,92 @@
>    PeiGalagoPro3Detect.c
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort
>=20
>    # PCH-LP HSIO PTSS Table
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
>=20
>    # SA Misc Config
> -  gBoardModuleTokenSpaceGuid.PcdSaMiscUserBd
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMapSize
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdData
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdDataSize
> -  gBoardModuleTokenSpaceGuid.PcdMrcCaVrefConfig
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleavedControl
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqPinsInterleaved
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscUserBd
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMapSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcCaVrefConfig
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleavedControl
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqPinsInterleaved
>=20
>    # PEG Reset By GPIO
> -  gBoardModuleTokenSpaceGuid.PcdPcie0WakeGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstActive
> -  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableActive
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0WakeGpioNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstExpanderNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstGpioNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstActive
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableGpioNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableActive
>=20
>=20
>    # SPD Address Table
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3
>=20
>    # CA Vref Configuration
>=20
>    # Root Port Clock Info
> -  gBoardModuleTokenSpaceGuid.PcdRootPort0ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort4ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort5ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort7ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort8ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort9ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPortLanClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort0ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort4ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort5ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort7ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort8ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort9ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortLanClkInfo
>=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
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port0Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port1Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port2Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port3Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port4Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port5Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port6Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port7Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port8Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.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
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort4
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort5
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort6
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort7
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort8
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort9
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort10
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort11
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort12
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort13
>=20
>    # USB 3.0 Port Over Current Pin
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort0
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort1
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort2
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort3
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort4
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort5
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort4
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort5
>=20
>    # Misc
> -  gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent
>=20
>=20
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilic
> onPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilic
> onPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> index c9b73fc2bb..d53641ceb7 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilic
> onPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/GalagoPro3/Policy/Library/DxeSilic
> onPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> @@ -32,8 +32,8 @@
>    DxeSaPolicyUpdate.c
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdIntelGopEnable
> -  gBoardModuleTokenSpaceGuid.PcdGraphicsVbtGuid
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdIntelGopEnable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGraphicsVbtGuid
>=20
>  [Protocols]
>    gEfiFirmwareVolume2ProtocolGuid               ## CONSUMES
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> index 7ce6fd8470..5391bbfde0 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/FspWrapper/Library/
> PeiSiliconPolicyUpdateLibFsp/PeiSiliconPolicyUpdateLibFsp.inf
> @@ -90,55 +90,55 @@
>    PeiLib
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor       ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget         ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap           ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram      ##
> CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
> ## CONSUMES
>=20
>    # SPD Address Table
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0    ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1    ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2    ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3    ##
> CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3
> ## CONSUMES
>=20
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdData
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdDataSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize
>=20
>    gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress      ##
> CONSUMES
>    gSiPkgTokenSpaceGuid.PcdSerialIoUartDebugEnable        ##
> CONSUMES
>    gSiPkgTokenSpaceGuid.PcdSerialIoUartNumber             ##
> CONSUMES
>    gSiPkgTokenSpaceGuid.PcdSmmbaseSwSmi                   ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdSaDdrFreqLimit           ##
> CONSUMES
> -
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSaDdrFreqLimit  ##
> CONSUMES
>=20
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Size
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
>=20
> -  gBoardModuleTokenSpaceGuid.PcdHdaVerbTable
> -  gBoardModuleTokenSpaceGuid.PcdHdaVerbTable2
> -  gBoardModuleTokenSpaceGuid.PcdExtHdaVerbTable
> -  gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable1
> -  gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable2
> -  gBoardModuleTokenSpaceGuid.PcdCommonHdaVerbTable3
> -  gBoardModuleTokenSpaceGuid.PcdDisplayAudioHdaVerbTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2Size
>=20
> -  gBoardModuleTokenSpaceGuid.PcdAudioConnector
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdExtHdaVerbTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdCommonHdaVerbTable3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdDisplayAudioHdaVerbTable
>=20
> -  gBoardModuleTokenSpaceGuid.PcdGraphicsVbtGuid
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAudioConnector
> +
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGraphicsVbtGuid
>=20
>  [Guids]
>    gFspNonVolatileStorageHobGuid                 ## CONSUMES
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatform
> HookLib/BasePlatformHookLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatfor
> mHookLib/BasePlatformHookLib.inf
> index e65c7a25c2..fde7083399 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatform
> HookLib/BasePlatformHookLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BasePlatfor
> mHookLib/BasePlatformHookLib.inf
> @@ -1,7 +1,7 @@
>  ### @file
>  # Platform Hook Library instance for SandyBridge Mobile/Desktop CRB.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -36,16 +36,16 @@
>=20
>  [Pcd]
>    gSiPkgTokenSpaceGuid.PcdAcpiBaseAddress
> ## CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioIndexPort                ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioDataPort                 ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioIndexDefaultPort         ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioDataDefaultPort          ##
> CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioIndexPort
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioDataPort
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioIndexDefaultPort
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioDataDefaultPort
> ## CONSUMES
>=20
>  [FixedPcd]
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort        ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdSioBaseAddress                 ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdLpcIoDecodeRange
> ## CONSUMES
> -  gBoardModuleTokenSpaceGuid.PchLpcIoEnableDecoding            ##
> CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSioBaseAddress
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcIoDecodeRange
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PchLpcIoEnableDecoding
> ## CONSUMES
>=20
>  [Sources]
>    BasePlatformHookLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeBoardAcpiTableLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeBoardAcpiTableLib.inf
> index dd971ef97a..7295b2d063 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeBoardAcpiTableLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeBoardAcpiTableLib.inf
> @@ -35,12 +35,12 @@
>    KabylakeSiliconPkg/SiPkg.dec
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdPs2KbMsEnable
> -  gBoardModuleTokenSpaceGuid.PcdPciExpNative
> -  gBoardModuleTokenSpaceGuid.PcdNativeAspmEnable
> -  gBoardModuleTokenSpaceGuid.PcdLowPowerS0Idle
> -  gBoardModuleTokenSpaceGuid.PcdAcpiGnvsAddress
> -
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiGnvsAddress
> +
>  [Sources]
>    DxeKabylakeRvp3AcpiTableLib.c
>    DxeBoardAcpiTableLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeMultiBoardAcpiSupportLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeMultiBoardAcpiSupportLib.inf
> index e0394214ee..e41e9b3b91 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /DxeMultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/DxeMultiBoardAcpiSupportLib.inf
> @@ -1,7 +1,7 @@
>  ### @file
>  # Platform Hook Library instance for SandyBridge Mobile/Desktop CRB.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -36,12 +36,12 @@
>    KabylakeSiliconPkg/SiPkg.dec
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdPs2KbMsEnable
> -  gBoardModuleTokenSpaceGuid.PcdPciExpNative
> -  gBoardModuleTokenSpaceGuid.PcdNativeAspmEnable
> -  gBoardModuleTokenSpaceGuid.PcdLowPowerS0Idle
> -  gBoardModuleTokenSpaceGuid.PcdAcpiGnvsAddress
> -
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPs2KbMsEnable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPciExpNative
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdNativeAspmEnable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLowPowerS0Idle
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdAcpiGnvsAddress
> +
>  [Sources]
>    DxeKabylakeRvp3AcpiTableLib.c
>    DxeMultiBoardAcpiSupportLib.c
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmBoardAcpiEnableLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmBoardAcpiEnableLib.inf
> index 32068b59d7..ecf3882270 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmBoardAcpiEnableLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmBoardAcpiEnableLib.inf
> @@ -1,7 +1,7 @@
>  ### @file
>  # Platform Hook Library instance for SandyBridge Mobile/Desktop CRB.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -36,8 +36,8 @@
>    KabylakeSiliconPkg/SiPkg.dec
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdSmcExtSmiBitPosition   ##
> CONSUMES
> -
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSmcExtSmiBitPosition   ##
> CONSUMES
> +
>  [Protocols]
>=20
>  [Sources]
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmMultiBoardAcpiSupportLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmMultiBoardAcpiSupportLib.inf
> index fad4230c85..cd19b3f605 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLib
> /SmmMultiBoardAcpiSupportLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardAcpiLi
> b/SmmMultiBoardAcpiSupportLib.inf
> @@ -1,7 +1,7 @@
>  ### @file
>  # Platform Hook Library instance for SandyBridge Mobile/Desktop CRB.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -37,8 +37,8 @@
>    KabylakeSiliconPkg/SiPkg.dec
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdSmcExtSmiBitPosition   ##
> CONSUMES
> -
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSmcExtSmiBitPosition   ##
> CONSUMES
> +
>  [Protocols]
>=20
>  [Sources]
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPostMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPostMemLib.inf
> index 108ee8f541..165ed97c7b 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPostMemLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component information file for KabylakeRvp3InitLib in PEI post memory
> phase.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -40,14 +40,14 @@
>  [FixedPcd]
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableSize
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableTouchPanel
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableTouchPanel
>=20
> -  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable
> -  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTableSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTableSize
>=20
> -  gBoardModuleTokenSpaceGuid.PcdHdaVerbTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable
>=20
> -  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTable
> -  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTableSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTableSize
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPreMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPreMemLib.inf
> index 7be1c180de..dd7f3c4fbb 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiBoardInitPreMemLib.inf
> @@ -39,95 +39,95 @@
>    PeiBoardInitPreMemLib.c
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort
>=20
>    # PCH-LP HSIO PTSS Table
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
>=20
>    # PCH-H HSIO PTSS Table
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
> +  #gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> +  #gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> +
> #gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> +
> #gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
>=20
>    # SA Misc Config
> -  gBoardModuleTokenSpaceGuid.PcdSaMiscUserBd
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMapSize
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdData
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdDataSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscUserBd
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMapSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize
>=20
>    # PEG Reset By GPIO
> -  gBoardModuleTokenSpaceGuid.PcdPcie0WakeGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstActive
> -  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableActive
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0WakeGpioNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstExpanderNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstGpioNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstActive
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableGpioNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableActive
>=20
>=20
>    # SPD Address Table
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3
>=20
>    # CA Vref Configuration
>=20
>    # Root Port Clock Info
> -  gBoardModuleTokenSpaceGuid.PcdRootPort0ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort4ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort5ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort7ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort8ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort9ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPortLanClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort0ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort4ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort5ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort7ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort8ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort9ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortLanClkInfo
>=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
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port0Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port1Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port2Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port3Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port4Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port5Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port6Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port7Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port8Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.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
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort4
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort5
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort6
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort7
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort8
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort9
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort10
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort11
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort12
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort13
>=20
>    # USB 3.0 Port Over Current Pin
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort0
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort1
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort2
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort3
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort4
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort5
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort4
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort5
>=20
>    # Misc
> -  gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent
>=20
>=20
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPostMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPostMemLib.inf
> index b118f9030a..43336d237f 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPostMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPostMemLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component information file for KabylakeRvp3InitLib in PEI post memory
> phase.
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -42,14 +42,14 @@
>  [FixedPcd]
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTable
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableSize
> -  gBoardModuleTokenSpaceGuid.PcdBoardGpioTableTouchPanel
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardGpioTableTouchPanel
>=20
> -  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTable
> -  gBoardModuleTokenSpaceGuid.PcdGpioExpanderTableSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGpioExpanderTableSize
>=20
> -  gBoardModuleTokenSpaceGuid.PcdHdaVerbTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdHdaVerbTable
>=20
> -  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTable
> -  gBoardModuleTokenSpaceGuid.PcdBoardUcmcGpioTableSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdBoardUcmcGpioTableSize
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPreMemLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPreMemLib.inf
> index 2d8d26d7a1..eee617e138 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib/
> PeiMultiBoardInitPreMemLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Library/BoardInitLib
> /PeiMultiBoardInitPreMemLib.inf
> @@ -37,99 +37,99 @@
>    PeiKabylakeRvp3InitPreMemLib.c
>    KabylakeRvp3HsioPtssTables.c
>    KabylakeRvp3SpdTable.c
> -  PeiMultiBoardInitPreMemLib.c
> +  PeiMultiBoardInitPreMemLib.c
>    PeiKabylakeRvp3Detect.c
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdLpcSioConfigDefaultPort
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdLpcSioConfigDefaultPort
>=20
>    # PCH-LP HSIO PTSS Table
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
>=20
>    # PCH-H HSIO PTSS Table
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> -  #gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
> +  #gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> +  #gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> +
> #gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> +
> #gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
>=20
>    # SA Misc Config
> -  gBoardModuleTokenSpaceGuid.PcdSaMiscUserBd
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMapSize
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdData
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdDataSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSaMiscUserBd
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMapSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2DramSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize
>=20
>    # PEG Reset By GPIO
> -  gBoardModuleTokenSpaceGuid.PcdPcie0WakeGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0HoldRstActive
> -  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableGpioNo
> -  gBoardModuleTokenSpaceGuid.PcdPcie0PwrEnableActive
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0WakeGpioNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstExpanderNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstGpioNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0HoldRstActive
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableExpanderNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableGpioNo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdPcie0PwrEnableActive
>=20
>=20
>    # SPD Address Table
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3
>=20
>    # CA Vref Configuration
>=20
>    # Root Port Clock Info
> -  gBoardModuleTokenSpaceGuid.PcdRootPort0ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort4ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort5ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort7ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort8ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPort9ClkInfo
> -  gBoardModuleTokenSpaceGuid.PcdRootPortLanClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort0ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort4ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort5ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort7ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort8ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPort9ClkInfo
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdRootPortLanClkInfo
>=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
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port0Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port1Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port2Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port3Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port4Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port5Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port6Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port7Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20Port8Afe
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.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
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort4
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort5
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort6
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort7
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort8
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort9
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort10
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort11
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort12
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb20OverCurrentPinPort13
>=20
>    # USB 3.0 Port Over Current Pin
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort0
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort1
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort2
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort3
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort4
> -  gBoardModuleTokenSpaceGuid.PcdUsb30OverCurrentPinPort5
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort4
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUsb30OverCurrentPinPort5
>=20
>    # Misc
> -  gBoardModuleTokenSpaceGuid.PcdIoExpanderPresent
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdIoExpanderPresent
>=20
>=20
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSili
> conPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSil
> iconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> index ad12b027a5..4b4f4c4288 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSili
> conPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/DxeSil
> iconPolicyUpdateLib/DxeSiliconPolicyUpdateLib.inf
> @@ -1,7 +1,7 @@
>  ## @file
>  # Component information file for Silicon Update Library
>  #
> -# Copyright (c) 2017, Intel Corporation. All rights reserved.<BR>
> +# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
>  #
>  # SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -32,8 +32,8 @@
>    DxeSaPolicyUpdate.c
>=20
>  [Pcd]
> -  gBoardModuleTokenSpaceGuid.PcdIntelGopEnable
> -  gBoardModuleTokenSpaceGuid.PcdGraphicsVbtGuid
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdIntelGopEnable
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGraphicsVbtGuid
>=20
>  [Protocols]
>    gEfiFirmwareVolume2ProtocolGuid               ## CONSUMES
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSili
> conPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSili
> conPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf
> index aa163ebf08..a9d01c46bb 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSili
> conPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/KabylakeRvp3/Policy/Library/PeiSili
> conPolicyUpdateLib/PeiSiliconPolicyUpdateLib.inf
> @@ -53,34 +53,34 @@
>    gSiPkgTokenSpaceGuid.PcdPeiMinMemorySize
>    gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvBase
>    gSiPkgTokenSpaceGuid.PcdFlashMicrocodeFvSize
> -  gBoardModuleTokenSpaceGuid.PcdGraphicsVbtGuid
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompResistor       ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcRcompTarget         ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqByteMap           ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcDqsMapCpu2Dram      ##
> CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdData
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdDataSize
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdGraphicsVbtGuid
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompResistor
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcRcompTarget
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqByteMap
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcDqsMapCpu2Dram
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdData
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdDataSize
>=20
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable1Size
> +
> gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowLpHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable1Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificLpHsioPtssTable2Size
>=20
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable1
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable2
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable1Size
> -  gBoardModuleTokenSpaceGuid.PcdSpecificHHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable1Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdUnknowHHsioPtssTable2Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable1Size
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdSpecificHHsioPtssTable2Size
>=20
>    # SPD Address Table
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable0
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable1
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable2
> -  gBoardModuleTokenSpaceGuid.PcdMrcSpdAddressTable3
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable0
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable1
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable2
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdMrcSpdAddressTable3
> diff --git
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/Pe=
i
> SerialPortLibSpiFlash.inf
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/Pe
> iSerialPortLibSpiFlash.inf
> index ed93d0785f..31518fb40b 100644
> ---
> a/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/Pe=
i
> SerialPortLibSpiFlash.inf
> +++
> b/Platform/Intel/KabylakeOpenBoardPkg/Library/PeiSerialPortLibSpiFlash/Pe
> iSerialPortLibSpiFlash.inf
> @@ -46,5 +46,5 @@
>=20
>  [Pcd]
>    gMinPlatformPkgTokenSpaceGuid.PcdFlashAreaBaseAddress
> ## CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdFlashNvDebugMessageBase
> ## CONSUMES
> -  gBoardModuleTokenSpaceGuid.PcdFlashNvDebugMessageSize
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdFlashNvDebugMessageBase
> ## CONSUMES
> +  gKabylakeOpenBoardPkgTokenSpaceGuid.PcdFlashNvDebugMessageSize
> ## CONSUMES
> --
> 2.16.2.windows.1