* [edk2-devel][edk2-platforms][PATCH V1 2/5] WhitleyOpenBoardPkg: Fix GCC warnings
2022-07-01 0:14 [edk2-devel][edk2-platforms][PATCH V1 0/5] Resolve GCC compilation warnings Oram, Isaac W
2022-07-01 0:14 ` [edk2-devel][edk2-platforms][PATCH V1 1/5] IpmiFeaturePkg/GenericIpmi: Fix " Oram, Isaac W
@ 2022-07-01 0:14 ` Oram, Isaac W
2022-07-01 0:14 ` [edk2-devel][edk2-platforms][PATCH V1 3/5] WhitleyOpenBoardPkg: Fix GCC unused variables warnings Oram, Isaac W
` (3 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Oram, Isaac W @ 2022-07-01 0:14 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Nate DeSimone, Chasel Chiu
Remove build option to ignore no-incompatible-pointer-types.
Remove build option to ignore no-overflow warnings.
Fixed resulting warnings as errors.
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
.../IpmiPlatformHookLib/IpmiPlatformHookLib.c | 2 +-
.../PeiPlatformHookLib/PeiPlatformHooklib.c | 2 +-
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +-
.../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +-
.../Aowanda/Uba/TypeAowanda/Pei/PcdData.c | 2 +-
.../Uba/TypeAowanda/Pei/PchEarlyUpdate.c | 2 +-
.../Uba/TypeAowanda/Pei/PeiBoardInitLib.c | 2 +-
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +-
.../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +-
.../Pei/PchEarlyUpdate.c | 4 +-
.../Pei/PeiBoardInitLib.c | 2 +-
.../Dxe/PlatformCpuPolicy/PlatformCpuPolicy.c | 4 +-
.../Features/Acpi/AcpiPlatform/AcpiPlatform.c | 22 +++++-----
.../Acpi/AcpiPlatform/AcpiPlatformHooks.c | 14 +++----
.../Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c | 30 ++++++-------
.../Pci/Dxe/PciHostBridge/PciHostBridge.c | 5 +--
.../Dxe/PciHostBridge/PciHostBridgeSupport.c | 2 +-
.../Pci/Dxe/PciHostBridge/PciRootBridgeIo.c | 5 +--
.../Pci/Dxe/PciPlatform/PciPlatform.c | 35 ++++++++--------
.../Pci/Dxe/PciPlatform/PciPlatformHooks.c | 16 +++----
.../WhitleyOpenBoardPkg/Include/Acpi/Fadt.h | 2 +-
.../Include/Dsc/BuildOptions.dsc | 2 +-
.../IpmiPlatformHookLib/IpmiPlatformHookLib.c | 2 +-
.../PeiPlatformHookLib/PeiPlatformHooklib.c | 2 +-
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +-
.../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +-
.../Uba/TypeJunctionCity/Pei/PchEarlyUpdate.c | 4 +-
.../TypeJunctionCity/Pei/PeiBoardInitLib.c | 4 +-
.../AcpiPlatformTableLib/AcpiPlatformLib.c | 16 +++----
.../AcpiPlatformLibApic.c | 2 +-
.../AcpiPlatformLibBdat.c | 12 +++---
.../AcpiPlatformLibHmat.c | 8 ++--
.../AcpiPlatformLibMsct.c | 2 +-
.../AcpiPlatformLibNfit.c | 2 +-
.../AcpiPlatformLibPcat.c | 2 +-
.../AcpiPlatformLibPmtt.c | 4 +-
.../AcpiPlatformLibSlit.c | 4 +-
.../AcpiPlatformLibSrat.c | 4 +-
.../AcpiPlatformLibSsdt.c | 2 +-
.../BoardAcpiLib/SmmBoardAcpiEnableLib.c | 6 +--
.../Library/BoardInitLib/BoardInitDxeLib.c | 6 +--
.../Library/BoardInitLib/BoardInitPreMemLib.c | 8 ++--
.../MultiPlatSupportLib/MultiPlatSupportLib.c | 42 ++++++++-----------
.../Library/PeiReportFvLib/PeiReportFvLib.c | 4 +-
.../PeiUbaGpioPlatformConfigLib.c | 22 +++++-----
.../PeiUbaPlatLib/PeiUbaUsbOcUpdateLib.c | 2 +-
.../PeiUbaPlatLib/UbaBoardSioInfoLib.c | 2 +-
.../PeiUbaPlatLib/UbaClkGenUpdateLib.c | 6 +--
.../PeiUbaPlatLib/UbaClocksConfigLib.c | 2 +-
.../Library/PeiUbaPlatLib/UbaGpioUpdateLib.c | 4 +-
.../PeiUbaPlatLib/UbaHsioPtssTableConfigLib.c | 2 +-
.../PeiUbaPlatLib/UbaIioConfigLibPei.c | 10 ++---
.../UbaIioPortBifurcationInitLib.c | 2 +-
.../Library/PeiUbaPlatLib/UbaPcdUpdateLib.c | 3 +-
.../PeiUbaPlatLib/UbaPchEarlyUpdateLib.c | 6 +--
.../PeiUbaPlatLib/UbaPchPcieBifurcationLib.c | 2 +-
.../PeiUbaPlatLib/UbaSlotUpdateLibPei.c | 6 +--
.../PeiUbaPlatLib/UbaSoftStrapUpdateLib.c | 5 +--
.../PlatformClocksLib/Pei/PlatformClocksLib.c | 17 ++------
.../Pei/PlatformClocksLib.inf | 2 +-
.../PlatformCmosAccessLib.c | 2 +-
.../Library/SetCacheMtrrLib/SetCacheMtrrLib.c | 8 ++--
.../PchPolicyUpdateUsb.c | 2 +-
.../SiliconPolicyUpdateLib.c | 2 +-
.../SiliconPolicyUpdateLibFsp.c | 2 +-
.../SmmSpiFlashCommonLib/SpiFlashCommon.c | 3 +-
.../Library/UbaGpioInitLib/UbaGpioInitLib.c | 6 +--
.../UbaPlatLib/DxeUbaGpioPlatformConfigLib.c | 4 +-
.../UbaPlatLib/DxeUbaSystemBoardInfoLib.c | 2 +-
.../UbaPlatLib/DxeUbaSystemConfigUpdateLib.c | 2 +-
.../Library/UbaPlatLib/DxeUbaUsbOcUpdateLib.c | 2 +-
.../Library/UbaPlatLib/UbaAcpiUpdateLib.c | 2 +-
.../Library/UbaPlatLib/UbaFpkConfigLib.c | 2 +-
.../Library/UbaPlatLib/UbaIioConfigLib.c | 4 +-
.../Library/UbaPlatLib/UbaOpromUpdateLib.c | 10 ++---
.../Library/UbaPlatLib/UbaSlotUpdateLib.c | 4 +-
.../Library/UbaPlatLib/UbaSmbiosUpdateLib.c | 16 +++----
.../Platform/Dxe/PlatformType/PlatformTypes.c | 5 +--
.../EmulationPlatformInit.c | 2 +-
.../Platform/Pei/PlatformInfo/PlatformInfo.c | 16 +++----
.../Uba/BoardInit/Dxe/BoardInitDxe.c | 2 +-
.../SystemBoardInfoDxe/SystemBoardInfoDxe.c | 2 +-
.../SystemConfigUpdateDxe.c | 4 +-
.../Uba/UbaMain/Common/Pei/ClocksConfig.c | 11 ++---
.../UbaMain/Common/Pei/GpioPlatformConfig.c | 4 +-
.../UbaMain/Common/Pei/HsioPtssTableConfig.c | 5 +--
.../UbaMain/Common/Pei/IioPortBifurcation.c | 7 ++--
.../Common/Pei/IioPortBifurcationVer1.c | 12 +++---
.../Common/Pei/PeiCommonBoardInitLib.c | 2 +-
.../StaticSkuDataDxe/StaticSkuDataDxe.c | 2 +-
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +-
.../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +-
.../UbaMain/TypeCooperCityRP/Pei/PcdData.c | 3 +-
.../TypeCooperCityRP/Pei/PchEarlyUpdate.c | 2 +-
.../TypeCooperCityRP/Pei/PeiBoardInitLib.c | 4 +-
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +-
.../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +-
.../TypeWilsonCityRP/Pei/PchEarlyUpdate.c | 4 +-
.../TypeWilsonCityRP/Pei/PeiBoardInitLib.c | 4 +-
.../Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c | 2 +-
.../Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c | 2 +-
.../Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c | 2 +-
.../UbaMain/TypeWilsonCitySMT/Pei/GpioTable.c | 2 +-
.../TypeWilsonCitySMT/Pei/PchEarlyUpdate.c | 6 +--
.../TypeWilsonCitySMT/Pei/PeiBoardInitLib.c | 2 +-
.../PeiInterposerToSvidMap.c | 9 ++--
.../FspWrapperPlatformLib.c | 2 +-
.../SiliconPolicyInitLibShim.c | 8 ++--
113 files changed, 283 insertions(+), 328 deletions(-)
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
index 0c06222c9a..cc63f4b8f3 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
@@ -35,7 +35,7 @@ PlatformIpmiIoRangeSet (
DEBUG ((DEBUG_INFO, "PlatformIpmiIoRangeSet IpmiIoBase %x\n", IpmiIoBase));
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "PeiServicesLocatePpi for gDynamicSiLibraryPpiGuid failed. Status %r\n", Status));
ASSERT_EFI_ERROR (Status);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/PeiPlatformHookLib/PeiPlatformHooklib.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
index 19d431f472..9686f77745 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
@@ -49,7 +49,7 @@ DisableMEDevices (
DEBUG ((DEBUG_INFO, "DisableMEDevices\n"));
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
index a37b40cd4c..e1b4a9993d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
@@ -57,7 +57,7 @@ IioCfgUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
index 4b235a0221..5a4e5e4c43 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
@@ -82,7 +82,7 @@ SlotDataUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
index dd9a069e7f..bae0c94c5b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
@@ -111,7 +111,7 @@ UsbOcUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PcdData.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PcdData.c
index 3c32e53e84..07fdb966fa 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PcdData.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PcdData.c
@@ -59,7 +59,7 @@ GpioGetRiserId (
DEBUG((EFI_D_INFO, "%a Entry...\n", __FUNCTION__));
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PchEarlyUpdate.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PchEarlyUpdate.c
index dc03e49cbd..27fe3987d2 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PchEarlyUpdate.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PchEarlyUpdate.c
@@ -65,7 +65,7 @@ TypeAowandaPchEarlyUpdate(
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PeiBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PeiBoardInitLib.c
index 0c76ee99b1..7a916f61a5 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PeiBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/PeiBoardInitLib.c
@@ -72,7 +72,7 @@ TypeAowandaPeiBoardInitLibConstructor (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
index 3f4297361a..72d1720575 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
@@ -57,7 +57,7 @@ IioCfgUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
index 581bc949d5..3316157e1f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
@@ -85,7 +85,7 @@ SlotDataUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
index 6bf6acede1..62f9e78c68 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
@@ -110,7 +110,7 @@ UsbOcUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PchEarlyUpdate.c b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PchEarlyUpdate.c
index 9f94360128..68649a7dde 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PchEarlyUpdate.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PchEarlyUpdate.c
@@ -24,7 +24,7 @@ TypeBoardPortTemplatePchLanConfig (
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
EFI_STATUS Status;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -75,7 +75,7 @@ TypeBoardPortTemplatePchEarlyUpdate(
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PeiBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PeiBoardInitLib.c
index 51a64084c7..55c7eed57c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PeiBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/PeiBoardInitLib.c
@@ -74,7 +74,7 @@ TypeBoardPortTemplatePeiBoardInitLibConstructor (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Cpu/Dxe/PlatformCpuPolicy/PlatformCpuPolicy.c b/Platform/Intel/WhitleyOpenBoardPkg/Cpu/Dxe/PlatformCpuPolicy/PlatformCpuPolicy.c
index 556dc1b0bf..d2a7b811dc 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Cpu/Dxe/PlatformCpuPolicy/PlatformCpuPolicy.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Cpu/Dxe/PlatformCpuPolicy/PlatformCpuPolicy.c
@@ -206,7 +206,7 @@ PlatformCpuPolicyEntryPoint (
CPU_VAR_DATA *CpuVarDataPtr = NULL;
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -666,7 +666,7 @@ PlatformCpuPolicyEntryPoint (
Status = gBS->LocateProtocol (
&gEfiPlatformTypeProtocolGuid,
NULL,
- &PlatformType
+ (VOID **) &PlatformType
);
ASSERT_EFI_ERROR (Status);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c
index 1648029bd1..8b461b07f7 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c
@@ -48,7 +48,7 @@ AcpiOnPciEnumCmplCallback (
{
EFI_STATUS Status;
- Status = gBS->LocateProtocol (&gEfiPciEnumerationCompleteProtocolGuid, NULL, &Context);
+ Status = gBS->LocateProtocol (&gEfiPciEnumerationCompleteProtocolGuid, NULL, (VOID **) &Context);
if (EFI_ERROR (Status)) {
//
// Skip the first dummy event signal.
@@ -202,7 +202,7 @@ AcpiOnReadyToBootCallback (
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -332,7 +332,7 @@ AcpiOnReadyToBootCallback (
Status = LocateSupportProtocol (
&gEfiAcpiTableProtocolGuid,
gEfiAcpiTableStorageGuid,
- &AcpiTable,
+ (VOID **) &AcpiTable,
FALSE
);
@@ -411,7 +411,7 @@ AcpiPlatformEarlyAcpiTablesInstall (
Status = LocateSupportProtocol (
&gEfiAcpiTableProtocolGuid,
gEfiAcpiTableStorageGuid,
- &AcpiTable,
+ (VOID **) &AcpiTable,
FALSE
);
@@ -423,7 +423,7 @@ AcpiPlatformEarlyAcpiTablesInstall (
Status = LocateSupportProtocol (
&gEfiFirmwareVolume2ProtocolGuid,
gEfiAcpiTableStorageGuid,
- &FwVol,
+ (VOID **) &FwVol,
TRUE
);
ASSERT_EFI_ERROR (Status);
@@ -442,7 +442,7 @@ AcpiPlatformEarlyAcpiTablesInstall (
&gEfiAcpiTableStorageGuid,
EFI_SECTION_RAW,
Instance,
- &CurrentTable,
+ (VOID **) &CurrentTable,
(UINTN *) &Size,
&FvStatus
);
@@ -557,7 +557,7 @@ PmSsdtEarlyAcpiTablesInstall (
Status = LocateSupportProtocol (
&gEfiAcpiTableProtocolGuid,
gEfiPmSsdtTableStorageGuid,
- &AcpiTable,
+ (VOID **) &AcpiTable,
FALSE
);
@@ -569,7 +569,7 @@ PmSsdtEarlyAcpiTablesInstall (
Status = LocateSupportProtocol (
&gEfiFirmwareVolume2ProtocolGuid,
gEfiPmSsdtTableStorageGuid,
- &FwVol,
+ (VOID **) &FwVol,
TRUE
);
ASSERT_EFI_ERROR (Status);
@@ -588,7 +588,7 @@ PmSsdtEarlyAcpiTablesInstall (
&gEfiPmSsdtTableStorageGuid,
EFI_SECTION_RAW,
Instance,
- &CurrentTable,
+ (VOID **) &CurrentTable,
(UINTN *) &Size,
&FvStatus
);
@@ -658,7 +658,7 @@ AcpiPlatformEntryPoint (
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -673,7 +673,7 @@ AcpiPlatformEntryPoint (
(EFI_SOFTWARE_DXE_CORE | EFI_SW_DXE_BS_ACPI_INIT)
);
- Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid, NULL, &mIioUds2);
+ Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid, NULL, (VOID **) &mIioUds2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c
index 93f312a178..141e719ef3 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c
@@ -190,7 +190,7 @@ InstallAndPatchAcpiTable (
Status = LocateSupportProtocol (
&gEfiAcpiTableProtocolGuid,
gEfiAcpiTableStorageGuid,
- &AcpiTable,
+ (VOID **) &AcpiTable,
FALSE
);
ASSERT_EFI_ERROR (Status);
@@ -198,7 +198,7 @@ InstallAndPatchAcpiTable (
Status = LocateSupportProtocol (
&gEfiFirmwareVolume2ProtocolGuid,
gEfiAcpiTableStorageGuid,
- &FwVol,
+ (VOID **) &FwVol,
TRUE
);
ASSERT_EFI_ERROR (Status);
@@ -210,7 +210,7 @@ InstallAndPatchAcpiTable (
&gEfiAcpiTableStorageGuid,
EFI_SECTION_RAW,
Instance,
- &CurrentTable,
+ (VOID **) &CurrentTable,
(UINTN *) &Size,
&FvStatus
);
@@ -294,7 +294,7 @@ InstallXhciAcpiTable (
Status = LocateSupportProtocol (
&gEfiAcpiTableProtocolGuid,
gEfiAcpiTableStorageGuid,
- &AcpiTable,
+ (VOID **) &AcpiTable,
FALSE
);
@@ -306,7 +306,7 @@ InstallXhciAcpiTable (
Status = LocateSupportProtocol (
&gEfiFirmwareVolume2ProtocolGuid,
gEfiAcpiTableStorageGuid,
- &FwVol,
+ (VOID **) &FwVol,
TRUE
);
@@ -321,7 +321,7 @@ InstallXhciAcpiTable (
&gEfiAcpiTableStorageGuid,
EFI_SECTION_RAW,
Instance,
- &CurrentTable,
+ (VOID **) &CurrentTable,
&Size,
&FvStatus
);
@@ -374,7 +374,7 @@ DetectHwpFeature (
EFI_STATUS Status;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return FALSE;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c
index a517a9adce..fb557e2ca6 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c
@@ -440,13 +440,13 @@ AcpiVtdIntRemappingEnable (
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
}
- Status = gBS->LocateProtocol (&gDmaRemapProtocolGuid, NULL, &DmaRemap);
+ Status = gBS->LocateProtocol (&gDmaRemapProtocolGuid, NULL, (VOID **) &DmaRemap);
if (EFI_ERROR (Status) || !DmaRemap->VTdSupport || !DmaRemap->InterruptRemap) {
DEBUG ((DEBUG_INFO, "[VTD] %a disabled\n",
@@ -472,7 +472,7 @@ AcpiVtdIntRemappingEnable (
//
// Allocate 4K alligned space for IRTE entries Added extra space of 500 bytes.
//
- Status = gBS->AllocatePool (EfiACPIReclaimMemory, IRTECount + 0x1500, &xApicAddr);
+ Status = gBS->AllocatePool (EfiACPIReclaimMemory, IRTECount + 0x1500, (VOID **) &xApicAddr);
ASSERT_EFI_ERROR (Status);
//
@@ -527,7 +527,7 @@ AcpiVtdIntRemappingEnable (
//
// Allocate memory for the queued invalidation.
//
- Status = gBS->AllocatePool (EfiACPIReclaimMemory, 0x1000 + 0x1000, &Addr);
+ Status = gBS->AllocatePool (EfiACPIReclaimMemory, 0x1000 + 0x1000, (VOID **) &Addr);
if (EFI_ERROR (Status)) {
ASSERT (FALSE);
return;
@@ -722,7 +722,7 @@ BuildDRHDForStack (
DMAR_ATSR *pAtsr = NULL;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return EFI_NOT_FOUND;
@@ -914,7 +914,7 @@ ReportDmar (
EFI_HANDLE *HandleBuffer;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return FALSE;
@@ -971,7 +971,7 @@ ReportDmar (
Status = gBS->HandleProtocol (
HandleBuffer[Index],
&gEfiPciRootBridgeIoProtocolGuid,
- &PciRootBridgePtr
+ (VOID **) &PciRootBridgePtr
);
ASSERT_EFI_ERROR (Status);
@@ -983,10 +983,10 @@ ReportDmar (
//
// Allocate memory to DevScope structures
//
- Status = gBS->AllocatePool (EfiACPIMemoryNVS, MEMORY_SIZE * sizeof (DEVICE_SCOPE), &DevScope);
+ Status = gBS->AllocatePool (EfiACPIMemoryNVS, MEMORY_SIZE * sizeof (DEVICE_SCOPE), (VOID **) &DevScope);
ASSERT_EFI_ERROR (Status);
- Status = gBS->AllocatePool (EfiACPIMemoryNVS, MEMORY_SIZE * sizeof (PCI_NODE), &PciNode);
+ Status = gBS->AllocatePool (EfiACPIMemoryNVS, MEMORY_SIZE * sizeof (PCI_NODE), (VOID **) &PciNode);
ASSERT_EFI_ERROR (Status);
for (Index = 1; Index <= MAX_SOCKET; Index++) {
@@ -1385,7 +1385,7 @@ AcpiVtdTablesInstall (
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return EFI_NOT_FOUND;
@@ -1422,7 +1422,7 @@ AcpiVtdTablesInstall (
for (Index = 0; Index < HandleCount; Index ++) {
- gBS->HandleProtocol (HandleBuffer[Index], &gEfiPciIoProtocolGuid, &PciIo);
+ gBS->HandleProtocol (HandleBuffer[Index], &gEfiPciIoProtocolGuid, (VOID **) &PciIo);
PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, 0, sizeof(PciConfigHeader) / sizeof(UINT32), &PciConfigHeader);
if ((PciConfigHeader.Hdr.ClassCode[0] == 0x00 || PciConfigHeader.Hdr.ClassCode[0] == 0x01) && PciConfigHeader.Hdr.ClassCode[1] == 0x04 && PciConfigHeader.Hdr.ClassCode[2] == 0x06) {
//
@@ -1520,18 +1520,18 @@ AcpiVtdTablesInstall (
//
// Find the AcpiSupport protocol
//
- Status = LocateSupportProtocol (&gEfiAcpiTableProtocolGuid, gEfiAcpiTableStorageGuid, &AcpiTable, FALSE);
+ Status = LocateSupportProtocol (&gEfiAcpiTableProtocolGuid, gEfiAcpiTableStorageGuid, (VOID **) &AcpiTable, FALSE);
ASSERT_EFI_ERROR (Status);
TableVersion = EFI_ACPI_TABLE_VERSION_2_0;
- Status = gBS->LocateProtocol (&gDmaRemapProtocolGuid, NULL, &DmaRemap);
+ Status = gBS->LocateProtocol (&gDmaRemapProtocolGuid, NULL, (VOID **) &DmaRemap);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "[ACPI](DMAR) ERROR: Cannot locate gDmaRemapProtocolGuid (%r)\n", Status));
} else {
if (DmaRemap->VTdSupport) {
ReportDmar (DmaRemap);
- Status = DmaRemap->GetDmarTable (DmaRemap, &CurrentTable);
+ Status = DmaRemap->GetDmarTable (DmaRemap, (VOID **) &CurrentTable);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
@@ -1700,7 +1700,7 @@ DisableAriForwarding (
gBS->HandleProtocol (
HandleBuffer[Index],
&gEfiPciIoProtocolGuid,
- &PciIo
+ (VOID **) &PciIo
);
PciIo->Pci.Read (
PciIo,
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridge.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridge.c
index a15fff4817..f09703b5af 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridge.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridge.c
@@ -86,7 +86,7 @@ IoMmuProtocolCallback (
{
EFI_STATUS Status;
- Status = gBS->LocateProtocol (&gEdkiiIoMmuProtocolGuid, NULL, (VOID **)&mIoMmu);
+ Status = gBS->LocateProtocol (&gEdkiiIoMmuProtocolGuid, NULL, (VOID **) &mIoMmu);
if (!EFI_ERROR(Status)) {
gBS->CloseEvent (mIoMmuEvent);
}
@@ -127,7 +127,7 @@ InitializePciHostBridge (
//
// Located the IIO Protocol Interface
//
- Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid, NULL, &mIioUds);
+ Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid, NULL, (VOID **) &mIioUds);
ASSERT_EFI_ERROR (Status);
//
@@ -1631,4 +1631,3 @@ Power2MaxMemory (
return Result;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridgeSupport.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridgeSupport.c
index fe3f274f1f..fcc9ba0672 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridgeSupport.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciHostBridgeSupport.c
@@ -47,7 +47,7 @@ ChipsetPreprocessController (
//
// Get root bridge in the system.
//
- Status = gBS->HandleProtocol (RootBridgeHandle, &gEfiPciRootBridgeIoProtocolGuid, &mPciRootBridgeIo);
+ Status = gBS->HandleProtocol (RootBridgeHandle, &gEfiPciRootBridgeIoProtocolGuid, (VOID **) &mPciRootBridgeIo);
ASSERT_EFI_ERROR (Status);
}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c
index ed5fb7e4a3..d00f9add95 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c
@@ -131,11 +131,11 @@ SimpleIioRootBridgeConstructor (
Status = gBS->LocateProtocol (
&gEfiCpuIo2ProtocolGuid,
NULL,
- &mCpuIo
+ (VOID **) &mCpuIo
);
ASSERT_EFI_ERROR (Status);
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &mDynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &mDynamicSiLibraryProtocol);
ASSERT_EFI_ERROR (Status);
return EFI_SUCCESS;
@@ -1661,4 +1661,3 @@ RootBridgeIoConfiguration (
*Resources = RootBridge->ConfigBuffer;
return EFI_SUCCESS;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatform.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatform.c
index 8584c0f330..2999b0326a 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatform.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatform.c
@@ -41,7 +41,7 @@ InternalPlatformCheckPcieRootPort (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
DEBUG ((DEBUG_INFO," InternalPlatformCheckPcieRootPort fail!\n"));
@@ -80,7 +80,7 @@ InternalGetSystemBoardInfo (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
@@ -148,11 +148,12 @@ GetPlatformPolicy (
**/
EFI_STATUS
-GetRawImage(
- IN EFI_GUID *NameGuid,
- IN OUT VOID **Buffer,
- IN OUT UINTN *Size
- ) {
+GetRawImage (
+ IN EFI_GUID *NameGuid,
+ IN OUT VOID **Buffer,
+ IN OUT UINTN *Size
+ )
+{
EFI_STATUS Status;
EFI_HANDLE *HandleBuffer;
UINTN HandleCount;
@@ -160,26 +161,26 @@ GetRawImage(
EFI_FIRMWARE_VOLUME2_PROTOCOL *Fv;
UINT32 AuthenticationStatus;
- Status = gBS->LocateHandleBuffer(
+ Status = gBS->LocateHandleBuffer (
ByProtocol,
&gEfiFirmwareVolume2ProtocolGuid,
NULL,
&HandleCount,
&HandleBuffer
);
- if (EFI_ERROR(Status) || HandleCount == 0) {
+ if (EFI_ERROR (Status) || HandleCount == 0) {
return EFI_NOT_FOUND;
}
//
// Find desired image in all Fvs
//
for (Index = 0; Index < HandleCount; Index++) {
- Status = gBS->HandleProtocol(
+ Status = gBS->HandleProtocol (
HandleBuffer[Index],
&gEfiFirmwareVolume2ProtocolGuid,
- &Fv
+ (VOID **) &Fv
);
- if (EFI_ERROR(Status)) {
+ if (EFI_ERROR (Status)) {
return EFI_LOAD_ERROR;
}
//
@@ -187,7 +188,7 @@ GetRawImage(
//
*Buffer = NULL;
*Size = 0;
- Status = Fv->ReadSection(
+ Status = Fv->ReadSection (
Fv,
NameGuid,
EFI_SECTION_RAW,
@@ -196,8 +197,8 @@ GetRawImage(
Size,
&AuthenticationStatus
);
- if (!EFI_ERROR(Status)) {
- DEBUG((EFI_D_INFO, "Read the OROM successfully!\n"));
+ if (!EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_INFO, "Read the OROM successfully!\n"));
break;
}
}
@@ -255,7 +256,7 @@ GetPciRom (
OpRomBase = NULL;
OpRomSize = 0;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -324,8 +325,6 @@ GetPciRom (
PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, PCI_VENDOR_ID_OFFSET, 1, &VendorId);
PciIo->Pci.Read (PciIo, EfiPciIoWidthUint16, PCI_DEVICE_ID_OFFSET, 1, &DeviceId);
- //DEBUG ((EFI_D_INFO, "GetPciRom - VenID:DevID: %04x:%04x\n", (UINTN)VendorId, (UINTN)DeviceId));
-
//
// Fix MS-HD5770 video adapter can not work:
// This device is not a OPROM 3.0 and does not have device id list as well.
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatformHooks.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatformHooks.c
index 89154cb6e1..42751a1013 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatformHooks.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciPlatform/PciPlatformHooks.c
@@ -245,7 +245,7 @@ PciPlatformInitPciIovData (
Status = gBS->LocateProtocol (
&gEfiPciIovPlatformProtocolGuid,
NULL,
- &gPciIovPlatformProtocol
+ (VOID **) &gPciIovPlatformProtocol
);
if (!EFI_ERROR (Status)) {
Status = gPciIovPlatformProtocol->GetSystemLowestPageSize (
@@ -363,7 +363,7 @@ AttemptToSetXhciMse (
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;
EFI_STATUS Status;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -419,7 +419,7 @@ PciPlatformPostInit (
// Program all the IOAPIC in system
//
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -660,7 +660,7 @@ PlatformPrepController (
);
ASSERT_EFI_ERROR (Status);
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -788,7 +788,7 @@ PhaseNotify (
DEBUG ((DEBUG_ERROR, "[PCI] ERROR: Unknown phase %d notified (execution %d)\n", Phase, ChipsetPhase));
}
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -813,14 +813,14 @@ PhaseNotify (
Status = gBS->LocateProtocol (
&gEfiIioUdsProtocolGuid,
NULL,
- &mIioUds
+ (VOID **) &mIioUds
);
ASSERT_EFI_ERROR (Status);
Status = gBS->LocateProtocol (
&gEfiCpuIo2ProtocolGuid,
NULL,
- &mPciPrivateData.CpuIo
+ (VOID **) &mPciPrivateData.CpuIo
);
ASSERT_EFI_ERROR (Status);
@@ -834,7 +834,7 @@ PhaseNotify (
Status = gBS->LocateProtocol (
&gEfiPciHostBridgeResourceAllocationProtocolGuid,
NULL,
- &HostResAllocPtr
+ (VOID **) &HostResAllocPtr
);
ASSERT_EFI_ERROR (Status);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Acpi/Fadt.h b/Platform/Intel/WhitleyOpenBoardPkg/Include/Acpi/Fadt.h
index 004aac350d..ebfd21b6cc 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Include/Acpi/Fadt.h
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Include/Acpi/Fadt.h
@@ -152,7 +152,7 @@ For Watson Creek we set this to 0 and then dynamically update this to 1 in the D
// Information
//
#define EFI_ACPI_GPE0_BLK_ADDRESS_SPACE_ID EFI_ACPI_6_2_SYSTEM_IO
-#define EFI_ACPI_GPE0_BLK_BIT_WIDTH 0x100 // size of R_PCH_ACPI_GPE0_STS_127_96 + R_PCH_ACPI_GPE0_EN_127_96 (2*0x80 = 0x100)
+#define EFI_ACPI_GPE0_BLK_BIT_WIDTH 0 // size of R_PCH_ACPI_GPE0_STS_127_96 + R_PCH_ACPI_GPE0_EN_127_96
#define EFI_ACPI_GPE0_BLK_BIT_OFFSET 0x00
#define EFI_ACPI_GPE0_BLK_ADDRESS (EFI_ACPI_PM1A_EVT_BLK_ADDRESS + 0x80)
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc
index 068ca195bf..ac05ea8ec5 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-overflow -Wno-discarded-qualifiers -Wno-unused-variable -Wno-unused-but-set-variable -Wno-incompatible-pointer-types -mabi=ms
+ GCC:*_GCC5_*_CC_FLAGS = -Wno-discarded-qualifiers -Wno-unused-variable -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/JunctionCity/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
index b69ea1ee92..45bb323938 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/IpmiPlatformHookLib/IpmiPlatformHookLib.c
@@ -35,7 +35,7 @@ PlatformIpmiIoRangeSet (
DEBUG ((DEBUG_INFO, "PlatformIpmiIoRangeSet IpmiIoBase %x\n", IpmiIoBase));
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "PeiServicesLocatePpi for gDynamicSiLibraryPpiGuid failed. Status %r\n", Status));
ASSERT_EFI_ERROR (Status);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/PeiPlatformHookLib/PeiPlatformHooklib.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
index 11657f777c..9e694bc189 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
@@ -49,7 +49,7 @@ DisableMEDevices (
DEBUG ((DEBUG_INFO, "DisableMEDevices\n"));
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
index d39f87a758..1f4b67cbd2 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
@@ -58,7 +58,7 @@ IioCfgUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
index f404bc3b9c..196021eebe 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
@@ -86,7 +86,7 @@ SlotDataUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
index 8bdb393553..2f0c4cb6e6 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
@@ -111,7 +111,7 @@ UsbOcUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PchEarlyUpdate.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PchEarlyUpdate.c
index 49c5d6c9ec..8a99f9140c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PchEarlyUpdate.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PchEarlyUpdate.c
@@ -25,7 +25,7 @@ TypeJunctionCityPchLanConfig (
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
EFI_STATUS Status;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -76,7 +76,7 @@ TypeJunctionCityPchEarlyUpdate(
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PeiBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PeiBoardInitLib.c
index 2287296881..87c49dac38 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PeiBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/PeiBoardInitLib.c
@@ -75,7 +75,7 @@ TypeJunctionCityPeiBoardInitLibConstructor (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -154,4 +154,4 @@ TypeJunctionCityPeiBoardInitLibConstructor (
}
}
return Status;
-}
\ No newline at end of file
+}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c
index f321c73a51..f3d4075880 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c
@@ -70,7 +70,7 @@ AcpiPlatformLibConstructor (
return RETURN_NOT_FOUND;
}
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -86,13 +86,13 @@ AcpiPlatformLibConstructor (
//
// Locate the IIO Protocol Interface
//
- Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid,NULL,&mIioUds);
+ Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid, NULL, (VOID **) &mIioUds);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
}
- Status = gBS->LocateProtocol (&gEfiCpuCsrAccessGuid, NULL, &mCpuCsrAccess);
+ Status = gBS->LocateProtocol (&gEfiCpuCsrAccessGuid, NULL, (VOID **) &mCpuCsrAccess);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -104,7 +104,7 @@ AcpiPlatformLibConstructor (
mMpService = NULL;
- Status = gBS->LocateProtocol (&gEfiMpServiceProtocolGuid, NULL, &mMpService);
+ Status = gBS->LocateProtocol (&gEfiMpServiceProtocolGuid, NULL, (VOID **) &mMpService);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -123,7 +123,7 @@ AcpiPlatformLibConstructor (
mNumberOfCPUs = MAX_CPU_NUM;
}
- Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, &mAcpiTable);
+ Status = gBS->LocateProtocol (&gEfiAcpiTableProtocolGuid, NULL, (VOID **) &mAcpiTable);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -211,7 +211,7 @@ AcpiPlatformHooksIsActiveTable (
}
if (TableHeader->Signature == NVDIMM_FW_INTERFACE_TABLE_SIGNATURE) {
- Status = gBS->LocateProtocol (&gEfiNfitTableUpdateProtocolGuid, NULL, &NfitTableUpdateProtocol);
+ Status = gBS->LocateProtocol (&gEfiNfitTableUpdateProtocolGuid, NULL, (VOID **) &NfitTableUpdateProtocol);
if (EFI_ERROR (Status)){
// If NfitTableUpdateProtocol is not found we assume no NVDIMM is present - it means don't publish NFIT
DEBUG ((DEBUG_ERROR, "NfitTableUpdateProtocol is not installed.\n"));
@@ -253,7 +253,7 @@ AcpiPlatformHooksIsActiveTable (
return EFI_UNSUPPORTED;
}
if ( (0 == CompareMem (&(TableHeader->OemTableId), OemSkuAcpiName, 8)) ) {
- Status = PlatformGetAcpiFixTableDataPointer (&mAmlOffsetTablePointer);
+ Status = PlatformGetAcpiFixTableDataPointer ((VOID ** ) &mAmlOffsetTablePointer);
if (!EFI_ERROR(Status)) {
DEBUG((DEBUG_INFO, "[ACPI] Platform DSDT Fixup table found\n"));
DEBUG((DEBUG_INFO, "[ACPI] Platform SRP: Using %a DSDT\n", OemSkuAcpiName));
@@ -311,7 +311,7 @@ PlatformUpdateTables (
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
index 0718e81682..0b22689f5a 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
@@ -578,7 +578,7 @@ InstallMadtFromScratch (
// Build IOAPIC Structures
//
if (mIioUds == NULL) {
- Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid,NULL,&mIioUds);
+ Status = gBS->LocateProtocol (&gEfiIioUdsProtocolGuid, NULL, (VOID **) &mIioUds);
ASSERT_EFI_ERROR (Status);
if (EFI_ERROR (Status)) {
goto Done;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibBdat.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibBdat.c
index 09464b4a11..295e6b440d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibBdat.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibBdat.c
@@ -188,7 +188,7 @@ GetNumberOfSchemasFromBssaHob (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return 0;
@@ -410,7 +410,7 @@ CopyBdatPointerToScratchPad5 (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -773,7 +773,7 @@ GetSpdDataSize (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return 0;
@@ -845,7 +845,7 @@ FillSpdPerDimmEntry (
DEBUG ((DEBUG_VERBOSE, "Fill Spd entry for Socket:%d Channel:%d Dimm:%d at location:0x%x \n", Socket, Channel, Dimm, Address));
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -909,7 +909,7 @@ FillSpdSchema (
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -1261,7 +1261,7 @@ IsSlowBoot (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return TRUE;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibHmat.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibHmat.c
index 277c956196..f0fe01a6cf 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibHmat.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibHmat.c
@@ -322,7 +322,7 @@ UpdateSmbiosHandles(
UINT8 SlotsPerImc = MAX_DIMM * MAX_MC_CH;
UINT8 DimmsPerImc = 0;
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, &Smbios);
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
if (EFI_ERROR (Status)) {
return ;
}
@@ -423,7 +423,7 @@ GetMemoryDomains (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -677,7 +677,7 @@ GetProcessorDomains (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -835,7 +835,7 @@ PatchHmatMsars (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibMsct.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibMsct.c
index 1755325d61..c1a9ff481f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibMsct.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibMsct.c
@@ -34,7 +34,7 @@ PatchMsctAcpiTable (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibNfit.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibNfit.c
index cc65d575c3..3c97b05133 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibNfit.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibNfit.c
@@ -32,7 +32,7 @@ UpdateNfitTable (
EFI_NFIT_TABLE_UPDATE_PROTOCOL *NfitTableUpdateProtocol = NULL;
EFI_STATUS Status;
- Status = gBS->LocateProtocol (&gEfiNfitTableUpdateProtocolGuid, NULL, &NfitTableUpdateProtocol);
+ Status = gBS->LocateProtocol (&gEfiNfitTableUpdateProtocolGuid, NULL, (VOID **) &NfitTableUpdateProtocol);
if (!EFI_ERROR (Status)) {
Status = NfitTableUpdateProtocol->UpdateAcpiTable ((UINT64*) Table);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPcat.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPcat.c
index 515e8ffd1d..9c3fb1c66c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPcat.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPcat.c
@@ -31,7 +31,7 @@ UpdatePcatTable (
EFI_STATUS Status;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPmtt.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPmtt.c
index dd9807c899..5e294fdf0f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPmtt.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibPmtt.c
@@ -58,7 +58,7 @@ PatchPlatformMemoryTopologyTable (
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -69,7 +69,7 @@ PatchPlatformMemoryTopologyTable (
ASSERT (PmttTable->Header.Signature == ACPI_PMTT_TABLE_SIGNATURE);
- Status = gBS->LocateProtocol (&gSmbiosMemInfoProtocolGuid, NULL, (VOID**)&SmbiosInfoProtocol);
+ Status = gBS->LocateProtocol (&gSmbiosMemInfoProtocolGuid, NULL, (VOID**) &SmbiosInfoProtocol);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "[ACPI] (PMTT) Cannot locate SmbiosMemInfoProtocol! (%r)\n", Status));
ASSERT_EFI_ERROR (Status);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c
index a8ac046aea..6976688c3f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c
@@ -189,7 +189,7 @@ GetPmemNodeCount (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return 0;
@@ -315,7 +315,7 @@ SocketsLinked (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return FALSE;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSrat.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSrat.c
index c19c942274..15dbdc14c4 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSrat.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSrat.c
@@ -208,7 +208,7 @@ ProximityDomainOf (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
}
@@ -291,7 +291,7 @@ PatchMemorySratEntries (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
index cb8b2b24be..4e53df2dd9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
@@ -62,7 +62,7 @@ DetectPcpsInfo (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PROTOCOL2 *DynamicSiLibraryProtocol2 = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, &DynamicSiLibraryProtocol2);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocol2Guid, NULL, (VOID **) &DynamicSiLibraryProtocol2);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
index 0f8a62460a..dc843b1002 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardAcpiLib/SmmBoardAcpiEnableLib.c
@@ -32,7 +32,7 @@ BoardEnableAcpi (
EFI_STATUS Status;
DYNAMIC_SI_LIBARY_SMM_PROTOCOL *DynamicSiLibrarySmmProtocol = NULL;
- Status = gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid, NULL, &DynamicSiLibrarySmmProtocol);
+ Status = gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid, NULL, (VOID**) &DynamicSiLibrarySmmProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -85,7 +85,7 @@ BoardDisableAcpi (
EFI_STATUS Status;
DYNAMIC_SI_LIBARY_SMM_PROTOCOL *DynamicSiLibrarySmmProtocol = NULL;
- Status = gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid, NULL, &DynamicSiLibrarySmmProtocol);
+ Status = gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid, NULL, (VOID**) &DynamicSiLibrarySmmProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -108,5 +108,3 @@ BoardDisableAcpi (
return EFI_SUCCESS;
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitDxeLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitDxeLib.c
index d31c9292a6..b6609c6e4b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitDxeLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitDxeLib.c
@@ -126,7 +126,7 @@ EnableAntiFlashWearout (
SYSTEM_CONFIGURATION SetupData;
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -185,7 +185,7 @@ BdsBoardBeforeConsoleAfterTrustedConsoleCallback (
Status = gBS->LocateProtocol (
&gEfiPciEnumerationCompleteProtocolGuid,
NULL,
- &Interface
+ (VOID **) &Interface
);
if (EFI_ERROR (Status)) {
ConnectRootBridge (FALSE);
@@ -209,7 +209,7 @@ BoardNotificationInit (
EFI_EVENT BeforeConsoleAfterTrustedConsoleEvent;
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitPreMemLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitPreMemLib.c
index 5c186ce862..f90166d339 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitPreMemLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitPreMemLib.c
@@ -86,7 +86,7 @@ EarlyPlatformPchInit (
DEBUG((DEBUG_INFO, "EarlyPlatformPchInit - Start\n"));
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -209,7 +209,7 @@ BoardInitBeforeMemoryInit (
EFI_STATUS Status;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -286,7 +286,7 @@ BoardInitAfterMemoryInit (
UINT16 Pm1Cnt;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -447,4 +447,4 @@ UpdatePlatformInfo (
ASSERT (PlatformInfo->MemData.MemTsegSize - PlatformInfo->MemData.MemIedSize >= 0x300000);
return EFI_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c
index 9f0af4b3e0..6b0eaa8def 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c
@@ -14,6 +14,7 @@
#include <Library/ReadFfsLib.h>
#include <Library/MemoryAllocationLib.h>
#include <Guid/AuthenticatedVariableFormat.h>
+#include <Library/PeiServicesLib.h>
//notes
@@ -47,7 +48,8 @@ VOID * FindDefaultHobinFfs (
{
EFI_PEI_SERVICES **PeiServices;
UINTN FvInstance;
- EFI_FIRMWARE_VOLUME_HEADER *FvHeader;
+ EFI_PEI_FV_HANDLE FvHandle;
+ EFI_PEI_FILE_HANDLE *FfsHandle;
EFI_FFS_FILE_HEADER *FfsHeader;
UINT32 FileSize;
EFI_COMMON_SECTION_HEADER *Section;
@@ -58,25 +60,18 @@ VOID * FindDefaultHobinFfs (
VARIABLE_STORE_HEADER *VarStoreHeader;
UINT32 FFSSize = 0;
-
-
- //
- // Get PeiService pointer
- //
- PeiServices = (EFI_PEI_SERVICES **)GetPeiServicesTablePointer ();
-
//
// Find the FFS file that stores all default data.
//
DefaultFileIsFound = FALSE;
FvInstance = 0;
- FfsHeader = NULL;
- while (((*PeiServices)->FfsFindNextVolume (PeiServices, FvInstance, &FvHeader) == EFI_SUCCESS) &&
- (!DefaultFileIsFound)) {
- FfsHeader = NULL;
- while ((*PeiServices)->FfsFindNextFile (PeiServices, EFI_FV_FILETYPE_FREEFORM, FvHeader, &FfsHeader) == EFI_SUCCESS) {
- if (CompareGuid ((EFI_GUID *) FfsHeader, &gDefaultDataFileGuid)) {
+ FfsHandle = NULL;
+ while ((PeiServicesFfsFindNextVolume (FvInstance, &FvHandle) == EFI_SUCCESS) && (!DefaultFileIsFound)) {
+ FfsHandle = NULL;
+ while (PeiServicesFfsFindNextFile (EFI_FV_FILETYPE_FREEFORM, FvHandle, FfsHandle) == EFI_SUCCESS) {
+ if (CompareGuid ((EFI_GUID *) FfsHandle, &gDefaultDataFileGuid)) {
DefaultFileIsFound = TRUE;
+ FfsHeader = (EFI_FFS_FILE_HEADER *) FfsHandle;
break;
}
}
@@ -87,17 +82,18 @@ VOID * FindDefaultHobinFfs (
// FFS file is not found.
//
if (!DefaultFileIsFound) {
-
- if(PcdGet32(PcdFailSafeVarFfsSize)!=0 ){
- //try to search other FVS
- FfsHeader = (EFI_FFS_FILE_HEADER *) AllocatePool(PcdGet32(PcdFailSafeVarFfsSize) );
- if(FfsHeader == NULL) {
+ if (PcdGet32 (PcdFailSafeVarFfsSize) != 0 ){
+ //
+ // try to search other FVS
+ //
+ FfsHeader = (EFI_FFS_FILE_HEADER *) AllocatePool (PcdGet32 (PcdFailSafeVarFfsSize));
+ if (FfsHeader == NULL) {
return NULL;
}
- if(EFI_SUCCESS != ReadFFSFile( (EFI_FIRMWARE_VOLUME_HEADER *) PcdGet32(PcdFailSafeVarFvBase), gDefaultDataFileGuid, 0, FfsHeader, &FFSSize, FALSE)) {
+ if (EFI_SUCCESS != ReadFFSFile ((EFI_FIRMWARE_VOLUME_HEADER *) PcdGet32 (PcdFailSafeVarFvBase), gDefaultDataFileGuid, 0, FfsHeader, &FFSSize, FALSE)) {
return NULL;
}
- ASSERT(PcdGet32(PcdFailSafeVarFfsSize) <FFSSize);
+ ASSERT (PcdGet32 (PcdFailSafeVarFfsSize) <FFSSize);
} else {
return NULL;
}
@@ -109,7 +105,7 @@ VOID * FindDefaultHobinFfs (
//
VarStoreHeader = NULL;
Section = (EFI_COMMON_SECTION_HEADER *)(FfsHeader + 1);
- FileSize = *(UINT32 *)(FfsHeader->Size) & 0x00FFFFFF;
+ FileSize = *(UINT32 *) (FfsHeader->Size) & 0x00FFFFFF;
while (((UINTN) Section < (UINTN) FfsHeader + FileSize) && (VarStoreHeader == NULL)) {
DefaultData = (DEFAULT_DATA *) (Section + 1);
DefaultInfo = &(DefaultData->DefaultInfo[0]);
@@ -251,5 +247,3 @@ Returns:
return EFI_SUCCESS;
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.c
index f0230642d2..5318251927 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiReportFvLib/PeiReportFvLib.c
@@ -32,7 +32,7 @@ ReportPreMemFv (
DEBUG_CODE (
for (Index = 0; Status == EFI_SUCCESS; Index++) {
- Status = PeiServicesLocatePpi (&gEfiPeiFirmwareVolumeInfo2PpiGuid, Index, &Descriptor, &Ppi);
+ Status = PeiServicesLocatePpi (&gEfiPeiFirmwareVolumeInfo2PpiGuid, Index, &Descriptor, (VOID**) &Ppi);
if (!EFI_ERROR (Status)) {
FvHeader = (EFI_FIRMWARE_VOLUME_HEADER*) Ppi->FvInfo;
DEBUG ((DEBUG_INFO, "Found FV at 0x%x, size 0x%x\n", FvHeader, FvHeader->FvLength));
@@ -141,7 +141,7 @@ ReportPostMemFv (
DEBUG_CODE (
for (Index = 0; Status == EFI_SUCCESS; Index++) {
- Status = PeiServicesLocatePpi (&gEfiPeiFirmwareVolumeInfo2PpiGuid, Index, &Descriptor, &Ppi);
+ Status = PeiServicesLocatePpi (&gEfiPeiFirmwareVolumeInfo2PpiGuid, Index, &Descriptor, (VOID**) &Ppi);
if (!EFI_ERROR (Status)) {
FvHeader = (EFI_FIRMWARE_VOLUME_HEADER*) Ppi->FvInfo;
DEBUG ((DEBUG_INFO, "Found FV at 0x%x, size 0x%x\n", FvHeader, FvHeader->FvLength));
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaGpioPlatformConfigLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaGpioPlatformConfigLib.c
index 6711de4fad..1ee7f4a326 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaGpioPlatformConfigLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaGpioPlatformConfigLib.c
@@ -43,7 +43,7 @@ PlatformGetGpioPlatformMappings (
UBA_CONFIG_DATABASE_PPI *UbaConfigPpi = NULL;
UINTN TableSize;
- Status = PeiServicesLocatePpi (&gUbaConfigDatabasePpiGuid, 0, NULL, &UbaConfigPpi);
+ Status = PeiServicesLocatePpi (&gUbaConfigDatabasePpiGuid, 0, NULL, (VOID **) &UbaConfigPpi);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -78,7 +78,7 @@ GpioGetFlashSecOvrdVal (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -117,7 +117,7 @@ GpioGetRcvPadVal (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -155,7 +155,7 @@ GpioGetFmAdrTriggerPadVal (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -193,7 +193,7 @@ GpioSetAdrEnablePadOutVal (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -235,7 +235,7 @@ GpioGetForcetoS1ConfigModePadVal (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -272,7 +272,7 @@ GpioGetQATPadVal (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -403,7 +403,7 @@ GpioGetBoardId0PadVal (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -441,7 +441,7 @@ GpioConfigForMFGMode (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -487,7 +487,7 @@ IsManufacturingMode (
PLATFORM_GPIO_CONFIG_TABLE GpioPlatformConfig;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return FALSE;
@@ -514,5 +514,3 @@ IsManufacturingMode (
return ManufacturingMode;
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaUsbOcUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaUsbOcUpdateLib.c
index 6dbf9eb7eb..39d45f7743 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaUsbOcUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/PeiUbaUsbOcUpdateLib.c
@@ -32,7 +32,7 @@ PlatformGetUsbOcMappings (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaBoardSioInfoLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaBoardSioInfoLib.c
index 86c2a6ff4e..fce5f12448 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaBoardSioInfoLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaBoardSioInfoLib.c
@@ -29,7 +29,7 @@ PlatformGetBoardSioInfo (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClkGenUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClkGenUpdateLib.c
index c0eb5df07a..6c295ed15c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClkGenUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClkGenUpdateLib.c
@@ -43,7 +43,7 @@ PlatformUpdateClockgen (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -53,7 +53,7 @@ PlatformUpdateClockgen (
&gEfiPeiSmbus2PpiGuid,
0,
NULL,
- &SmbusPpi
+ (VOID **) &SmbusPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -130,5 +130,3 @@ PlatformUpdateClockgen (
return Status;
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClocksConfigLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClocksConfigLib.c
index dd7873522c..20fdd38b32 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClocksConfigLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaClocksConfigLib.c
@@ -32,7 +32,7 @@ ConfigurePlatformClock (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaGpioUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaGpioUpdateLib.c
index 164302ba7b..883eafc295 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaGpioUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaGpioUpdateLib.c
@@ -36,7 +36,7 @@ PlatformUpdateGpios (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -64,5 +64,3 @@ PlatformUpdateGpios (
return Status;
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaHsioPtssTableConfigLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaHsioPtssTableConfigLib.c
index 35f67a013a..ada4d4e7ae 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaHsioPtssTableConfigLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaHsioPtssTableConfigLib.c
@@ -32,7 +32,7 @@ InstallPlatformHsioPtssTable (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioConfigLibPei.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioConfigLibPei.c
index e4ac30a962..4f4f2a3261 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioConfigLibPei.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioConfigLibPei.c
@@ -33,7 +33,7 @@ PlatformIioConfigInit (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -81,7 +81,7 @@ PlatformIioConfigInit2 (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -147,7 +147,7 @@ PlatformUpdateIioConfig (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -190,7 +190,7 @@ PlatformUpdateIioConfig_EX (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -216,4 +216,4 @@ PlatformUpdateIioConfig_EX (
}
return Status;
-}
\ No newline at end of file
+}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioPortBifurcationInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioPortBifurcationInitLib.c
index 41416adef1..b1b72fc000 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioPortBifurcationInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaIioPortBifurcationInitLib.c
@@ -28,7 +28,7 @@ IioPortBifurcationInit (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPcdUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPcdUpdateLib.c
index ce822faa2d..fa18cf5c49 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPcdUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPcdUpdateLib.c
@@ -41,7 +41,7 @@ PlatformUpdatePcds (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR (Status)) {
return Status;
@@ -66,4 +66,3 @@ PlatformUpdatePcds (
return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchEarlyUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchEarlyUpdateLib.c
index dc7a044729..9de4cc57c9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchEarlyUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchEarlyUpdateLib.c
@@ -34,7 +34,7 @@ PlatformPchLanConfig (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -75,7 +75,7 @@ PlatformInitLateHook (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -104,5 +104,3 @@ PlatformInitLateHook (
return Status;
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchPcieBifurcationLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchPcieBifurcationLib.c
index 53c913aa54..def5720ec9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchPcieBifurcationLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaPchPcieBifurcationLib.c
@@ -31,7 +31,7 @@ PlatformGetPchPcieBifurcationConfig (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSlotUpdateLibPei.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSlotUpdateLibPei.c
index 55ada7b3aa..af906b06f9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSlotUpdateLibPei.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSlotUpdateLibPei.c
@@ -32,7 +32,7 @@ PlatformGetSlotTableData (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -78,7 +78,7 @@ PlatformGetSlotTableData2 (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -129,7 +129,7 @@ PlatformPchGetPciSlotImplementedTableData (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- (VOID **)&UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSoftStrapUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSoftStrapUpdateLib.c
index a4042d2b37..69878960fb 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSoftStrapUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiUbaPlatLib/UbaSoftStrapUpdateLib.c
@@ -31,7 +31,7 @@ GetPchSoftSoftStrapTable (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -70,7 +70,7 @@ PlatformSpecificPchSoftStrapUpdate (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return;
@@ -92,4 +92,3 @@ PlatformSpecificPchSoftStrapUpdate (
PchSoftStrapUpdate.PchSoftStrapPlatformSpecificUpdate (FlashDescriptorCopy);
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.c
index 3cd48be906..d647ba1021 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.c
@@ -17,6 +17,7 @@
#include <Library/HobLib.h>
#include <Platform.h>
#include <Library/BaseMemoryLib.h>
+#include <Library/PeiServicesLib.h>
#define MAX_SMBUS_RETRIES 10
@@ -70,13 +71,7 @@ ConfigureClockGenerator (
//
// Locate SmBus Ppi
//
- Status = (**PeiServices).LocatePpi (
- PeiServices,
- &gEfiPeiSmbus2PpiGuid,
- 0,
- NULL,
- &SmbusPpi
- );
+ Status = PeiServicesLocatePpi (&gEfiPeiSmbus2PpiGuid, 0, NULL, (VOID** ) &SmbusPpi);
ASSERT_EFI_ERROR (Status);
//
@@ -264,13 +259,7 @@ ConfigureClockGeneratorOnSecondarySmbus (
//
// Locate Stall PPI
//
- Status = (**PeiServices).LocatePpi (
- PeiServices,
- &gEfiPeiStallPpiGuid,
- 0,
- NULL,
- &StallPpi
- );
+ Status = PeiServicesLocatePpi (&gEfiPeiStallPpiGuid, 0, NULL, (VOID** ) &StallPpi);
ASSERT_EFI_ERROR (Status);
//
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.inf b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.inf
index cbb5d53d98..ecc20dc41b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.inf
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformClocksLib/Pei/PlatformClocksLib.inf
@@ -27,6 +27,7 @@
[LibraryClasses]
DebugLib
HobLib
+ PeiServicesLib
[Protocols]
@@ -37,4 +38,3 @@
[FixedPcd]
gEfiCpRcPkgTokenSpaceGuid.PcdMaxCpuSocketCount
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformCmosAccessLib/PlatformCmosAccessLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformCmosAccessLib/PlatformCmosAccessLib.c
index 2169b3fadd..fbf7cbfe56 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformCmosAccessLib/PlatformCmosAccessLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformCmosAccessLib/PlatformCmosAccessLib.c
@@ -53,7 +53,7 @@ PlatformCmosGetNmiState (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return FALSE;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c
index b67dafd366..8ec6f467c9 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/SetCacheMtrrLib/SetCacheMtrrLib.c
@@ -278,7 +278,7 @@ PkgMpEnableMcaOnCacheableMmio(
EFI_STATUS Status;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -642,7 +642,7 @@ SetCacheMtrrAfterEndOfPei (
MemoryBase = BASE_1MB;
MemoryLength = LowUncableBase;
- Status = (*PeiServices)->GetHobList (PeiServices, &Hob.Raw);
+ Status = PeiServicesGetHobList ((VOID **) &Hob.Raw);
while (!END_OF_HOB_LIST (Hob)) {
if (Hob.Header->HobType == EFI_HOB_TYPE_RESOURCE_DESCRIPTOR) {
if ((Hob.ResourceDescriptor->ResourceType == EFI_RESOURCE_SYSTEM_MEMORY) ||
@@ -841,7 +841,7 @@ SetCacheMtrrAfterEndOfPei (
&gEfiPeiMpServicesPpiGuid,
0,
NULL,
- &mPeiMpServices
+ (VOID** ) &mPeiMpServices
);
if (BootMode != BOOT_ON_S3_RESUME) {
@@ -855,7 +855,7 @@ SetCacheMtrrAfterEndOfPei (
(EFI_AP_PROCEDURE)SetAllMtrrs,
FALSE,
0,
- (VOID*)&MtrrSettings
+ (VOID*) &MtrrSettings
);
}
}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c
index c4c5d9aaba..2227084d5e 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/PchPolicyUpdateUsb.c
@@ -52,7 +52,7 @@ Returns:
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
index 25a27eee39..d940a39133 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
@@ -265,7 +265,7 @@ Returns:
DEBUG((DEBUG_INFO, "platform common UpdatePeiPchPolicy entry\n"));
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLibFsp.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLibFsp.c
index f9fa6dfe64..f7e4ee5e2f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLibFsp.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLibFsp.c
@@ -267,7 +267,7 @@ Returns:
DEBUG((DEBUG_INFO, "platform common UpdatePeiPchPolicy entry\n"));
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
index d28b453580..204c9282f6 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/SmmSpiFlashCommonLib/SpiFlashCommon.c
@@ -43,7 +43,7 @@ SpiMemorySpaceCheckandEnable(
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_SMM_PROTOCOL *DynamicSiLibrarySmmProtocol = NULL;
- Status = gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid, NULL, &DynamicSiLibrarySmmProtocol);
+ Status = gSmst->SmmLocateProtocol (&gDynamicSiLibrarySmmProtocolGuid, NULL, (VOID**) &DynamicSiLibrarySmmProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -234,4 +234,3 @@ SpiFlashBlockErase (
);
return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaGpioInitLib/UbaGpioInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaGpioInitLib/UbaGpioInitLib.c
index 3fdcf2e18f..4cc69565c5 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaGpioInitLib/UbaGpioInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaGpioInitLib/UbaGpioInitLib.c
@@ -74,12 +74,12 @@ PlatformInitGpios (
VOID *HobPtr;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gUbaConfigDatabasePpiGuid, 0, NULL, &UbaConfigPpi);
+ Status = PeiServicesLocatePpi (&gUbaConfigDatabasePpiGuid, 0, NULL, (VOID **) &UbaConfigPpi);
if (EFI_ERROR (Status)) {
return Status;
}
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -87,7 +87,7 @@ PlatformInitGpios (
TableSize = PcdGet32(PcdOemSku_GPIO_TABLE_SIZE);
DEBUG ((DEBUG_INFO, "UBA:Size of GpioTable 0x%X, blocks: 0x%X.\n", TableSize, (TableSize/sizeof (GPIO_INIT_CONFIG)) ));
- Status = PeiServicesAllocatePool (TableSize, &GpioTable);
+ Status = PeiServicesAllocatePool (TableSize, (VOID** ) &GpioTable);
if (EFI_ERROR(Status)) {
return Status;
}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaGpioPlatformConfigLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaGpioPlatformConfigLib.c
index d03f0f9957..c89893b393 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaGpioPlatformConfigLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaGpioPlatformConfigLib.c
@@ -48,7 +48,7 @@ InitializeDxeUbaPlatLib (
UBA_CONFIG_DATABASE_PROTOCOL *UbaConfigProtocol = NULL;
UINTN TableSize;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &mDynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &mDynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return EFI_NOT_FOUND;
@@ -57,7 +57,7 @@ InitializeDxeUbaPlatLib (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemBoardInfoLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemBoardInfoLib.c
index f585b1ac9e..96f41db451 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemBoardInfoLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemBoardInfoLib.c
@@ -32,7 +32,7 @@ GetSystemBoardInfo (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemConfigUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemConfigUpdateLib.c
index 525e44358f..156ea66692 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemConfigUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaSystemConfigUpdateLib.c
@@ -31,7 +31,7 @@ UpdateIioDefaultConfig (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR," [UpdateIioDefaultConfig] Locate UbaConfigProtocol fail!\n"));
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaUsbOcUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaUsbOcUpdateLib.c
index bdbd012913..587f157a0b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaUsbOcUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/DxeUbaUsbOcUpdateLib.c
@@ -31,7 +31,7 @@ PlatformGetUsbOcMappings (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaAcpiUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaAcpiUpdateLib.c
index 595d1a62fd..a9cff5790c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaAcpiUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaAcpiUpdateLib.c
@@ -33,7 +33,7 @@ PlatformGetAcpiFixTableDataPointer (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaFpkConfigLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaFpkConfigLib.c
index 9d1c867cab..458cf3c939 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaFpkConfigLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaFpkConfigLib.c
@@ -33,7 +33,7 @@ FpkConfigGetConfigStruct (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaIioConfigLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaIioConfigLib.c
index 0e18b4543b..de4eba631c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaIioConfigLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaIioConfigLib.c
@@ -33,7 +33,7 @@ PlatformIioConfigInit (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
@@ -79,7 +79,7 @@ PlatformIioConfigInit2 (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaOpromUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaOpromUpdateLib.c
index 922b7daaca..ed99c94aac 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaOpromUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaOpromUpdateLib.c
@@ -35,7 +35,7 @@ PlatformCheckPcieRootPort (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return TRUE;
@@ -72,7 +72,7 @@ PlatformGetOptionRomTable (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
@@ -114,7 +114,7 @@ PlatformGetNicSetupConfigTable (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
@@ -156,7 +156,7 @@ PlatformGetNicCapabilityTable (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
@@ -197,7 +197,7 @@ PlatformSetupPcieSlotNumber (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSlotUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSlotUpdateLib.c
index 1d39cb7d6f..aa48fdf6f1 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSlotUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSlotUpdateLib.c
@@ -32,7 +32,7 @@ PlatformGetSlotTableData (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
@@ -76,7 +76,7 @@ PlatformGetSlotTableData2 (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSmbiosUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSmbiosUpdateLib.c
index 5d4ed55969..fe9da0f03d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSmbiosUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/UbaPlatLib/UbaSmbiosUpdateLib.c
@@ -48,7 +48,7 @@ PlatformRegisterSmbiosUpdate (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
@@ -254,7 +254,7 @@ PlatformSmbiosAddNew (
EFI_SMBIOS_HANDLE SmbiosHandle;
if (Smbios == NULL) {
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, &Smbios);
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -290,7 +290,7 @@ PlatformSmbiosGetInstanceCount (
UINTN Count = 0;
if (Smbios == NULL) {
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, &Smbios);
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -354,7 +354,7 @@ PlatformSmbiosGetInstance (
}
if (Smbios == NULL) {
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, &Smbios);
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -452,7 +452,7 @@ PlatformSmbiosUpdateInstalledString (
UINTN StringSize = 0;
if (Smbios == NULL) {
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, &Smbios);
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -494,7 +494,7 @@ PlatformSmbiosRemoveType (
EFI_SMBIOS_HANDLE SmbiosHandle;
if (Smbios == NULL) {
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, &Smbios);
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -561,7 +561,7 @@ PlatformSmbiosUpdateType (
EFI_SMBIOS_HANDLE SmbiosHandle;
if (Smbios == NULL) {
- Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, &Smbios);
+ Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);
if (EFI_ERROR (Status)) {
return Status;
}
@@ -607,7 +607,7 @@ DispatchSmbiosDynamicUpdate (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR (Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Dxe/PlatformType/PlatformTypes.c b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Dxe/PlatformType/PlatformTypes.c
index 08396c3b7a..b460dcf26d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Dxe/PlatformType/PlatformTypes.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Dxe/PlatformType/PlatformTypes.c
@@ -68,7 +68,7 @@ GetPchName (
BufferAsciiSize = sizeof (AsciiBuffer);
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -145,7 +145,7 @@ AssertPostGpio (
DYNAMIC_SI_LIBARY_PROTOCOL *DynamicSiLibraryProtocol = NULL;
EFI_STATUS Status;
- Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, &DynamicSiLibraryProtocol);
+ Status = gBS->LocateProtocol (&gDynamicSiLibraryProtocolGuid, NULL, (VOID **) &DynamicSiLibraryProtocol);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -361,4 +361,3 @@ PlatformTypeInit (
return EFI_SUCCESS;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/EmulationPlatformInit/EmulationPlatformInit.c b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/EmulationPlatformInit/EmulationPlatformInit.c
index d065225a92..1f3c978192 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/EmulationPlatformInit/EmulationPlatformInit.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/EmulationPlatformInit/EmulationPlatformInit.c
@@ -70,7 +70,7 @@ EmulationPlatformInitEntry (
&gEfiPeiReadOnlyVariable2PpiGuid,
0,
NULL,
- &PeiVariable
+ (VOID** ) &PeiVariable
);
Status = PeiVariable->GetVariable (PeiVariable, EMULATION_DFX_CONFIGURATION_NAME, &gEmulationDfxVariableGuid, NULL, &BufferSize, &EmulationVariable);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/PlatformInfo.c b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/PlatformInfo.c
index 439ce357f1..eb8db0dac2 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/PlatformInfo.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/PlatformInfo.c
@@ -83,7 +83,7 @@ GpioConfigForBoardId (
PadConfig.LockConfig = mBoardAndRevIdConfig.LockConfig;
PadConfig.OtherSettings = mBoardAndRevIdConfig.OtherSettings;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -116,7 +116,7 @@ GpioConfigForBoardRevId (
PadConfig.LockConfig = mBoardAndRevIdConfig.LockConfig;
PadConfig.OtherSettings = mBoardAndRevIdConfig.OtherSettings;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -150,7 +150,7 @@ GpioGetBoardId (
return EFI_UNSUPPORTED;
}
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -198,7 +198,7 @@ GpioGetBoardRevId (
return EFI_UNSUPPORTED;
}
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -389,7 +389,7 @@ PdrGetPlatformInfo (
&gPchSpiPpiGuid,
0,
NULL,
- &SpiPpi
+ (VOID** ) &SpiPpi
);
if (EFI_ERROR (Status)) {
@@ -456,7 +456,7 @@ GatherQATInfo(OUT EFI_PLATFORM_INFO *PlatformInfoHob)
PadConfig.LockConfig = GpioPadConfigLock;
PadConfig.OtherSettings = 00;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -653,11 +653,11 @@ PlatformInfoInit (
//
// Locate Variable PPI
//
- Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariable2PpiGuid, 0, NULL, &PeiVariable);
+ Status = PeiServicesLocatePpi (&gEfiPeiReadOnlyVariable2PpiGuid, 0, NULL, (VOID **) &PeiVariable);
(*PeiServices)->SetMem (&PlatformInfoHob, sizeof (PlatformInfoHob), 0);
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/BoardInit/Dxe/BoardInitDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/BoardInit/Dxe/BoardInitDxe.c
index 6e17717f8f..c4d0bfc764 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/BoardInit/Dxe/BoardInitDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/BoardInit/Dxe/BoardInitDxe.c
@@ -39,7 +39,7 @@ BoardInitDxeDriverEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemBoardInfoDxe/SystemBoardInfoDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemBoardInfoDxe/SystemBoardInfoDxe.c
index f19fa7d61c..791eaa6fb1 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemBoardInfoDxe/SystemBoardInfoDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemBoardInfoDxe/SystemBoardInfoDxe.c
@@ -185,7 +185,7 @@ SystemBoardInfoEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemConfigUpdateDxe/SystemConfigUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemConfigUpdateDxe/SystemConfigUpdateDxe.c
index 18205d16c8..9482bedcfb 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemConfigUpdateDxe/SystemConfigUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Dxe/SystemConfigUpdateDxe/SystemConfigUpdateDxe.c
@@ -74,7 +74,7 @@ SystemConfigUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
@@ -91,4 +91,4 @@ SystemConfigUpdateEntry (
}
return Status;
-}
\ No newline at end of file
+}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/ClocksConfig.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/ClocksConfig.c
index 196164ad9b..13d281a84d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/ClocksConfig.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/ClocksConfig.c
@@ -14,6 +14,7 @@
#include <Library/PchInfoLib.h>
#include <Ppi/PchPolicy.h>
#include <Ppi/DynamicSiLibraryPpi.h>
+#include <Library/PeiServicesLib.h>
//
// Table providing details on clocks supported by this library
@@ -78,7 +79,7 @@ PlatformClocksConfigCallback (
UINT8 ClockGeneratorAddress = 0;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR(Status)) {
DEBUG ((DEBUG_ERROR, "ConfigurePlatformClocks. Can not read gDynamicSiLibraryPpiGuid\n"));
return Status;
@@ -123,12 +124,7 @@ PlatformClocksConfigCallback (
Length = sizeof (ConfigurationTablePlatformSRP);
ClockType = ClockGeneratorCk420;
}
- Status = (*PeiServices)->LocatePpi (PeiServices,
- &gPchPlatformPolicyPpiGuid,
- 0,
- NULL,
- (VOID **)&PchPolicyPpi
- );
+ Status = PeiServicesLocatePpi (&gPchPlatformPolicyPpiGuid, 0, NULL, (VOID **) &PchPolicyPpi);
ASSERT_EFI_ERROR (Status);
EnableSpreadSpectrum = (BOOLEAN) PchPolicyPpi->PchConfig.EnableClockSpreadSpec;
if (1 == EnableSpreadSpectrum) {
@@ -174,4 +170,3 @@ InstallPlatformClocksConfigData (
return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/GpioPlatformConfig.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/GpioPlatformConfig.c
index d18a3038ef..a6f0e31c23 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/GpioPlatformConfig.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/GpioPlatformConfig.c
@@ -137,7 +137,7 @@ InstallGpioPlatformData (
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -162,5 +162,3 @@ InstallGpioPlatformData (
return Status;
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/HsioPtssTableConfig.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/HsioPtssTableConfig.c
index 75abf28d8c..55c4ea233e 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/HsioPtssTableConfig.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/HsioPtssTableConfig.c
@@ -55,7 +55,7 @@ InstallPlatformHsioPtssTableCallback (
EFI_PLATFORM_INFO *PlatformInfo;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -438,7 +438,7 @@ InstallPlatformHsioPtssTableData (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -457,4 +457,3 @@ InstallPlatformHsioPtssTableData (
return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcation.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcation.c
index 4f23abc1e0..2d8e1bafa4 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcation.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcation.c
@@ -542,7 +542,7 @@ GetBw5Bifurcation (
return IIO_BIFURCATE_xxxxxxxx;
}
- Status = PeiServicesLocatePpi (&gEfiPeiSmbus2PpiGuid, 0, NULL, &SmbPpi);
+ Status = PeiServicesLocatePpi (&gEfiPeiSmbus2PpiGuid, 0, NULL, (VOID **) &SmbPpi);
// Initialize Bw5Id to not present
@@ -854,13 +854,13 @@ IioPortBifurcationInitCallback (
//
// Locate PLATFORM_IIO_CONFIG_UPDATE_TABLE_EX
//
- Status = PeiServicesLocatePpi (&gUbaConfigDatabasePpiGuid, 0, NULL, &UbaConfigPpi);
+ Status = PeiServicesLocatePpi (&gUbaConfigDatabasePpiGuid, 0, NULL, (VOID **) &UbaConfigPpi);
if (EFI_ERROR (Status)) {
ASSERT (FALSE);
return;
}
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -910,4 +910,3 @@ InstallIioPortBifurcationInitData (
sizeof (IioPortBifurcationInitTable)
);
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcationVer1.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcationVer1.c
index 8666717a8d..153cc505ba 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcationVer1.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/IioPortBifurcationVer1.c
@@ -106,7 +106,7 @@ GetBw5Id (
&gEfiPeiSmbus2PpiGuid,
0,
NULL,
- &Smbus
+ (VOID** ) &Smbus
);
// Initialize Bw5Id to not present
@@ -198,7 +198,7 @@ InternalPlatformGetSlotTableData2 (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
@@ -254,7 +254,7 @@ InternalPlatformIioConfigInit2 (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
@@ -772,7 +772,7 @@ PlatformUpdateIioConfig (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
@@ -836,7 +836,7 @@ OverrideDefaultBifSlots_SKX (
//
// Purley platforms need to read the QAT bit
//
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return;
@@ -1352,5 +1352,3 @@ IioPortBifurcationInitVer1 (
}
}
}
-
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/PeiCommonBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/PeiCommonBoardInitLib.c
index d65bc28b1d..acb41cd4f0 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/PeiCommonBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/Common/Pei/PeiCommonBoardInitLib.c
@@ -35,7 +35,7 @@ CommonPeiBoardInitLibConstructor (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.c
index c4f0102f59..13cecba218 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/StaticSkuDataDxe.c
@@ -35,7 +35,7 @@ StaticSkuConfigDataDxeEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
index 5d8862ea6e..806919ea1f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
@@ -57,7 +57,7 @@ IioCfgUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
index bbc90ede3e..601ca09ac7 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
@@ -78,7 +78,7 @@ SlotDataUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
index fa5c21e4f4..42c5369362 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
@@ -107,7 +107,7 @@ UsbOcUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PcdData.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PcdData.c
index 27c5a36944..2553c89633 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PcdData.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PcdData.c
@@ -97,7 +97,7 @@ TypeCooperCityRPPlatformPcdUpdateCallback (
return Status;
}
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -256,4 +256,3 @@ TypeCooperCityRPInstallPcdData (
return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PchEarlyUpdate.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PchEarlyUpdate.c
index ca57086394..0fdc4c422a 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PchEarlyUpdate.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PchEarlyUpdate.c
@@ -24,7 +24,7 @@ TypeCooperCityRPPchLanConfig (
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
EFI_STATUS Status;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.c
index d76e2f29a3..03b9759636 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/PeiBoardInitLib.c
@@ -141,13 +141,13 @@ TypeCooperCityRPPeiBoardInitLibConstructor (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
}
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
index 72c55bc1c9..6518a455a5 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
@@ -57,7 +57,7 @@ IioCfgUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
index 31676bdeb6..4571af1da7 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
@@ -85,7 +85,7 @@ SlotDataUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
index 0ec35ad330..cdcb59e4ec 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
@@ -110,7 +110,7 @@ UsbOcUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PchEarlyUpdate.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PchEarlyUpdate.c
index a2ee2322c3..1a583da1b8 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PchEarlyUpdate.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PchEarlyUpdate.c
@@ -24,7 +24,7 @@ TypeWilsonCityRPPchLanConfig (
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
EFI_STATUS Status;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -75,7 +75,7 @@ TypeWilsonCityRPPchEarlyUpdate(
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PeiBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PeiBoardInitLib.c
index 44279bb1bd..38153c10a6 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PeiBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/PeiBoardInitLib.c
@@ -74,7 +74,7 @@ TypeWilsonCityRPPeiBoardInitLibConstructor (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
@@ -153,4 +153,4 @@ TypeWilsonCityRPPeiBoardInitLibConstructor (
}
}
return Status;
-}
\ No newline at end of file
+}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
index fea80ce49e..e904031e1b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/IioCfgUpdateDxe/IioCfgUpdateDxe.c
@@ -57,7 +57,7 @@ IioCfgUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
index bdedb48316..236b9ee676 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/SlotDataUpdateDxe/SlotDataUpdateDxe.c
@@ -85,7 +85,7 @@ SlotDataUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
index 769003d2be..4c74643de0 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Dxe/UsbOcUpdateDxe/UsbOcUpdateDxe.c
@@ -110,7 +110,7 @@ UsbOcUpdateEntry (
Status = gBS->LocateProtocol (
&gUbaConfigDatabaseProtocolGuid,
NULL,
- &UbaConfigProtocol
+ (VOID **) &UbaConfigProtocol
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/GpioTable.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/GpioTable.c
index f8e6051df2..94caecb933 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/GpioTable.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/GpioTable.c
@@ -299,7 +299,7 @@ TypeWilsonCitySMTInstallGpioData (
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PchEarlyUpdate.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PchEarlyUpdate.c
index 6e2d6df7d7..eb9fb49f24 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PchEarlyUpdate.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PchEarlyUpdate.c
@@ -24,7 +24,7 @@ TypeWilsonCitySMTPchLanConfig (
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
EFI_STATUS Status;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -72,7 +72,7 @@ TypeWilsonCitySMTPchEarlyUpdate(
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -86,7 +86,7 @@ TypeWilsonCitySMTPchEarlyUpdate(
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PeiBoardInitLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PeiBoardInitLib.c
index c368f5d143..8bff245802 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PeiBoardInitLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/PeiBoardInitLib.c
@@ -50,7 +50,7 @@ TypeWilsonCitySMTPeiBoardInitLibConstructor (
&gUbaConfigDatabasePpiGuid,
0,
NULL,
- &UbaConfigPpi
+ (VOID **) &UbaConfigPpi
);
if (EFI_ERROR(Status)) {
return Status;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.c b/Platform/Intel/WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.c
index 1fdefe9ef6..670371b69f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Universal/PeiInterposerToSvidMap/PeiInterposerToSvidMap.c
@@ -28,8 +28,9 @@
@retval EFI_SUCCESS The function completed successfully.
**/
EFI_STATUS
+EFIAPI
MapInterposerToSvid (
- IN CONST EFI_PEI_SERVICES **PeiServices,
+ IN EFI_PEI_SERVICES **PeiServices,
IN EFI_PEI_NOTIFY_DESCRIPTOR *NotifyDescriptor,
IN VOID *Ppi
)
@@ -50,7 +51,7 @@ MapInterposerToSvid (
DEBUG ((EFI_D_INFO, "MapInterposerToSvid Entry\n"));
- Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, &DynamicSiLibraryPpi);
+ Status = PeiServicesLocatePpi (&gDynamicSiLibraryPpiGuid, 0, NULL, (VOID **) &DynamicSiLibraryPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -67,7 +68,7 @@ MapInterposerToSvid (
}
Size = sizeof (MEM_SVID_MAP);
DEBUG ((EFI_D_INFO, "Allocate memory for MemSvidMap PCD\n"));
- Status = (*PeiServices)->AllocatePool (PeiServices, Size, &MemSvidMap);
+ Status = PeiServicesAllocatePool (Size, (VOID **) &MemSvidMap);
ASSERT_EFI_ERROR (Status);
ZeroMem (MemSvidMap, Size);
@@ -133,4 +134,4 @@ InterposerToSvidMapEntry (
DEBUG ((EFI_D_INFO, "InterposerToSvidMap Exit\n"));
return EFI_SUCCESS;;
-}
\ No newline at end of file
+}
diff --git a/Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c b/Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c
index 95a1f2a33c..fa1f97dd41 100644
--- a/Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c
+++ b/Silicon/Intel/WhitleySiliconPkg/Library/FspWrapperPlatformLib/FspWrapperPlatformLib.c
@@ -59,7 +59,7 @@ UpdateFspmUpdData (
ASSERT (GuidHob != NULL);
PlatformInfo = GET_GUID_HOB_DATA(GuidHob);
- Status = PeiServicesLocatePpi (&gUpiSiPolicyPpiGuid, 0, NULL, &UpiPolicyPpi);
+ Status = PeiServicesLocatePpi (&gUpiSiPolicyPpiGuid, 0, NULL, (VOID **) &UpiPolicyPpi);
ASSERT_EFI_ERROR(Status);
Upi = &UpiPolicyPpi->Upi;
diff --git a/Silicon/Intel/WhitleySiliconPkg/Library/SiliconPolicyInitLibShim/SiliconPolicyInitLibShim.c b/Silicon/Intel/WhitleySiliconPkg/Library/SiliconPolicyInitLibShim/SiliconPolicyInitLibShim.c
index a1c7fb0f67..2dd7d4c174 100644
--- a/Silicon/Intel/WhitleySiliconPkg/Library/SiliconPolicyInitLibShim/SiliconPolicyInitLibShim.c
+++ b/Silicon/Intel/WhitleySiliconPkg/Library/SiliconPolicyInitLibShim/SiliconPolicyInitLibShim.c
@@ -20,7 +20,7 @@ SiliconPolicyInitPreMem (
RETURN_STATUS Status = RETURN_SUCCESS;
SILICON_POLICY_INIT_LIB_PPI *SiliconPolicyInitLibPpi = NULL;
- Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, &SiliconPolicyInitLibPpi);
+ Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, (VOID **) &SiliconPolicyInitLibPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return NULL;
@@ -38,7 +38,7 @@ SiliconPolicyDonePreMem (
RETURN_STATUS Status = RETURN_SUCCESS;
SILICON_POLICY_INIT_LIB_PPI *SiliconPolicyInitLibPpi = NULL;
- Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, &SiliconPolicyInitLibPpi);
+ Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, (VOID **) &SiliconPolicyInitLibPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
@@ -56,7 +56,7 @@ SiliconPolicyInitPostMem (
RETURN_STATUS Status = RETURN_SUCCESS;
SILICON_POLICY_INIT_LIB_PPI *SiliconPolicyInitLibPpi = NULL;
- Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, &SiliconPolicyInitLibPpi);
+ Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, (VOID **) &SiliconPolicyInitLibPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return NULL;
@@ -74,7 +74,7 @@ SiliconPolicyDonePostMem (
RETURN_STATUS Status = RETURN_SUCCESS;
SILICON_POLICY_INIT_LIB_PPI *SiliconPolicyInitLibPpi = NULL;
- Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, &SiliconPolicyInitLibPpi);
+ Status = PeiServicesLocatePpi (&gSiliconPolicyInitLibInterfaceGuid, 0, NULL, (VOID **) &SiliconPolicyInitLibPpi);
if (EFI_ERROR (Status)) {
ASSERT_EFI_ERROR (Status);
return Status;
--
2.36.1.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [edk2-devel][edk2-platforms][PATCH V1 3/5] WhitleyOpenBoardPkg: Fix GCC unused variables warnings
2022-07-01 0:14 [edk2-devel][edk2-platforms][PATCH V1 0/5] Resolve GCC compilation warnings Oram, Isaac W
2022-07-01 0:14 ` [edk2-devel][edk2-platforms][PATCH V1 1/5] IpmiFeaturePkg/GenericIpmi: Fix " Oram, Isaac W
2022-07-01 0:14 ` [edk2-devel][edk2-platforms][PATCH V1 2/5] WhitleyOpenBoardPkg: Fix GCC warnings Oram, Isaac W
@ 2022-07-01 0:14 ` Oram, Isaac W
2022-07-01 0:14 ` [edk2-devel][edk2-platforms][PATCH V1 4/5] WhitleyOpenBoardPkg: Fix GCC unused variables that are set warnings Oram, Isaac W
` (2 subsequent siblings)
5 siblings, 0 replies; 8+ messages in thread
From: Oram, Isaac W @ 2022-07-01 0:14 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Nate DeSimone, Chasel Chiu
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@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
.../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
^ permalink raw reply related [flat|nested] 8+ messages in thread* [edk2-devel][edk2-platforms][PATCH V1 4/5] WhitleyOpenBoardPkg: Fix GCC unused variables that are set warnings
2022-07-01 0:14 [edk2-devel][edk2-platforms][PATCH V1 0/5] Resolve GCC compilation warnings Oram, Isaac W
` (2 preceding siblings ...)
2022-07-01 0:14 ` [edk2-devel][edk2-platforms][PATCH V1 3/5] WhitleyOpenBoardPkg: Fix GCC unused variables warnings Oram, Isaac W
@ 2022-07-01 0:14 ` Oram, Isaac W
2022-07-01 0:14 ` [edk2-devel][edk2-platforms][PATCH V1 5/5] WhitleyOpenBoardPkg: Remove unnecessary code Oram, Isaac W
2022-07-20 22:16 ` [edk2-devel][edk2-platforms][PATCH V1 0/5] Resolve GCC compilation warnings Nate DeSimone
5 siblings, 0 replies; 8+ messages in thread
From: Oram, Isaac W @ 2022-07-01 0:14 UTC (permalink / raw)
To: devel; +Cc: Isaac Oram, Nate DeSimone, Chasel Chiu
Fixed issues caused by variables initialized but not used.
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Cc: Chasel Chiu <chasel.chiu@intel.com>
Signed-off-by: Isaac Oram <isaac.w.oram@intel.com>
---
.../Aowanda/Uba/TypeAowanda/Pei/AcpiTablePcds.c | 2 --
.../Aowanda/Uba/TypeAowanda/Pei/KtiEparam.c | 3 ---
.../Uba/TypeBoardPortTemplate/Pei/AcpiTablePcds.c | 3 +--
.../Uba/TypeBoardPortTemplate/Pei/IioBifurInit.c | 8 +++-----
.../Uba/TypeBoardPortTemplate/Pei/KtiEparam.c | 2 --
.../Features/Acpi/AcpiPlatform/AcpiPlatform.c | 12 ++++--------
.../Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c | 2 --
.../Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c | 7 +------
.../Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c | 6 ------
.../WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc | 2 +-
.../Uba/TypeJunctionCity/Pei/AcpiTablePcds.c | 4 +---
.../Uba/TypeJunctionCity/Pei/IioBifurInit.c | 3 ---
.../Uba/TypeJunctionCity/Pei/KtiEparam.c | 3 ---
.../Library/AcpiPlatformTableLib/AcpiPlatformLib.c | 3 ---
.../AcpiPlatformTableLib/AcpiPlatformLibApic.c | 2 --
.../AcpiPlatformTableLib/AcpiPlatformLibDsdt.c | 4 ----
.../AcpiPlatformTableLib/AcpiPlatformLibSlit.c | 7 -------
.../AcpiPlatformTableLib/AcpiPlatformLibSsdt.c | 4 +---
.../Library/BoardInitLib/BoardInitPreMemLib.c | 10 ----------
.../MultiPlatSupportLib/MultiPlatSupportLib.c | 8 +-------
.../Library/PeiPlatformHookLib/PeiPlatformHooklib.c | 6 ++----
.../PlatformCmosAccessLib/PlatformCmosAccessLib.c | 2 --
.../Library/PlatformHooksLib/PlatformHooks.c | 8 +-------
.../SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c | 7 -------
.../Platform/Pei/PlatformInfo/PlatformInfo.c | 3 +--
Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec | 4 ++--
.../WhitleyOpenBoardPkg/Uba/CfgDb/Dxe/CfgDbDxe.c | 10 ----------
.../WhitleyOpenBoardPkg/Uba/CfgDb/Pei/CfgDbPei.c | 5 -----
.../Uba/UbaMain/StaticSkuDataDxe/AcpiStaticData.c | 2 --
.../Uba/UbaMain/StaticSkuDataDxe/DeviceDataInstall.c | 4 ----
.../Uba/UbaMain/TypeCooperCityRP/Pei/AcpiTablePcds.c | 4 +---
.../Uba/UbaMain/TypeWilsonCityRP/Pei/AcpiTablePcds.c | 4 +---
.../Uba/UbaMain/TypeWilsonCityRP/Pei/IioBifurInit.c | 8 +++-----
.../Uba/UbaMain/TypeWilsonCityRP/Pei/KtiEparam.c | 2 --
.../UbaMain/TypeWilsonCitySMT/Pei/AcpiTablePcds.c | 4 +---
.../Uba/UbaMain/TypeWilsonCitySMT/Pei/IioBifurInit.c | 8 +++-----
.../Uba/UbaMain/TypeWilsonCitySMT/Pei/KtiEparam.c | 2 --
37 files changed, 28 insertions(+), 150 deletions(-)
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/AcpiTablePcds.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/AcpiTablePcds.c
index d9f91a01e7..1810990b12 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/AcpiTablePcds.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/AcpiTablePcds.c
@@ -27,7 +27,6 @@ TypeAowandaPlatformUpdateAcpiTablePcds (
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
DEBUG ((DEBUG_INFO, "Uba Callback: PlatformAowandaUpdateAcpiTablePcds entered\n"));
@@ -37,7 +36,6 @@ TypeAowandaPlatformUpdateAcpiTablePcds (
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
// #
// #ACPI items
// #
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/KtiEparam.c b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/KtiEparam.c
index dd15bd3f88..4bdfe3d7e4 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/KtiEparam.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Aowanda/Uba/TypeAowanda/Pei/KtiEparam.c
@@ -65,7 +65,6 @@ TypeAowandaInstallKtiEparamData (
{
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
ASSERT (GuidHob != NULL);
@@ -73,8 +72,6 @@ TypeAowandaInstallKtiEparamData (
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
-
Status = UbaConfigPpi->AddData (
UbaConfigPpi,
&gPlatformKtiEparamUpdateDataGuid,
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/AcpiTablePcds.c b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/AcpiTablePcds.c
index d4601f610c..1fdb9c210f 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/AcpiTablePcds.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/AcpiTablePcds.c
@@ -26,7 +26,6 @@ TypeBoardPortTemplatePlatformUpdateAcpiTablePcds (
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
DEBUG ((DEBUG_INFO, "Uba Callback: PlatformUpdateAcpiTablePcds entered\n"));
@@ -35,7 +34,7 @@ TypeBoardPortTemplatePlatformUpdateAcpiTablePcds (
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
+
//#
//#ACPI items
//#
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/IioBifurInit.c b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/IioBifurInit.c
index f325072553..d608e5569d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/IioBifurInit.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/IioBifurInit.c
@@ -182,11 +182,10 @@ TypeBoardPortTemplateIioPortBifurcationInit (
IN UBA_CONFIG_DATABASE_PPI *UbaConfigPpi
)
{
- EFI_STATUS Status;
- EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
+ EFI_STATUS Status;
+ EFI_HOB_GUID_TYPE *GuidHob;
PLATFORM_IIO_CONFIG_UPDATE_TABLE_EX *PlatformIioInfoPtr;
- UINTN PlatformIioInfoSize;
+ UINTN PlatformIioInfoSize;
GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
@@ -194,7 +193,6 @@ TypeBoardPortTemplateIioPortBifurcationInit (
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
//
// This is config for ICX
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/KtiEparam.c b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/KtiEparam.c
index 737679341c..54e776fa4b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/KtiEparam.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/BoardPortTemplate/Uba/TypeBoardPortTemplate/Pei/KtiEparam.c
@@ -48,14 +48,12 @@ TypeBoardPortTemplateInstallKtiEparamData (
{
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
ASSERT (GuidHob != NULL);
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
Status = UbaConfigPpi->AddData (
UbaConfigPpi,
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c
index 8b461b07f7..28117ad460 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatform.c
@@ -395,7 +395,6 @@ AcpiPlatformEarlyAcpiTablesInstall (
{
EFI_STATUS Status;
EFI_STATUS AcpiStatus;
- BOOLEAN Installed;
EFI_ACPI_TABLE_PROTOCOL *AcpiTable;
EFI_FIRMWARE_VOLUME2_PROTOCOL *FwVol;
INTN Instance = 0;
@@ -435,7 +434,6 @@ AcpiPlatformEarlyAcpiTablesInstall (
CurrentTable = NULL;
TableVersion = EFI_ACPI_TABLE_VERSION_NONE;
TableHandle = 0;
- Installed = FALSE;
Status = FwVol->ReadSection (
FwVol,
@@ -478,9 +476,9 @@ AcpiPlatformEarlyAcpiTablesInstall (
//
AcpiStatus = AcpiTable->InstallAcpiTable (AcpiTable, CurrentTable, CurrentTable->Length, &TableHandle);
if (!EFI_ERROR (AcpiStatus)) {
- Installed = TRUE;
+ ASSERT_EFI_ERROR (AcpiStatus);
+ return AcpiStatus;
}
- ASSERT_EFI_ERROR (AcpiStatus);
}
}
}
@@ -541,7 +539,6 @@ PmSsdtEarlyAcpiTablesInstall (
{
EFI_STATUS Status;
EFI_STATUS AcpiStatus;
- BOOLEAN Installed;
EFI_ACPI_TABLE_PROTOCOL *AcpiTable;
EFI_FIRMWARE_VOLUME2_PROTOCOL *FwVol;
INTN Instance = 0;
@@ -581,7 +578,6 @@ PmSsdtEarlyAcpiTablesInstall (
CurrentTable = NULL;
TableVersion = EFI_ACPI_TABLE_VERSION_NONE;
TableHandle = 0;
- Installed = FALSE;
Status = FwVol->ReadSection (
FwVol,
@@ -617,9 +613,9 @@ PmSsdtEarlyAcpiTablesInstall (
//
AcpiStatus = AcpiTable->InstallAcpiTable (AcpiTable, CurrentTable, CurrentTable->Length, &TableHandle);
if (!EFI_ERROR (AcpiStatus)) {
- Installed = TRUE;
+ ASSERT_EFI_ERROR (AcpiStatus);
+ return AcpiStatus;
}
- ASSERT_EFI_ERROR (AcpiStatus);
}
}
}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c
index 141e719ef3..de4ed7c322 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformHooks.c
@@ -255,7 +255,6 @@ InstallXhciAcpiTable (
VOID
)
{
- EFI_HANDLE *HandleBuffer;
EFI_STATUS Status;
EFI_FIRMWARE_VOLUME2_PROTOCOL *FwVol;
EFI_ACPI_COMMON_HEADER *CurrentTable;
@@ -269,7 +268,6 @@ InstallXhciAcpiTable (
UINT64 *XhciAcpiTablePtr;
UINT64 TempOemTableId;
- HandleBuffer = 0;
Instance = 0;
TableHandle = 0;
CurrentTable = NULL;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c
index fb557e2ca6..e7031bda34 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Acpi/AcpiPlatform/AcpiPlatformVTDHooks.c
@@ -716,7 +716,6 @@ BuildDRHDForStack (
UINT8 PortIndex;
UINT8 MaxPortNumberPerSocket;
UINT8 CBIndex;
- UINT64 VtdMmioExtCap;
UINT32 VtdBase;
UINT32 VidDid;
DMAR_ATSR *pAtsr = NULL;
@@ -745,7 +744,6 @@ BuildDRHDForStack (
return EFI_UNSUPPORTED;
}
- VtdMmioExtCap = *(volatile UINT64*)((UINTN)VtdBase + R_VTD_EXT_CAP_LOW);
mDrhd.RegisterBase = VtdBase;
DevIndex = 00;
@@ -882,7 +880,7 @@ ReportDmar (
)
{
EFI_STATUS Status = EFI_SUCCESS;
- UINT8 SocketIndex, IioBusBase, Bus;
+ UINT8 SocketIndex, Bus;
UINT8 Dev, Func;
UINT8 DevIndex;
UINT8 PciNodeIndex;
@@ -1067,7 +1065,6 @@ ReportDmar (
ZeroMem (DevScope, MEMORY_SIZE * sizeof (DEVICE_SCOPE));
ZeroMem (PciNode, MEMORY_SIZE * sizeof (PCI_NODE));
- IioBusBase = mCpuCsrAccessVarPtr ->StackBus[SocketIndex][Stack]; // Stack 0
mDrhd.Flags = 1;
DEBUG ((DEBUG_INFO, "[ACPI](DMAR) InterruptRemap is %aabled (%d & %d)\n",
@@ -1191,8 +1188,6 @@ ReportDmar (
continue;
}
- IioBusBase = mIioUds2->IioUdsPtr->PlatformData.IIO_resource[SocketIndex].BusBase;
-
if (mIioUds2->IioUdsPtr->PlatformData.CpuQpiInfo[SocketIndex].PcieSegment >= MAX_SOCKET) {
return EFI_INVALID_PARAMETER;
}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c
index d00f9add95..f53cb6b557 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Features/Pci/Dxe/PciHostBridge/PciRootBridgeIo.c
@@ -911,9 +911,6 @@ RootBridgeIoPciRead (
UINT32 PciExtReg;
USRA_ADDRESS EndPointPciAddress;
UINT8 *pData8 = Buffer;
- UINT8 Size;
-
- Size = 1 << (Width & 0x3);
if (Buffer == NULL) {
return EFI_INVALID_PARAMETER;
@@ -978,9 +975,6 @@ RootBridgeIoPciWrite (
UINT32 PciExtReg;
USRA_ADDRESS EndPointPciAddress;
UINT8 *pData8 = Buffer;
- UINT8 Size;
-
- Size = 1 << (Width & 0x3);
if (Buffer == NULL) {
return EFI_INVALID_PARAMETER;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc b/Platform/Intel/WhitleyOpenBoardPkg/Include/Dsc/BuildOptions.dsc
index 590d2f67fe..0a07a54e5b 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-unused-but-set-variable -mabi=ms
+ GCC:*_GCC5_*_CC_FLAGS = -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/JunctionCity/Uba/TypeJunctionCity/Pei/AcpiTablePcds.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/AcpiTablePcds.c
index c1afaf5724..8a6fc17466 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/AcpiTablePcds.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/AcpiTablePcds.c
@@ -27,7 +27,6 @@ TypeJunctionCityPlatformUpdateAcpiTablePcds (
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
DEBUG ((DEBUG_INFO, "Uba Callback: PlatformUpdateAcpiTablePcds entered\n"));
@@ -36,7 +35,7 @@ TypeJunctionCityPlatformUpdateAcpiTablePcds (
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
+
//#
//#ACPI items
//#
@@ -51,4 +50,3 @@ TypeJunctionCityPlatformUpdateAcpiTablePcds (
return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/IioBifurInit.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/IioBifurInit.c
index fd3aaff07e..6a83895aad 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/IioBifurInit.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/IioBifurInit.c
@@ -180,17 +180,14 @@ TypeJunctionCityIioPortBifurcationInit (
{
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
PLATFORM_IIO_CONFIG_UPDATE_TABLE_EX *PlatformIioInfoPtr;
UINTN PlatformIioInfoSize;
-
GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
ASSERT (GuidHob != NULL);
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
//
// This is config for ICX
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/KtiEparam.c b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/KtiEparam.c
index cb1f2743a8..95bd69fc2e 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/KtiEparam.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/JunctionCity/Uba/TypeJunctionCity/Pei/KtiEparam.c
@@ -49,15 +49,12 @@ TypeJunctionCityInstallKtiEparamData (
{
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
ASSERT (GuidHob != NULL);
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
-
Status = UbaConfigPpi->AddData (
UbaConfigPpi,
&gPlatformKtiEparamUpdateDataGuid,
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c
index f3d4075880..c9a5e00155 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLib.c
@@ -305,7 +305,6 @@ PlatformUpdateTables (
{
EFI_ACPI_DESCRIPTION_HEADER *TableHeader;
EFI_STATUS Status;
- ACPI_APIC_STRUCTURE_PTR *ProcessorLocalApicEntry;
UINT64 TempOemTableId;
UINT32 Data32;
@@ -318,8 +317,6 @@ PlatformUpdateTables (
}
TableHeader = NULL;
-
- ProcessorLocalApicEntry = NULL;
Status = EFI_SUCCESS;
//
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
index 358a527d93..b8677340ca 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibApic.c
@@ -183,7 +183,6 @@ SortCpuLocalApicInTable (
{
EFI_STATUS Status;
EFI_PROCESSOR_INFORMATION ProcessorInfoBuffer;
- UINTN BufferSize;
UINT32 Index;
UINT32 Socket;
UINT32 CurrProcessor;
@@ -197,7 +196,6 @@ SortCpuLocalApicInTable (
CPU_ID_ORDER_MAP TempEntry;
BOOLEAN SecondThreadExistent;
- BufferSize = 0;
Index = 0;
Status = EFI_SUCCESS;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibDsdt.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibDsdt.c
index 29722c1269..7454aa0226 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibDsdt.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibDsdt.c
@@ -191,7 +191,6 @@ PatchDsdtTable (
EFI_STATUS Status;
UINT8 *DsdtPointer;
UINT32 *Signature;
- UINT32 *Signature2;
UINT32 Fixes;
UINT32 NodeIndex;
UINT8 Counter;
@@ -322,7 +321,6 @@ PatchDsdtTable (
// Last 4 chars of AmlOffsetTable.Pathname has FIX tag.
//
Signature = (UINT32 *) (mAmlOffsetTablePointer[i].Pathname + AsciiStrLen(mAmlOffsetTablePointer[i].Pathname) - 4);
- Signature2 = (UINT32 *) (mAmlOffsetTablePointer[i].Pathname + AsciiStrLen(mAmlOffsetTablePointer[i].Pathname) - 9);
switch (*Signature) {
//
// "FIX1" BUS resource for PCXX in Acpi\AcpiTables\Dsdt\SysBus.asi and PCXX.asi
@@ -451,7 +449,6 @@ PatchDsdtTable (
// Last 4 chars of AmlOffsetTable.Pathname has FIX tag.
//
Signature = (UINT32 *) (mAmlOffsetTablePointer[i].Pathname + AsciiStrLen(mAmlOffsetTablePointer[i].Pathname) - 4);
- Signature2 = (UINT32 *) (mAmlOffsetTablePointer[i].Pathname + AsciiStrLen(mAmlOffsetTablePointer[i].Pathname) - 9);
switch (*Signature) {
//
// "FIX3" PCI32 resource for PCXX in Acpi\AcpiTables\Dsdt\SysBus.asi and PCXX.asi
@@ -515,7 +512,6 @@ PatchDsdtTable (
// Last 4 chars of AmlOffsetTable.Pathname has FIX tag.
//
Signature = (UINT32 *) (mAmlOffsetTablePointer[i].Pathname + AsciiStrLen(mAmlOffsetTablePointer[i].Pathname) - 4);
- Signature2 = (UINT32 *) (mAmlOffsetTablePointer[i].Pathname + AsciiStrLen(mAmlOffsetTablePointer[i].Pathname) - 9);
switch (*Signature) {
//
// "FIX4" PCI64 resource for PCXX in Acpi\AcpiTables\Dsdt\SysBus.asi and PCXX.asi
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c
index 6976688c3f..eba859d94b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSlit.c
@@ -568,7 +568,6 @@ ProcessSocketsLinks (
ACPI_SYSTEM_LOCALITY_INFORMATION_TABLE *SlitAcpiTable;
UINT8 SourceNode;
UINT8 SourceSocket;
- UINT8 SourceCluster;
UINT8 TargetSocket;
if (NULL == Table) {
@@ -582,7 +581,6 @@ ProcessSocketsLinks (
for (SourceNode = 0; SourceNode < (NodeCount - PmemNodeCount - FpgaCount); SourceNode++) {
SourceSocket = SourceNode / NumClusters;
- SourceCluster = SourceNode % NumClusters;
for (TargetSocket = 0; TargetSocket < NumCpus; TargetSocket++) {
if (SocketsLinked (GetSocketPhysicalId (SourceSocket), GetSocketPhysicalId (TargetSocket))) {
SetMem (&SlitAcpiTable->NumSlit[(SourceNode * NodeCount) + (TargetSocket * NumClusters)].Entry,
@@ -622,7 +620,6 @@ ProcessMixedModeSocketsLinks (
UINT16 EntryIdx2LM;
UINT8 SourceNode;
UINT8 SourceSocket;
- UINT8 SourceCluster;
UINT8 TargetSocket;
UINT8 TargetCluster;
BOOLEAN Is2LM;
@@ -639,7 +636,6 @@ ProcessMixedModeSocketsLinks (
for (SourceNode = 0; SourceNode < (NodeCount - PmemNodeCount - FpgaCount); SourceNode++) {
Is2LM = (SourceNode >= NumCpus * NumClusters) ? TRUE : FALSE;
SourceSocket = (SourceNode - NumCpus * NumClusters * (Is2LM ? 1 : 0)) / NumClusters;
- SourceCluster = (SourceNode - NumCpus * NumClusters * (Is2LM ? 1 : 0)) % NumClusters;
for (TargetSocket = 0; TargetSocket < NumCpus; TargetSocket++) {
if (SocketsLinked (GetSocketPhysicalId (SourceSocket), GetSocketPhysicalId (TargetSocket))) {
@@ -1103,12 +1099,9 @@ InstallSlitTable (
{
ACPI_SYSTEM_LOCALITY_INFORMATION_TABLE *Table;
UINTN TableSize;
- UINT8 NumClusters;
UINTN TableHandle = 0;
EFI_STATUS Status;
- NumClusters = GetNumClusters ();
-
TableSize = sizeof (EFI_ACPI_6_2_SYSTEM_LOCALITY_DISTANCE_INFORMATION_TABLE_HEADER) +
sizeof (ACPI_SYSTEM_LOCALITIES_STRUCTURE) * EFI_ACPI_SYSTEM_LOCALITIES_ENTRY_COUNT;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
index 4e53df2dd9..111d32b44c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/AcpiPlatformTableLib/AcpiPlatformLibSsdt.c
@@ -496,7 +496,6 @@ PatchOem1SsdtTable (
UINT32 GpssFixes;
UINT32 CpuSkt;
UINT32 CpuIndex;
- UINT32 ThreadIndex;
UINT32 PackageSize;
UINT32 NewPackageSize;
UINT32 AdjustSize;
@@ -516,7 +515,7 @@ PatchOem1SsdtTable (
CpuFixes = 0;
CpuSkt = 0;
CpuIndex = 0;
- ThreadIndex = 0;
+
CurrPtr = (UINT8 *) Table;
EndPtr = (CurrPtr + ((EFI_ACPI_COMMON_HEADER *) CurrPtr)->Length);
CpuMiscData = NULL;
@@ -579,7 +578,6 @@ PatchOem1SsdtTable (
}
CpuIndex += AdjustSize;
- ThreadIndex = CpuIndex;
++CpuFixes;
CpuMiscData = NULL;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitPreMemLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitPreMemLib.c
index f90166d339..b43f538f88 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitPreMemLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/BoardInitLib/BoardInitPreMemLib.c
@@ -77,8 +77,6 @@ EarlyPlatformPchInit (
{
UINT16 Data16;
UINT8 Data8;
- UINTN LpcBaseAddress;
- UINT8 TcoRebootHappened;
UINTN SpiBaseAddress;
UINTN P2sbBase;
EFI_STATUS Status = EFI_SUCCESS;
@@ -92,11 +90,6 @@ EarlyPlatformPchInit (
return;
}
- LpcBaseAddress = DynamicSiLibraryPpi->MmPciBase (
- DEFAULT_PCI_BUS_NUMBER_PCH,
- PCI_DEVICE_NUMBER_PCH_LPC,
- PCI_FUNCTION_NUMBER_PCH_LPC
- );
SpiBaseAddress = DynamicSiLibraryPpi->MmPciBase (
DEFAULT_PCI_BUS_NUMBER_PCH,
PCI_DEVICE_NUMBER_PCH_SPI,
@@ -157,10 +150,7 @@ EarlyPlatformPchInit (
//
Data8 = IoRead8 (PCH_TCO_BASE_ADDRESS + R_TCO_IO_TCO2_STS);
if ((Data8 & B_TCO_IO_TCO2_STS_SECOND_TO) == B_TCO_IO_TCO2_STS_SECOND_TO) {
- TcoRebootHappened = 1;
DEBUG ((EFI_D_INFO, "EarlyPlatformPchInit - TCO Second TO status bit is set. This might be a TCO reboot\n"));
- } else {
- TcoRebootHappened = 0;
}
//
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c
index 7400886ef0..8f1a5b0b96 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/MultiPlatSupportLib/MultiPlatSupportLib.c
@@ -197,14 +197,8 @@ Returns:
UINT8 *VarPtr;
UINT32 VarDataOffset;
UINT32 VarHobDataOffset;
- EFI_PEI_SERVICES **PeiServices;
- //
- // Get PeiService pointer
- //
- PeiServices = (EFI_PEI_SERVICES **)GetPeiServicesTablePointer ();
-
- VarStoreHeader = (VARIABLE_STORE_HEADER*)FindDefaultHobinFfs( DefaultId, BoardId);
+ VarStoreHeader = (VARIABLE_STORE_HEADER*)FindDefaultHobinFfs (DefaultId, BoardId);
//
// Matched default data is not found.
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiPlatformHookLib/PeiPlatformHooklib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
index 9adbfee4a1..57823ea47c 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PeiPlatformHookLib/PeiPlatformHooklib.c
@@ -22,11 +22,9 @@ VOID
GpioInit (
)
{
- EFI_STATUS Status;
- Status = PlatformInitGpios();
+ PlatformInitGpios ();
}
-
/**
Configure GPIO and SIO
@@ -37,7 +35,7 @@ BoardInit (
)
{
- GpioInit();
+ GpioInit ();
return EFI_SUCCESS;
}
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformCmosAccessLib/PlatformCmosAccessLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformCmosAccessLib/PlatformCmosAccessLib.c
index fbf7cbfe56..6f9993da91 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformCmosAccessLib/PlatformCmosAccessLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformCmosAccessLib/PlatformCmosAccessLib.c
@@ -47,9 +47,7 @@ PlatformCmosGetNmiState (
VOID
)
{
- volatile UINT32 Data32;
BOOLEAN Nmi;
- Data32 = 0;
EFI_STATUS Status = EFI_SUCCESS;
DYNAMIC_SI_LIBARY_PPI *DynamicSiLibraryPpi = NULL;
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformHooksLib/PlatformHooks.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformHooksLib/PlatformHooks.c
index 8a93f41678..1a42affdeb 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformHooksLib/PlatformHooks.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/PlatformHooksLib/PlatformHooks.c
@@ -106,7 +106,6 @@ IsAspeedPresent (
)
{
BOOLEAN PresenceStatus = FALSE;
- UINT32 DeviceID;
//
//ASPEED AST2500/AST2600
@@ -120,13 +119,8 @@ IsAspeedPresent (
// In ESPI mode, assume this SIO logic device always present.
//
#ifdef ESPI_ENABLE
- DeviceID = 0;
PresenceStatus = TRUE;
#else
- //
- //right now, maybe it is ASPEED. to detect the device ID.
- //
- DeviceID = ReadAHBDword (SCU7C);
//
//There is a Aspeed card need to support as well. it's type is AST2500 A1 EVB.
//
@@ -147,7 +141,7 @@ IsAspeedPresent (
//AST2520-A1 0x04010203
//AST2530-A1 0x04010403
//
- if ((DeviceID & 0xff0000ff) == 0x04000003) {
+ if ((ReadAHBDword (SCU7C) & 0xff0000ff) == 0x04000003) {
PresenceStatus = TRUE;
}
#endif
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c b/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
index d940a39133..08144936dd 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Library/SiliconPolicyUpdateLib/SiliconPolicyUpdateLib.c
@@ -249,7 +249,6 @@ Returns:
--*/
{
UINT8 Index;
- UINTN LpcBaseAddress;
UINT8 MaxSataPorts;
UINT8 BmcRootPort;
UINT8 *SmBusReservedTable;
@@ -274,12 +273,6 @@ Returns:
SetupVariables = PcdGetPtr(PcdSetup);
PchRcVariables = PcdGetPtr(PcdPchSetup);
- LpcBaseAddress = DynamicSiLibraryPpi->MmPciBase (
- DEFAULT_PCI_BUS_NUMBER_PCH,
- PCI_DEVICE_NUMBER_PCH_LPC,
- PCI_FUNCTION_NUMBER_PCH_LPC
- );
-
PchPolicy->Port80Route = PchRcVariables->IchPort80Route;
//
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/PlatformInfo.c b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/PlatformInfo.c
index eb8db0dac2..d497a8b4b2 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/PlatformInfo.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Platform/Pei/PlatformInfo/PlatformInfo.c
@@ -637,7 +637,6 @@ PlatformInfoInit (
EFI_PEI_READ_ONLY_VARIABLE2_PPI *PeiVariable;
EFI_PLATFORM_INFO PlatformInfoHob;
EFI_PLATFORM_INFO tempPlatformInfoHob;
- UINT8 ChipId;
UINT32 Delay;
UINT32 CpuType;
UINT8 CpuStepping;
@@ -673,7 +672,7 @@ PlatformInfoInit (
for (Delay = 0; Delay < 40; Delay++) IoRead8 (0x61);
IoWrite8 (PILOTIV_SIO_INDEX_PORT, PILOTIV_CHIP_ID_REG);
for (Delay = 0; Delay < 40; Delay++) IoRead8 (0x61);
- ChipId = IoRead8 (PILOTIV_SIO_DATA_PORT);
+ IoRead8 (PILOTIV_SIO_DATA_PORT);
for (Delay = 0; Delay < 40; Delay++) IoRead8 (0x61);
IoWrite8 (PILOTIV_SIO_INDEX_PORT, PILOTIV_SIO_LOCK);
for (Delay = 0; Delay < 40; Delay++) IoRead8 (0x61);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec
index f4e3a4857e..015f201928 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec
+++ b/Platform/Intel/WhitleyOpenBoardPkg/PlatformPkg.dec
@@ -79,10 +79,10 @@
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
#
+
gReserveMemFlagVariableGuid = { 0xb87aa73f, 0xdcb3, 0x4533, { 0x83, 0x98, 0x6c, 0x12, 0x84, 0x27, 0x28, 0x40 } }
gEfiOpaSocketMapHobGuid = { 0x829d41d2, 0x6ca5, 0x485b, { 0xa1, 0xa2, 0xd1, 0xb7, 0x96, 0x27, 0xab, 0xcd } }
gEfiPlatformTxtPolicyDataGuid = { 0xa353290b, 0x867d, 0x4cd3, { 0xa8, 0x1b, 0x4b, 0x7e, 0x5e, 0x10, 0x0e, 0x16 } }
@@ -169,7 +169,7 @@
gEfiPlatformTypeCooperCityRPProtocolGuid = { 0x45c302e1, 0x4b86, 0x89be, { 0xab, 0x0f, 0x5e, 0xb5, 0x57, 0xdf, 0xe8, 0xd8 } }
gEfiPlatformTypeJunctionCityProtocolGuid = { 0xB1C2B1C9, 0xB606, 0x4B62, { 0x9D, 0x78, 0xCB, 0xD6, 0x0F, 0xF9, 0x0D, 0x0C } }
gEfiPlatformTypeAowandaProtocolGuid = { 0x65231A3C, 0xC343, 0x4C7E, { 0xA4, 0x5E, 0x0F, 0x99, 0x74, 0xA6, 0x90, 0x83 } }
-
+ gEfiPlatformTypeBoardPortTemplateProtocolGuid = { 0xecaa1083, 0x9d72, 0x44d1, { 0xb1, 0x42, 0x0e, 0xd8, 0x0a, 0xd1, 0x37, 0xd2 } }
#
# UBA_END
#
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/CfgDb/Dxe/CfgDbDxe.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/CfgDb/Dxe/CfgDbDxe.c
index 9a524a0d00..ed6e068040 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/CfgDb/Dxe/CfgDbDxe.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/CfgDb/Dxe/CfgDbDxe.c
@@ -360,18 +360,13 @@ DxeUbaGetData (
)
{
EFI_STATUS Status;
- UBA_DXE_PRIVATE_DATA *UbaDxePrivate;
UBA_BOARD_NODE *SkuNode;
- UbaDxePrivate = NULL;
SkuNode = NULL;
if ((ResId == NULL) || (Data == NULL) || (DataSize == NULL)) {
return EFI_INVALID_PARAMETER;
}
- UbaDxePrivate = PRIVATE_DATA_FROM_PROTOCOL (This);
-
-
Status = InternalGetSkuNode (This, &SkuNode);
if (EFI_ERROR (Status)) {
return Status;
@@ -406,15 +401,11 @@ InternalGetConfigDataFromHob (
UBA_CONFIG_HOB_HEADER *HobHeader;
UBA_CONFIG_HOB_FIELD *HobDataFieldStart;
UINTN Index;
- UBA_DXE_PRIVATE_DATA *UbaDxePrivate;
UBA_BOARD_NODE *SkuNode;
HobHeader = NULL;
HobDataFieldStart = NULL;
- UbaDxePrivate = NULL;
SkuNode = NULL;
- UbaDxePrivate = PRIVATE_DATA_FROM_PROTOCOL (This);
-
Hob.Raw = GetFirstGuidHob (&gUbaCurrentConfigHobGuid);
ASSERT (Hob.Raw != NULL);
if (Hob.Raw == NULL) {
@@ -515,4 +506,3 @@ UbaConfigDatabaseEntry (
return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/CfgDb/Pei/CfgDbPei.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/CfgDb/Pei/CfgDbPei.c
index 0a37d49998..1d6b48f3b3 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/CfgDb/Pei/CfgDbPei.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/CfgDb/Pei/CfgDbPei.c
@@ -546,9 +546,7 @@ PeiUbaGetData (
)
{
EFI_STATUS Status;
- UBA_PEIM_PRIVATE_DATA *UbaPeimPrivate;
UBA_BOARD_NODE *SkuNode;
- UbaPeimPrivate = NULL;
SkuNode = NULL;
if ((ResId == NULL) || (Data == NULL) || (DataSize == NULL)) {
@@ -557,8 +555,6 @@ PeiUbaGetData (
PeiCheckPointerRelocated (This);
- UbaPeimPrivate = PRIVATE_DATA_FROM_PPI (This);
-
Status = InternalGetSkuNode (This, &SkuNode);
if (EFI_ERROR (Status)) {
return Status;
@@ -800,4 +796,3 @@ UbaConfigDatabasePeimEntry (
return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/AcpiStaticData.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/AcpiStaticData.c
index c658b9fd28..dc4b8792c2 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/AcpiStaticData.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/AcpiStaticData.c
@@ -29,7 +29,6 @@ InstallAcpiFixupTableData (
{
EFI_STATUS Status = EFI_SUCCESS;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
ACPI_FIX_UPDATE_TABLE *PtrTable;
UINT32 TableSize;
@@ -38,7 +37,6 @@ InstallAcpiFixupTableData (
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
PtrTable = &FixupTableUpdate10nm;
TableSize = sizeof(FixupTableUpdate10nm);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/DeviceDataInstall.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/DeviceDataInstall.c
index dc49390cb2..3eb93c689d 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/DeviceDataInstall.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/StaticSkuDataDxe/DeviceDataInstall.c
@@ -36,14 +36,12 @@ InstallPirqData (
PLATFORM_PIRQ_UPDATE_TABLE *PtrTable;
UINT32 TableSize;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
ASSERT (GuidHob != NULL);
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
PtrTable = &PirqUpdate10nm;
TableSize = sizeof(PirqUpdate10nm);
@@ -76,14 +74,12 @@ InstallMpTableData (
PLATFORM_MP_UPDATE_TABLE *PtrTable;
UINT32 TableSize;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
ASSERT (GuidHob != NULL);
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
PtrTable = &MpTableUpdate10nm;
TableSize = sizeof(MpTableUpdate10nm);
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/AcpiTablePcds.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/AcpiTablePcds.c
index 98ed9275e5..3e79965619 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/AcpiTablePcds.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeCooperCityRP/Pei/AcpiTablePcds.c
@@ -26,14 +26,13 @@ TypeCooperCityRPPlatformUpdateAcpiTablePcds (
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
ASSERT (GuidHob != NULL);
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
+
//#
//#ACPI items
//#
@@ -48,4 +47,3 @@ TypeCooperCityRPPlatformUpdateAcpiTablePcds (
return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/AcpiTablePcds.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/AcpiTablePcds.c
index c1c022a62e..44b1e7678e 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/AcpiTablePcds.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/AcpiTablePcds.c
@@ -26,7 +26,6 @@ TypeWilsonCityRPPlatformUpdateAcpiTablePcds (
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
DEBUG ((EFI_D_INFO, "Uba Callback: PlatformUpdateAcpiTablePcds entered\n"));
@@ -35,7 +34,7 @@ TypeWilsonCityRPPlatformUpdateAcpiTablePcds (
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
+
//#
//#ACPI items
//#
@@ -50,4 +49,3 @@ TypeWilsonCityRPPlatformUpdateAcpiTablePcds (
return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/IioBifurInit.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/IioBifurInit.c
index dc8fe7cc63..2336ed4456 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/IioBifurInit.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/IioBifurInit.c
@@ -182,11 +182,10 @@ TypeWilsonCityRPIioPortBifurcationInit (
IN UBA_CONFIG_DATABASE_PPI *UbaConfigPpi
)
{
- EFI_STATUS Status;
- EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
+ EFI_STATUS Status;
+ EFI_HOB_GUID_TYPE *GuidHob;
PLATFORM_IIO_CONFIG_UPDATE_TABLE_EX *PlatformIioInfoPtr;
- UINTN PlatformIioInfoSize;
+ UINTN PlatformIioInfoSize;
GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
@@ -194,7 +193,6 @@ TypeWilsonCityRPIioPortBifurcationInit (
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
//
// This is config for ICX
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/KtiEparam.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/KtiEparam.c
index 63a0111750..7cdfc6fa61 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/KtiEparam.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCityRP/Pei/KtiEparam.c
@@ -48,14 +48,12 @@ TypeWilsonCityRPInstallKtiEparamData (
{
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
ASSERT (GuidHob != NULL);
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
Status = UbaConfigPpi->AddData (
UbaConfigPpi,
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/AcpiTablePcds.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/AcpiTablePcds.c
index 437cb211b6..0055323e77 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/AcpiTablePcds.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/AcpiTablePcds.c
@@ -26,14 +26,13 @@ TypeWilsonCitySMTPlatformUpdateAcpiTablePcds (
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
ASSERT (GuidHob != NULL);
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
+
//#
//#ACPI items
//#
@@ -48,4 +47,3 @@ TypeWilsonCitySMTPlatformUpdateAcpiTablePcds (
return Status;
}
-
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/IioBifurInit.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/IioBifurInit.c
index 32de972eb6..ba33a38aaa 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/IioBifurInit.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/IioBifurInit.c
@@ -185,11 +185,10 @@ TypeWilsonCitySMTIioPortBifurcationInit (
IN UBA_CONFIG_DATABASE_PPI *UbaConfigPpi
)
{
- EFI_STATUS Status;
- EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
+ EFI_STATUS Status;
+ EFI_HOB_GUID_TYPE *GuidHob;
PLATFORM_IIO_CONFIG_UPDATE_TABLE_EX *PlatformIioInfoPtr;
- UINTN PlatformIioInfoSize;
+ UINTN PlatformIioInfoSize;
GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
@@ -197,7 +196,6 @@ TypeWilsonCitySMTIioPortBifurcationInit (
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
//
// This is config for ICX
diff --git a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/KtiEparam.c b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/KtiEparam.c
index 9c0c75f47f..3ee64b0d0b 100644
--- a/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/KtiEparam.c
+++ b/Platform/Intel/WhitleyOpenBoardPkg/Uba/UbaMain/TypeWilsonCitySMT/Pei/KtiEparam.c
@@ -59,14 +59,12 @@ TypeWilsonCitySMTInstallKtiEparamData (
{
EFI_STATUS Status;
EFI_HOB_GUID_TYPE *GuidHob;
- EFI_PLATFORM_INFO *PlatformInfo;
GuidHob = GetFirstGuidHob (&gEfiPlatformInfoGuid);
ASSERT (GuidHob != NULL);
if (GuidHob == NULL) {
return EFI_NOT_FOUND;
}
- PlatformInfo = GET_GUID_HOB_DATA (GuidHob);
Status = UbaConfigPpi->AddData (
UbaConfigPpi,
--
2.36.1.windows.1
^ permalink raw reply related [flat|nested] 8+ messages in thread