[edk2-platforms][PATCH V1 3/5] WhitleyOpenBoardPkg: Fix GCC unused variables warnings


Oram, Isaac W
 

Removed build options to ignore no-discarded-qualifiers warnings.
Removed build option to ignore no-unused-variable warnings.
Fixed resulting build issues.

Cc: Nate DeSimone <nathaniel.l.desimone@...>
Cc: Chasel Chiu <chasel.chiu@...>
Signed-off-by: Isaac Oram <isaac.w.oram@...>
---
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 6 ++-
.../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 3 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 3 +-
.../Uba/TypeAowanda/Pei/PeiBoardInitLib.inf | 11 ++++
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 4 ++
.../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 1 +
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 1 +
.../Pei/PeiBoardInitLib.inf | 11 ++++
.../Pci/Dxe/PciPlatform/PciPlatform.inf | 1 +
.../Include/Dsc/BuildOptions.dsc | 2 +-
.../Include/Library/UbaAcpiUpdateLib.h | 2 -
.../Include/Library/UbaClkGenUpdateLib.h | 2 -
.../Include/Library/UbaGpioPlatformConfig.h | 4 --
.../Include/Library/UbaGpioUpdateLib.h | 2 -
.../Library/UbaHsioPtssTableConfigLib.h | 3 --
.../Include/Library/UbaIioConfigLib.h | 10 ----
.../Library/UbaIioPortBifurcationInitLib.h | 3 --
.../Include/Library/UbaOpromUpdateLib.h | 6 ---
.../Include/Library/UbaPcdUpdateLib.h | 2 -
.../Include/Library/UbaPchEarlyUpdateLib.h | 3 --
.../Include/Library/UbaSlotUpdateLib.h | 12 -----
.../Include/Library/UbaSoftStrapUpdateLib.h | 2 -
.../Library/UbaSystemConfigUpdateLib.h | 3 --
.../Include/Library/UbaUsbOcUpdateLib.h | 2 -
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 6 ++-
.../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 3 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 3 +-
.../TypeJunctionCity/Pei/PeiBoardInitLib.inf | 11 ++++
.../AcpiPlatformLibApic.c | 52 -------------------
.../MultiPlatSupportLib/MultiPlatSupportLib.c | 1 -
.../Library/PeiUbaPlatLib/PeiUbaPlatLib.inf | 21 ++++++++
.../Library/UbaPlatLib/UbaPlatLib.inf | 12 +++++
.../Intel/WhitleyOpenBoardPkg/PlatformPkg.dec | 29 +++++++++++
.../SystemConfigUpdateDxe.inf | 1 +
.../Common/Pei/PeiCommonBoardInitLib.inf | 9 ++++
.../StaticSkuDataDxe/StaticSkuDataDxe.inf | 1 +
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 4 ++
.../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 2 +
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 1 +
.../TypeCooperCityRP/Pei/PeiBoardInit.h | 11 ++--
.../TypeCooperCityRP/Pei/PeiBoardInitLib.c | 6 +++
.../TypeCooperCityRP/Pei/PeiBoardInitLib.inf | 11 ++++
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 6 ++-
.../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 3 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 3 +-
.../TypeWilsonCityRP/Pei/PeiBoardInitLib.inf | 11 ++++
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf | 4 ++
.../SlotDataUpdateDxe/SlotDataUpdateDxe.inf | 1 +
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf | 1 +
.../TypeWilsonCitySMT/Pei/PeiBoardInitLib.inf | 12 +++++
50 files changed, 197 insertions(+), 127 deletions(-)

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
index b9019018cb..6a43d21bab 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
@@ -38,6 +38,10 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gPlatformIioConfigDataDxeGuid
+ gPlatformIioConfigDataDxeGuid_1
+ gPlatformIioConfigDataDxeGuid_2
+ gPlatformIioConfigDataDxeGuid_3

[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
@@ -46,4 +50,4 @@
gUbaConfigDatabaseProtocolGuid

[Depex]
- gEfiPlatformTypeAowandaProtocolGuid
\ No newline at end of file
+ gEfiPlatformTypeAowandaProtocolGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
index 57b4647eab..2095b15434 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
@@ -38,6 +38,7 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gPlatformSlotDataDxeGuid

[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
@@ -46,4 +47,4 @@
gUbaConfigDatabaseProtocolGuid

[Depex]
- gEfiPlatformTypeAowandaProtocolGuid
\ No newline at end of file
+ gEfiPlatformTypeAowandaProtocolGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
index 22db2c0a6c..7c7a1c7a90 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
@@ -37,9 +37,10 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gDxePlatformUbaOcConfigDataGuid

[Protocols]
gUbaConfigDatabaseProtocolGuid

[Depex]
- gEfiPlatformTypeAowandaProtocolGuid
\ No newline at end of file
+ gEfiPlatformTypeAowandaProtocolGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PeiBoardInitLib.inf b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PeiBoardInitLib.inf
index 58ecfd7467..3d6f096a1d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PeiBoardInitLib.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PeiBoardInitLib.inf
@@ -162,6 +162,17 @@

[Guids]
gPlatformGpioInitDataGuid
+ gPlatformIioConfigDataGuid
+ gPlatformIioConfigDataGuid_1
+ gPlatformIioConfigDataGuid_2
+ gPlatformIioConfigDataGuid_3
+ gPlatformPcdConfigDataGuid
+ gPlatformPchEarlyConfigDataGuid
+ gPlatformSlotDataGuid
+ gPlatformSlotDataGuid2
+ gPlatformPciSlotImplementedGuid
+ gPlatformPchSoftStrapConfigDataGuid
+ gPeiPlatformUbaOcConfigDataGuid

[Depex]
gDynamicSiLibraryPpiGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
index fd19be6c13..4df0f55cd9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
@@ -36,6 +36,10 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gPlatformIioConfigDataDxeGuid
+ gPlatformIioConfigDataDxeGuid_1
+ gPlatformIioConfigDataDxeGuid_2
+ gPlatformIioConfigDataDxeGuid_3

[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
index 5cb0c87002..3fe0562fe9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
@@ -36,6 +36,7 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gPlatformSlotDataDxeGuid

[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
index 15208d8afc..2ff84f5406 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
@@ -36,6 +36,7 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gDxePlatformUbaOcConfigDataGuid

[Protocols]
gUbaConfigDatabaseProtocolGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PeiBoardInitLib.inf b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PeiBoardInitLib.inf
index 15fb9ef37d..fcc4b0f13c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PeiBoardInitLib.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PeiBoardInitLib.inf
@@ -161,6 +161,17 @@

[Guids]
gPlatformGpioInitDataGuid
+ gPlatformIioConfigDataGuid
+ gPlatformIioConfigDataGuid_1
+ gPlatformIioConfigDataGuid_2
+ gPlatformIioConfigDataGuid_3
+ gPlatformPcdConfigDataGuid
+ gPlatformPchEarlyConfigDataGuid
+ gPlatformSlotDataGuid
+ gPlatformSlotDataGuid2
+ gPlatformPciSlotImplementedGuid
+ gPlatformPchSoftStrapConfigDataGuid
+ gPeiPlatformUbaOcConfigDataGuid

[Depex]
gDynamicSiLibraryPpiGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatform.inf b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatform.inf
index cf5148b135..bcc71e0823 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatform.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatform.inf
@@ -66,6 +66,7 @@
gEfiSetupVariableGuid
gPchSetupVariableGuid
gSystemBoardInfoConfigDataGuid
+ gPlatformOptionRomUpdateConfigDataGuid

[Pcd]
gPlatformTokenSpaceGuid.PcdOemSkuPcieSlotOpromBitMap
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc
index ac05ea8ec5..590d2f67fe 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc
@@ -145,7 +145,7 @@ DEFINE EDKII_DSC_FEATURE_BUILD_OPTIONS = $(EDKII_DSC_FEATURE_BUILD_OPTIONS) $(ME
MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096

[BuildOptions]
- GCC:*_GCC5_*_CC_FLAGS = -Wno-discarded-qualifiers -Wno-unused-variable -Wno-unused-but-set-variable -mabi=ms
+ GCC:*_GCC5_*_CC_FLAGS = -Wno-unused-but-set-variable -mabi=ms
GCC:*_GCC5_IA32_DLINK_FLAGS = -z common-page-size=0x20 -z muldefs
GCC:*_GCC5_X64_DLINK_FLAGS = -z common-page-size=0x20 -z muldefs
MSFT:*_*_*_CC_FLAGS = /FAsc
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaAcpiUpdateLib.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaAcpiUpdateLib.h
index 291f687db3..1e1b4055c4 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaAcpiUpdateLib.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaAcpiUpdateLib.h
@@ -33,6 +33,4 @@ PlatformGetAcpiFixTableDataPointer (
IN VOID **TablePtr
);

-STATIC EFI_GUID gPlatformAcpiFixTableGuid = PLATFORM_ACPI_FIX_TABLE_GUID;
-
#endif //_PLATFORM_ACPI_UPDATE_LIB_H
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaClkGenUpdateLib.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaClkGenUpdateLib.h
index b5f97c9b1e..cd13c8c3d1 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaClkGenUpdateLib.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaClkGenUpdateLib.h
@@ -44,6 +44,4 @@ PlatformUpdateClockgen (
IN BOOLEAN EnableSpreadSpectrum
);

-STATIC EFI_GUID gPlatformClockgenConfigDataGuid = PLATFORM_CLOCKGEN_CONFIG_DATA_GUID;
-
#endif //_UBA_CLOCKGEN_UPDATE_LIB_H
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaGpioPlatformConfig.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaGpioPlatformConfig.h
index e227a75c94..08f54fc79b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaGpioPlatformConfig.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaGpioPlatformConfig.h
@@ -252,8 +252,4 @@ IsManufacturingMode (
VOID
);

-
-STATIC EFI_GUID gPlatformGpioPlatformConfigDataGuid = PLATFORM_GPIO_PLATFORM_CONFIG_DATA_GUID;
-
#endif //_UBA_GPIO_PLATFORM_CONFIG_LIB_H
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaGpioUpdateLib.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaGpioUpdateLib.h
index 72c3766908..dc7705a4b2 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaGpioUpdateLib.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaGpioUpdateLib.h
@@ -46,6 +46,4 @@ PlatformUpdateGpios (
VOID
);

-STATIC EFI_GUID gPlatformGpioConfigDataGuid = PLATFORM_GPIO_CONFIG_DATA_GUID;
-
#endif //_UBA_GPIO_UPDATE_LIB_H
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaHsioPtssTableConfigLib.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaHsioPtssTableConfigLib.h
index 49204ca2b1..fd6809df08 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaHsioPtssTableConfigLib.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaHsioPtssTableConfigLib.h
@@ -46,7 +46,4 @@ InstallPlatformHsioPtssTable (
IN OUT PCH_POLICY_PPI *PchPolicy
);

-STATIC EFI_GUID gPlatformHsioPtssTableGuid = PLATFORM_HSIO_PTSS_TABLE_GUID;
-
#endif //_UBA_HSIO_PTSS_TABLE_CONFIG_LIB_H
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaIioConfigLib.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaIioConfigLib.h
index dc47de6bd7..349d267e6c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaIioConfigLib.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaIioConfigLib.h
@@ -214,14 +214,4 @@ PlatformUpdateIioConfig_EX (
IN IIO_GLOBALS *IioGlobalData
);

-STATIC EFI_GUID gPlatformIioConfigDataGuid = PLATFORM_IIO_CONFIG_DATA_GUID;
-STATIC EFI_GUID gPlatformIioConfigDataGuid_1 = PLATFORM_IIO_CONFIG_DATA_GUID_1;
-STATIC EFI_GUID gPlatformIioConfigDataGuid_2 = PLATFORM_IIO_CONFIG_DATA_GUID_2;
-STATIC EFI_GUID gPlatformIioConfigDataGuid_3 = PLATFORM_IIO_CONFIG_DATA_GUID_3;
-
-STATIC EFI_GUID gPlatformIioConfigDataDxeGuid = PLATFORM_IIO_CONFIG_DATA_DXE_GUID;
-STATIC EFI_GUID gPlatformIioConfigDataDxeGuid_1 = PLATFORM_IIO_CONFIG_DATA_DXE_GUID_1;
-STATIC EFI_GUID gPlatformIioConfigDataDxeGuid_2 = PLATFORM_IIO_CONFIG_DATA_DXE_GUID_2;
-STATIC EFI_GUID gPlatformIioConfigDataDxeGuid_3 = PLATFORM_IIO_CONFIG_DATA_DXE_GUID_3;
-
#endif //_UBA_IIO_CONFIG_LIB_H
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaIioPortBifurcationInitLib.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaIioPortBifurcationInitLib.h
index 874be715f9..ca45012102 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaIioPortBifurcationInitLib.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaIioPortBifurcationInitLib.h
@@ -41,7 +41,4 @@ IioPortBifurcationInit (
IN IIO_GLOBALS *IioGlobalData
);

-STATIC EFI_GUID gIioPortBifurcationInitDataGuid = IIO_PORT_BIFURCATION_INIT_GUID;
-
#endif //_UBA_IIO_PORT_BIFURCATION_INIT_LIB_H
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaOpromUpdateLib.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaOpromUpdateLib.h
index 8984a70f9f..1f29220acc 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaOpromUpdateLib.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaOpromUpdateLib.h
@@ -20,12 +20,6 @@
#define PLATFORM_OPTION_ROM_UPDATE_SIGNATURE SIGNATURE_32 ('P', 'B', 'D', 'S')
#define PLATFORM_OPTION_ROM_UPDATE_VERSION 01

-
-// {371BD79C-DE79-4c5f-AA2B-BC9EBEFA988F}
-STATIC EFI_GUID gPlatformOptionRomUpdateConfigDataGuid =
-{ 0x371bd79c, 0xde79, 0x4c5f, { 0xaa, 0x2b, 0xbc, 0x9e, 0xbe, 0xfa, 0x98, 0x8f } };
-
-
typedef struct {
EFI_GUID FileName;
UINTN Segment;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaPcdUpdateLib.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaPcdUpdateLib.h
index 23e4c146b7..768b94ba5c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaPcdUpdateLib.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaPcdUpdateLib.h
@@ -39,6 +39,4 @@ PlatformUpdatePcds (
VOID
);

-STATIC EFI_GUID gPlatformPcdConfigDataGuid = PLATFORM_PCD_CONFIG_DATA_GUID;
-
#endif //_UBA_PCD_UPDATE_LIB_H
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaPchEarlyUpdateLib.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaPchEarlyUpdateLib.h
index f6bcd535cb..37ccd48712 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaPchEarlyUpdateLib.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaPchEarlyUpdateLib.h
@@ -57,7 +57,4 @@ PlatformInitLateHook (
IN SYSTEM_CONFIGURATION *SystemConfig
);

-
-STATIC EFI_GUID gPlatformPchEarlyConfigDataGuid = PLATFORM_PCH_EARLY_CONFIG_DATA_GUID;
-
#endif //_PLATFORM_PCH_EARLY_UPDATE_LIB_H
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaSlotUpdateLib.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaSlotUpdateLib.h
index 54272ae2d2..82ed3cad90 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaSlotUpdateLib.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaSlotUpdateLib.h
@@ -109,16 +109,4 @@ PlatformPchGetPciSlotImplementedTableData (
IN OUT UINT8 **SlotImplementedTable
);

-STATIC EFI_GUID gPlatformSlotDataGuid = PLATFORM_SLOT_DATA_GUID;
-STATIC EFI_GUID gPlatformSlotDataGuid2 = PLATFORM_SLOT_DATA_GUID2;
-STATIC EFI_GUID gPlatformSlotDataGuid2_1 = PLATFORM_SLOT_DATA_GUID2_1;
-
-
-STATIC EFI_GUID gPlatformSlotDataDxeGuid = PLATFORM_SLOT_DATA_DXE_GUID;
-STATIC EFI_GUID gPlatformSlotDataDxeGuid2 = PLATFORM_SLOT_DATA_DXE_GUID2;
-STATIC EFI_GUID gPlatformSlotDataDxeGuid2_1 = PLATFORM_SLOT_DATA_DXE_GUID2_1;
-
-STATIC EFI_GUID gPlatformPciSlotImplementedGuid = PLATFORM_PCI_SLOT_IMPLEMENTED_GUID;
-
-
#endif //_UBA_SLOT_UPDATE_LIB_H
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaSoftStrapUpdateLib.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaSoftStrapUpdateLib.h
index a790b7c55a..c306d31f1f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaSoftStrapUpdateLib.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaSoftStrapUpdateLib.h
@@ -21,8 +21,6 @@
#define PLATFORM_PCH_SOFTSTRAP_CONFIG_DATA_GUID \
{ 0xf06383fe, 0x54bd, 0x4ae1, { 0x9c, 0x99, 0x1d, 0xc8, 0x3b, 0x6a, 0x72, 0x77 } }

-STATIC EFI_GUID gPlatformPchSoftStrapConfigDataGuid = PLATFORM_PCH_SOFTSTRAP_CONFIG_DATA_GUID;
-
typedef struct _PLATFORM_PCH_SOFTSTRAP_FIXUP_ENTRY {
UINT8 SoftStrapNumber;
UINT8 BitfieldOffset;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaSystemConfigUpdateLib.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaSystemConfigUpdateLib.h
index fd8f30daee..b03b2ecdb5 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaSystemConfigUpdateLib.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaSystemConfigUpdateLib.h
@@ -18,9 +18,6 @@
#define SYSTEM_CONFIG_UPDATE_SIGNATURE SIGNATURE_32 ('S', 'C', 'O', 'N')
#define SYSTEM_CONFIG_UPDATE_VERSION 01

-STATIC EFI_GUID gSystemConfigUpdateDataGuid =
-{ 0x41037136, 0x8834, 0x4F35, { 0xBB, 0x10, 0x28, 0x0, 0x87, 0xAD, 0xB2, 0x22 } };
-
typedef
VOID
(*IIO_DEFAULT_CONFIG_UPDATE_CALLBACK) (
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaUsbOcUpdateLib.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaUsbOcUpdateLib.h
index 96cabc7dd8..9d3b683ba5 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaUsbOcUpdateLib.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Library/UbaUsbOcUpdateLib.h
@@ -45,7 +45,5 @@ PlatformGetUsbOcMappings (
IN OUT USB_OVERCURRENT_PIN **Usb30OverCurrentMappings,
IN OUT USB2_PHY_PARAMETERS **Usb20AfeParams
);
-STATIC EFI_GUID gPeiPlatformUbaOcConfigDataGuid = PEI_PLATFORM_USBOC_CONFIG_DATA_GUID;
-STATIC EFI_GUID gDxePlatformUbaOcConfigDataGuid = DXE_PLATFORM_USBOC_CONFIG_DATA_GUID;

#endif //_UBA_USBOC_UPDATE_LIB_H
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
index 3606611ef7..f9e2f3bbf9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
@@ -37,6 +37,10 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gPlatformIioConfigDataDxeGuid
+ gPlatformIioConfigDataDxeGuid_1
+ gPlatformIioConfigDataDxeGuid_2
+ gPlatformIioConfigDataDxeGuid_3

[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
@@ -45,4 +49,4 @@
gUbaConfigDatabaseProtocolGuid

[Depex]
- gEfiPlatformTypeJunctionCityProtocolGuid
\ No newline at end of file
+ gEfiPlatformTypeJunctionCityProtocolGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
index ebc688e7f8..2ca2c2cc46 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
@@ -37,6 +37,7 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gPlatformSlotDataDxeGuid

[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
@@ -45,4 +46,4 @@
gUbaConfigDatabaseProtocolGuid

[Depex]
- gEfiPlatformTypeJunctionCityProtocolGuid
\ No newline at end of file
+ gEfiPlatformTypeJunctionCityProtocolGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
index 11b8e4177a..2ea2111042 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
@@ -37,9 +37,10 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gDxePlatformUbaOcConfigDataGuid

[Protocols]
gUbaConfigDatabaseProtocolGuid

[Depex]
- gEfiPlatformTypeJunctionCityProtocolGuid
\ No newline at end of file
+ gEfiPlatformTypeJunctionCityProtocolGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PeiBoardInitLib.inf b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PeiBoardInitLib.inf
index d8189fa1dd..b60c46a45c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PeiBoardInitLib.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PeiBoardInitLib.inf
@@ -162,6 +162,17 @@

[Guids]
gPlatformGpioInitDataGuid
+ gPlatformIioConfigDataGuid
+ gPlatformIioConfigDataGuid_1
+ gPlatformIioConfigDataGuid_2
+ gPlatformIioConfigDataGuid_3
+ gPlatformPcdConfigDataGuid
+ gPlatformPchEarlyConfigDataGuid
+ gPlatformSlotDataGuid
+ gPlatformSlotDataGuid2
+ gPlatformPciSlotImplementedGuid
+ gPlatformPchSoftStrapConfigDataGuid
+ gPeiPlatformUbaOcConfigDataGuid

[Depex]
gDynamicSiLibraryPpiGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
index 0b22689f5a..358a527d93 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
@@ -44,58 +44,6 @@ typedef struct {
UINT32 GsiBase;
} IO_APIC_DESCRIPTOR;

-STATIC CONST IO_APIC_DESCRIPTOR IoApicDescList[] = {
- {PCH_IOAPIC, PCH_IOAPIC_ID, PCH_INTERRUPT_BASE},
- {PC00_IOAPIC, PC00_IOAPIC_ID, PC00_INTERRUPT_BASE},
- {PC01_IOAPIC, PC01_IOAPIC_ID, PC01_INTERRUPT_BASE},
- {PC02_IOAPIC, PC02_IOAPIC_ID, PC02_INTERRUPT_BASE},
- {PC03_IOAPIC, PC03_IOAPIC_ID, PC03_INTERRUPT_BASE},
- {PC04_IOAPIC, PC04_IOAPIC_ID, PC04_INTERRUPT_BASE},
- {PC05_IOAPIC, PC05_IOAPIC_ID, PC05_INTERRUPT_BASE},
- {PC06_IOAPIC, PC06_IOAPIC_ID, PC06_INTERRUPT_BASE},
- {PC07_IOAPIC, PC07_IOAPIC_ID, PC07_INTERRUPT_BASE},
- {PC08_IOAPIC, PC08_IOAPIC_ID, PC08_INTERRUPT_BASE},
- {PC09_IOAPIC, PC09_IOAPIC_ID, PC09_INTERRUPT_BASE},
- {PC10_IOAPIC, PC10_IOAPIC_ID, PC10_INTERRUPT_BASE},
- {PC11_IOAPIC, PC11_IOAPIC_ID, PC11_INTERRUPT_BASE},
- {PC12_IOAPIC, PC12_IOAPIC_ID, PC12_INTERRUPT_BASE},
- {PC13_IOAPIC, PC13_IOAPIC_ID, PC13_INTERRUPT_BASE},
- {PC14_IOAPIC, PC14_IOAPIC_ID, PC14_INTERRUPT_BASE},
- {PC15_IOAPIC, PC15_IOAPIC_ID, PC15_INTERRUPT_BASE},
- {PC16_IOAPIC, PC16_IOAPIC_ID, PC16_INTERRUPT_BASE},
- {PC17_IOAPIC, PC17_IOAPIC_ID, PC17_INTERRUPT_BASE},
- {PC18_IOAPIC, PC18_IOAPIC_ID, PC18_INTERRUPT_BASE},
- {PC19_IOAPIC, PC19_IOAPIC_ID, PC19_INTERRUPT_BASE},
- {PC20_IOAPIC, PC20_IOAPIC_ID, PC20_INTERRUPT_BASE},
- {PC21_IOAPIC, PC21_IOAPIC_ID, PC21_INTERRUPT_BASE},
- {PC22_IOAPIC, PC22_IOAPIC_ID, PC22_INTERRUPT_BASE},
- {PC23_IOAPIC, PC23_IOAPIC_ID, PC23_INTERRUPT_BASE},
- {PC24_IOAPIC, PC24_IOAPIC_ID, PC24_INTERRUPT_BASE},
- {PC25_IOAPIC, PC25_IOAPIC_ID, PC25_INTERRUPT_BASE},
- {PC26_IOAPIC, PC26_IOAPIC_ID, PC26_INTERRUPT_BASE},
- {PC27_IOAPIC, PC27_IOAPIC_ID, PC27_INTERRUPT_BASE},
- {PC28_IOAPIC, PC28_IOAPIC_ID, PC28_INTERRUPT_BASE},
- {PC29_IOAPIC, PC29_IOAPIC_ID, PC29_INTERRUPT_BASE},
- {PC30_IOAPIC, PC30_IOAPIC_ID, PC30_INTERRUPT_BASE},
- {PC31_IOAPIC, PC31_IOAPIC_ID, PC31_INTERRUPT_BASE},
- {PC32_IOAPIC, PC32_IOAPIC_ID, PC32_INTERRUPT_BASE},
- {PC33_IOAPIC, PC33_IOAPIC_ID, PC33_INTERRUPT_BASE},
- {PC34_IOAPIC, PC34_IOAPIC_ID, PC34_INTERRUPT_BASE},
- {PC35_IOAPIC, PC35_IOAPIC_ID, PC35_INTERRUPT_BASE},
- {PC36_IOAPIC, PC36_IOAPIC_ID, PC36_INTERRUPT_BASE},
- {PC37_IOAPIC, PC37_IOAPIC_ID, PC37_INTERRUPT_BASE},
- {PC38_IOAPIC, PC38_IOAPIC_ID, PC38_INTERRUPT_BASE},
- {PC39_IOAPIC, PC39_IOAPIC_ID, PC39_INTERRUPT_BASE},
- {PC40_IOAPIC, PC40_IOAPIC_ID, PC40_INTERRUPT_BASE},
- {PC41_IOAPIC, PC41_IOAPIC_ID, PC41_INTERRUPT_BASE},
- {PC42_IOAPIC, PC42_IOAPIC_ID, PC42_INTERRUPT_BASE},
- {PC43_IOAPIC, PC43_IOAPIC_ID, PC43_INTERRUPT_BASE},
- {PC44_IOAPIC, PC44_IOAPIC_ID, PC44_INTERRUPT_BASE},
- {PC45_IOAPIC, PC45_IOAPIC_ID, PC45_INTERRUPT_BASE},
- {PC46_IOAPIC, PC46_IOAPIC_ID, PC46_INTERRUPT_BASE},
- {PC47_IOAPIC, PC47_IOAPIC_ID, PC47_INTERRUPT_BASE}
-};
-
/**
Find OrderTable index which is matching input ApicId

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c
index 6b0eaa8def..7400886ef0 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c
@@ -46,7 +46,6 @@ VOID * FindDefaultHobinFfs (
IN UINT16 BoardId
)
{
- EFI_PEI_SERVICES **PeiServices;
UINTN FvInstance;
EFI_PEI_FV_HANDLE FvHandle;
EFI_PEI_FILE_HANDLE *FfsHandle;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaPlatLib.inf b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaPlatLib.inf
index 7154e72e73..ec2762ea90 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaPlatLib.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaPlatLib.inf
@@ -56,6 +56,27 @@
gDynamicSiLibraryPpiGuid ## ALWAYS_CONSUMES
gEfiPeiSmbus2PpiGuid ## ALWAYS_CONSUMES

+[Guids]
+ gPlatformClockgenConfigDataGuid
+ gPlatformGpioConfigDataGuid
+ gPlatformHsioPtssTableGuid
+ gPlatformIioConfigDataGuid
+ gPlatformIioConfigDataGuid_1
+ gPlatformIioConfigDataGuid_2
+ gPlatformIioConfigDataGuid_3
+ gPlatformPcdConfigDataGuid
+ gPlatformPchEarlyConfigDataGuid
+ gPlatformPchEarlyConfigDataGuid
+ gPlatformSlotDataGuid
+ gPlatformSlotDataGuid2
+ gPlatformSlotDataGuid2_1
+ gPlatformPciSlotImplementedGuid
+ gPlatformPchSoftStrapConfigDataGuid
+ gPlatformPchSoftStrapConfigDataGuid
+ gPeiPlatformUbaOcConfigDataGuid
+ gIioPortBifurcationInitDataGuid
+ gPlatformGpioPlatformConfigDataGuid
+
[Depex]
gUbaConfigDatabasePpiGuid AND
gDynamicSiLibraryPpiGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaPlatLib.inf b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaPlatLib.inf
index aa5f43a8b5..e28bd7828d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaPlatLib.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaPlatLib.inf
@@ -53,6 +53,18 @@
[Guids]
gEfiEndOfDxeEventGroupGuid
gSystemBoardInfoConfigDataGuid
+ gPlatformAcpiFixTableGuid
+ gDxePlatformUbaOcConfigDataGuid
+ gPlatformIioConfigDataDxeGuid
+ gPlatformIioConfigDataDxeGuid_1
+ gPlatformIioConfigDataDxeGuid_2
+ gPlatformIioConfigDataDxeGuid_3
+ gPlatformOptionRomUpdateConfigDataGuid
+ gPlatformSlotDataDxeGuid
+ gPlatformSlotDataDxeGuid2
+ gPlatformSlotDataDxeGuid2_1
+ gSystemConfigUpdateDataGuid
+ gPlatformGpioPlatformConfigDataGuid

[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec
index 7d8e0f34a1..f4e3a4857e 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec
+++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec
@@ -51,6 +51,35 @@
gPlatformKtiEparamUpdateDataGuid = { 0x7bc065cf, 0xafe8, 0x4396, { 0xae, 0x9f, 0xba, 0x27, 0xdf, 0xbe, 0xcf, 0x3d } }
gSmbiosTablesTokenSpaceGuid = { 0x5e80ad48, 0xf240, 0x4fe9, { 0x87, 0xef, 0x4b, 0x46, 0xf4, 0xde, 0x78, 0xa0 } }
gPlatformGpioInitDataGuid = { 0x9282563e, 0xae17, 0x4e12, { 0xb1, 0xdc, 0x7, 0xf, 0x29, 0xf3, 0x71, 0x20 } }
+ gPlatformAcpiFixTableGuid = { 0x81129ef8, 0x391d, 0x4f63, { 0xae, 0x99, 0x58, 0x51, 0x7e, 0xc0, 0x77, 0xe3 } }
+ gPlatformClockgenConfigDataGuid = { 0xcf3845b1, 0x7eb0, 0x44ef, { 0x9d, 0x67, 0xa8, 0xe, 0xce, 0x6f, 0xed, 0x73 } }
+ gPlatformGpioConfigDataGuid = { 0xe02c2982, 0x9, 0x46f6, { 0xaf, 0x19, 0xdf, 0x52, 0xbb, 0x97, 0x42, 0xbf } }
+ gPlatformHsioPtssTableGuid = { 0x47ea4ca7, 0xf89a, 0x42e6, { 0x89, 0xf0, 0x20, 0xf4, 0xb7, 0x2b, 0xa6, 0x16 } }
+ gPlatformIioConfigDataGuid = { 0xeb35ed63, 0xeaca, 0x4e29, { 0x95, 0x16, 0x7e, 0xdf, 0x1f, 0x81, 0x88, 0x37 } }
+ gPlatformIioConfigDataGuid_1 = { 0x3093f83b, 0x5934, 0x473e, { 0x85, 0x23, 0x24, 0xbf, 0x29, 0x7e, 0xe6, 0x84 } }
+ gPlatformIioConfigDataGuid_2 = { 0x1c5267a4, 0x634b, 0x4bf2, { 0xbf, 0xf8, 0x9a, 0x11, 0x64, 0xe6, 0xd1, 0x98 } }
+ gPlatformIioConfigDataGuid_3 = { 0x1e486cca, 0x48e, 0x4702, { 0xb2, 0x8c, 0xb, 0x67, 0x72, 0x1, 0x68, 0x3a } }
+ gPlatformIioConfigDataDxeGuid = { 0x6fe6c559, 0x4f35, 0x4111, { 0x98, 0xe1, 0x33, 0x2a, 0x25, 0x15, 0x12, 0xf3 } }
+ gPlatformIioConfigDataDxeGuid_1 = { 0xf722f2a, 0x650f, 0x448a, { 0xab, 0xb7, 0x4, 0xee, 0xcd, 0x75, 0xbb, 0x30 } }
+ gPlatformIioConfigDataDxeGuid_2 = { 0xebd11a00, 0x8c5c, 0x4f71, { 0xbb, 0x9e, 0x53, 0x94, 0x3, 0x2b, 0x1, 0xf4 } }
+ gPlatformIioConfigDataDxeGuid_3 = { 0x123bd082, 0x3201, 0x465c, { 0xb1, 0x39, 0xc, 0xb8, 0xc7, 0x72, 0x8, 0xf8 } }
+ gPlatformOptionRomUpdateConfigDataGuid = { 0x371bd79c, 0xde79, 0x4c5f, { 0xaa, 0x2b, 0xbc, 0x9e, 0xbe, 0xfa, 0x98, 0x8f } }
+ gPlatformPcdConfigDataGuid = { 0xd5081573, 0xb3b6, 0x4a1f, { 0x9f, 0xbc, 0xc3, 0xde, 0xda, 0x4, 0xcd, 0x49 } }
+ gPlatformPchEarlyConfigDataGuid = { 0x1763f1d2, 0x6a47, 0x43f8, { 0x82, 0x79, 0x37, 0x65, 0xa6, 0x92, 0x90, 0x60 } }
+ gPlatformSlotDataGuid = { 0xbe1cc570, 0x03fc, 0x4a44, { 0x80, 0x68, 0x5b, 0x6e, 0x36, 0xca, 0xeb, 0xb2 } }
+ gPlatformSlotDataGuid2 = { 0x226763ae, 0x972c, 0x4e3c, { 0x80, 0xd1, 0x73, 0xb2, 0x5e, 0x8c, 0xbb, 0xa3 } }
+ gPlatformSlotDataGuid2_1 = { 0x56f676d3, 0x24df, 0x4c77, { 0xa3, 0x36, 0x01, 0x9d, 0xae, 0x69, 0x35, 0x98 } }
+ gPlatformSlotDataDxeGuid = { 0xb93613e1, 0x48f0, 0x4b32, { 0xb3, 0xa8, 0x4f, 0xed, 0xfc, 0x7c, 0x13, 0x65 } }
+ gPlatformSlotDataDxeGuid2 = { 0x8185b70e, 0x9a20, 0x4fc4, { 0xa1, 0xd6, 0x77, 0xd5, 0x4a, 0x73, 0x65, 0x18 } }
+ gPlatformSlotDataDxeGuid2_1 = { 0xa87c540b, 0x3d69, 0x4c3b, { 0xb7, 0xf7, 0x63, 0x83, 0x58, 0x9c, 0x21, 0xce } }
+ gPlatformPciSlotImplementedGuid = { 0xb4cb70b3, 0x558d, 0x4478, { 0x84, 0xca, 0x22, 0x61, 0x60, 0x34, 0xea, 0x16 } }
+ gPlatformPchSoftStrapConfigDataGuid = { 0xf06383fe, 0x54bd, 0x4ae1, { 0x9c, 0x99, 0x1d, 0xc8, 0x3b, 0x6a, 0x72, 0x77 } }
+ gSystemConfigUpdateDataGuid = { 0x41037136, 0x8834, 0x4F35, { 0xBB, 0x10, 0x28, 0x0, 0x87, 0xAD, 0xB2, 0x22 } }
+ gPeiPlatformUbaOcConfigDataGuid = { 0x88238275, 0x5922, 0x46f6, { 0x9e, 0x35, 0x65, 0x6d, 0xf5, 0x5d, 0xf4, 0x4c } }
+ gDxePlatformUbaOcConfigDataGuid = { 0x2638009e, 0x3850, 0x4e4b, { 0xb0, 0x5d, 0x04, 0x2a, 0x32, 0xdb, 0xb9, 0xd1 } }
+ gIioPortBifurcationInitDataGuid = { 0x853e5958, 0xb3d6, 0x4d98, { 0xa7, 0x7c, 0x10, 0xb, 0xb4, 0xed, 0x94, 0xb } }
+ gPlatformGpioPlatformConfigDataGuid = { 0xd2c2adab, 0x80c0, 0x4a13, { 0xa0, 0xf8, 0xad, 0xed, 0xe1, 0xa5, 0x17, 0x40 } }
+
#
# UBA_END
#
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemConfigUpdateDxe/SystemConfigUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemConfigUpdateDxe/SystemConfigUpdateDxe.inf
index 3490dbef21..75ddf954f8 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemConfigUpdateDxe/SystemConfigUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemConfigUpdateDxe/SystemConfigUpdateDxe.inf
@@ -37,6 +37,7 @@

[Guids]
gEfiPlatformInfoGuid
+ gSystemConfigUpdateDataGuid

[Pcd]
gOemSkuTokenSpaceGuid.PcdOemSkuSubBoardID
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/PeiCommonBoardInitLib.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/PeiCommonBoardInitLib.inf
index a0e2f6056c..a9803fee19 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/PeiCommonBoardInitLib.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/PeiCommonBoardInitLib.inf
@@ -60,6 +60,15 @@
[Guids]
gPlatformKtiEparamUpdateDataGuid
gEfiPlatformInfoGuid
+ gPlatformHsioPtssTableGuid
+ gPlatformIioConfigDataGuid
+ gPlatformIioConfigDataGuid_1
+ gPlatformIioConfigDataGuid_2
+ gPlatformIioConfigDataGuid_3
+ gPlatformSlotDataGuid2
+ gPlatformSlotDataGuid2_1
+ gIioPortBifurcationInitDataGuid
+ gPlatformGpioPlatformConfigDataGuid

[Ppis]
gPchPlatformPolicyPpiGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.inf
index 2857479b4f..b9e865916f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.inf
@@ -50,6 +50,7 @@

[Guids]
gEfiPlatformInfoGuid
+ gPlatformAcpiFixTableGuid

[Protocols]
gUbaConfigDatabaseProtocolGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
index 3f7268b527..05c9b30b8b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
@@ -37,6 +37,10 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gPlatformIioConfigDataDxeGuid
+ gPlatformIioConfigDataDxeGuid_1
+ gPlatformIioConfigDataDxeGuid_2
+ gPlatformIioConfigDataDxeGuid_3

[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
index 77ba1697eb..001b703653 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
@@ -37,6 +37,8 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gPlatformSlotDataDxeGuid
+ gPlatformSlotDataGuid2

[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
index 87d5c3d711..0052d5cf6f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
@@ -36,6 +36,7 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gDxePlatformUbaOcConfigDataGuid

[Protocols]
gUbaConfigDatabaseProtocolGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInit.h b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInit.h
index 8cdc0cfb53..475d316b61 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInit.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInit.h
@@ -28,14 +28,9 @@
#define PLATFORM_CAPABILITY_4_SOCKET 2
#define PLATFORM_CAPABILITY_8_SOCKET 3

-STATIC CHAR8 *PlatformCapabilitiesStr[] = {
- "Unknown", // PLATFORM_CAPABILITY_UNDEFINED
- "2-Socket", // PLATFORM_CAPABILITY_2_SOCKET
- "4-Socket", // PLATFORM_CAPABILITY_4_SOCKET
- "8-Socket" // PLATFORM_CAPABILITY_8_SOCKET
-};
-
-//TypeCooperCityRP
+//
+// TypeCooperCityRP
+//
EFI_STATUS
GetPlatformCapabilitiesInfo (
IN OUT UINT8 *PlatformCapabilities,
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.c
index 03b9759636..2429b6fa24 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.c
@@ -22,6 +22,12 @@
#include <Library/PchMultiPchBase.h>
#include <Ppi/DynamicSiLibraryPpi.h>

+STATIC CHAR8 *PlatformCapabilitiesStr[] = {
+ "Unknown", // PLATFORM_CAPABILITY_UNDEFINED
+ "2-Socket", // PLATFORM_CAPABILITY_2_SOCKET
+ "4-Socket", // PLATFORM_CAPABILITY_4_SOCKET
+ "8-Socket" // PLATFORM_CAPABILITY_8_SOCKET
+};

/**

diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.inf
index 1d85e045c6..4b5f3257ed 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.inf
@@ -158,6 +158,17 @@

[Guids]
gPlatformGpioInitDataGuid
+ gPlatformIioConfigDataGuid
+ gPlatformIioConfigDataGuid_1
+ gPlatformIioConfigDataGuid_2
+ gPlatformIioConfigDataGuid_3
+ gPlatformPcdConfigDataGuid
+ gPlatformPchEarlyConfigDataGuid
+ gPlatformSlotDataGuid
+ gPlatformSlotDataGuid2
+ gPlatformPciSlotImplementedGuid
+ gPlatformPchSoftStrapConfigDataGuid
+ gPeiPlatformUbaOcConfigDataGuid

[Depex]
gDynamicSiLibraryPpiGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
index 82840c9a24..c78480487d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
@@ -36,6 +36,10 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gPlatformIioConfigDataDxeGuid
+ gPlatformIioConfigDataDxeGuid_1
+ gPlatformIioConfigDataDxeGuid_2
+ gPlatformIioConfigDataDxeGuid_3

[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
@@ -44,4 +48,4 @@
gUbaConfigDatabaseProtocolGuid

[Depex]
- gEfiPlatformTypeWilsonCityRPProtocolGuid
\ No newline at end of file
+ gEfiPlatformTypeWilsonCityRPProtocolGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
index a0e61e210f..a512bcc3f1 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
@@ -36,6 +36,7 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gPlatformSlotDataDxeGuid

[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
@@ -44,4 +45,4 @@
gUbaConfigDatabaseProtocolGuid

[Depex]
- gEfiPlatformTypeWilsonCityRPProtocolGuid
\ No newline at end of file
+ gEfiPlatformTypeWilsonCityRPProtocolGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
index 03b966cdfc..7c71edf768 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
@@ -36,9 +36,10 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gDxePlatformUbaOcConfigDataGuid

[Protocols]
gUbaConfigDatabaseProtocolGuid

[Depex]
- gEfiPlatformTypeWilsonCityRPProtocolGuid
\ No newline at end of file
+ gEfiPlatformTypeWilsonCityRPProtocolGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PeiBoardInitLib.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PeiBoardInitLib.inf
index 974831de89..3714a453cb 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PeiBoardInitLib.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PeiBoardInitLib.inf
@@ -161,6 +161,17 @@

[Guids]
gPlatformGpioInitDataGuid
+ gPlatformIioConfigDataGuid
+ gPlatformIioConfigDataGuid_1
+ gPlatformIioConfigDataGuid_2
+ gPlatformIioConfigDataGuid_3
+ gPlatformPcdConfigDataGuid
+ gPlatformPchEarlyConfigDataGuid
+ gPlatformSlotDataGuid
+ gPlatformSlotDataGuid2
+ gPlatformPciSlotImplementedGuid
+ gPlatformPchSoftStrapConfigDataGuid
+ gPeiPlatformUbaOcConfigDataGuid

[Depex]
gDynamicSiLibraryPpiGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
index b34810f76c..f7d05bf3e0 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.inf
@@ -37,6 +37,10 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gPlatformIioConfigDataDxeGuid
+ gPlatformIioConfigDataDxeGuid_1
+ gPlatformIioConfigDataDxeGuid_2
+ gPlatformIioConfigDataDxeGuid_3

[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
index 31c9eea5e3..94d3f408e9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.inf
@@ -37,6 +37,7 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gPlatformSlotDataDxeGuid

[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
index ef80d3ec56..5330b01c77 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.inf
@@ -36,6 +36,7 @@
WhitleyOpenBoardPkg/PlatformPkg.dec

[Guids]
+ gDxePlatformUbaOcConfigDataGuid

[Protocols]
gUbaConfigDatabaseProtocolGuid
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PeiBoardInitLib.inf b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PeiBoardInitLib.inf
index 240f7f82a8..1e5890c5c9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PeiBoardInitLib.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PeiBoardInitLib.inf
@@ -161,6 +161,18 @@

[Guids]
gPlatformGpioInitDataGuid
+ gPlatformIioConfigDataGuid
+ gPlatformIioConfigDataGuid_1
+ gPlatformIioConfigDataGuid_2
+ gPlatformIioConfigDataGuid_3
+ gPlatformPcdConfigDataGuid
+ gPlatformPcdConfigDataGuid
+ gPlatformPchEarlyConfigDataGuid
+ gPlatformSlotDataGuid
+ gPlatformSlotDataGuid2
+ gPlatformPciSlotImplementedGuid
+ gPlatformPchSoftStrapConfigDataGuid
+ gPeiPlatformUbaOcConfigDataGuid

[Depex]
gDynamicSiLibraryPpiGuid
--
2.36.1.windows.1