Fixed compilation of all packages tracked by CI after rebasing upon edk2-stable202305.

This commit is contained in:
Mikhail Krichanov 2023-07-07 09:47:25 +03:00
parent 5df2773303
commit 8a56cbfb5d
14 changed files with 15 additions and 11 deletions

View File

@ -38,7 +38,6 @@
FspWrapperPlatformLib FspWrapperPlatformLib
FspWrapperHobProcessLib FspWrapperHobProcessLib
CpuLib CpuLib
UefiCpuLib
UefiImageExtraActionLib UefiImageExtraActionLib
PerformanceLib PerformanceLib
TimerLib TimerLib

View File

@ -39,7 +39,6 @@
FspWrapperPlatformLib FspWrapperPlatformLib
FspWrapperHobProcessLib FspWrapperHobProcessLib
CpuLib CpuLib
UefiCpuLib
UefiImageExtraActionLib UefiImageExtraActionLib
PerformanceLib PerformanceLib
FspWrapperApiLib FspWrapperApiLib

View File

@ -106,7 +106,8 @@
MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibNull.inf MmUnblockMemoryLib|MdePkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLibNull.inf
VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf VariableFlashInfoLib|MdeModulePkg/Library/BaseVariableFlashInfoLib/BaseVariableFlashInfoLib.inf
IpmiCommandLib|MdeModulePkg/Library/BaseIpmiCommandLibNull/BaseIpmiCommandLibNull.inf IpmiCommandLib|MdeModulePkg/Library/BaseIpmiCommandLibNull/BaseIpmiCommandLibNull.inf
IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
[LibraryClasses.EBC.PEIM] [LibraryClasses.EBC.PEIM]
IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf IoLib|MdePkg/Library/PeiIoLibCpuIo/PeiIoLibCpuIo.inf
@ -131,10 +132,10 @@
CpuArchLib|UefiCpuPkg/Library/CpuArchLib/CpuArchLib.inf CpuArchLib|UefiCpuPkg/Library/CpuArchLib/CpuArchLib.inf
MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf
LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf
UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
MicrocodeLib|UefiCpuPkg/Library/MicrocodeLib/MicrocodeLib.inf MicrocodeLib|UefiCpuPkg/Library/MicrocodeLib/MicrocodeLib.inf
MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLib.inf MemEncryptSevLib|OvmfPkg/Library/BaseMemEncryptSevLib/DxeMemEncryptSevLib.inf
CpuPageTableLib|UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableLib.inf
[LibraryClasses.IA32.DXE_CORE] [LibraryClasses.IA32.DXE_CORE]
CcExitLib|UefiCpuPkg/Library/CcExitLibNull/CcExitLibNull.inf CcExitLib|UefiCpuPkg/Library/CcExitLibNull/CcExitLibNull.inf

View File

@ -127,7 +127,7 @@
# Onigurama: corrects build for llvm-15 # Onigurama: corrects build for llvm-15
CLANGPDB:*_*_*_CC_FLAGS = -Wno-deprecated-non-prototype CLANGPDB:*_*_*_CC_FLAGS = -Wno-deprecated-non-prototype
CLANGGCC:*_*_*_CC_FLAGS = -Wno-deprecated-non-prototype GCC:*_CLANGDWARF_*_CC_FLAGS = -Wno-deprecated-non-prototype
# Not add -Wno-error=maybe-uninitialized option for XCODE # Not add -Wno-error=maybe-uninitialized option for XCODE
# XCODE doesn't know this option # XCODE doesn't know this option

View File

@ -57,6 +57,6 @@
BaseMemoryLib BaseMemoryLib
[BuildOptions] [BuildOptions]
MSFT:*_*_IA32_CC_FLAGS = /wd4146 /wd4245 MSFT:*_*_IA32_CC_FLAGS = /wd4146 /wd4245 /wd4706
MSFT:*_*_X64_CC_FLAGS = /wd4146 /wd4244 /wd4245 /wd4267 MSFT:*_*_X64_CC_FLAGS = /wd4146 /wd4244 /wd4245 /wd4267 /wd4706
XCODE:*_*_X64_CC_FLAGS = -U__APPLE__

View File

@ -35,6 +35,7 @@
UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf
UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
UefiLib|MdePkg/Library/UefiLib/UefiLib.inf UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServicesLib.inf

View File

@ -17,6 +17,7 @@
#include <IndustryStandard/Tdx.h> #include <IndustryStandard/Tdx.h>
#include <IndustryStandard/IntelTdx.h> #include <IndustryStandard/IntelTdx.h>
#include <Library/PeiServicesLib.h> #include <Library/PeiServicesLib.h>
#include <Library/TdxLib.h>
#include <Pi/PrePiHob.h> #include <Pi/PrePiHob.h>
#include <WorkArea.h> #include <WorkArea.h>
#include <ConfidentialComputingGuestAttr.h> #include <ConfidentialComputingGuestAttr.h>

View File

@ -331,6 +331,7 @@
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
CpuArchLib|UefiCpuPkg/Library/CpuArchLib/CpuArchLib.inf CpuArchLib|UefiCpuPkg/Library/CpuArchLib/CpuArchLib.inf
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
CpuPageTableLib|UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableLib.inf
[LibraryClasses.common.DXE_RUNTIME_DRIVER] [LibraryClasses.common.DXE_RUNTIME_DRIVER]
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

View File

@ -350,6 +350,7 @@
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
CpuArchLib|UefiCpuPkg/Library/CpuArchLib/CpuArchLib.inf CpuArchLib|UefiCpuPkg/Library/CpuArchLib/CpuArchLib.inf
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
CpuPageTableLib|UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableLib.inf
[LibraryClasses.common.DXE_RUNTIME_DRIVER] [LibraryClasses.common.DXE_RUNTIME_DRIVER]
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf

View File

@ -38,3 +38,6 @@
[Protocols] [Protocols]
gVirtioDeviceProtocolGuid ## TO_START gVirtioDeviceProtocolGuid ## TO_START
gEfiSerialIoProtocolGuid gEfiSerialIoProtocolGuid
[BuildOptions]
MSFT:*_*_*_CC_FLAGS = /wd4204

View File

@ -35,7 +35,6 @@
IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchronizationLib.inf
LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf
UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf SerialPortLib|MdeModulePkg/Library/BaseSerialPortLib16550/BaseSerialPortLib16550.inf
UefiImageExtraActionLib|SourceLevelDebugPkg/Library/UefiImageExtraActionLibDebug/UefiImageExtraActionLibDebug.inf UefiImageExtraActionLib|SourceLevelDebugPkg/Library/UefiImageExtraActionLibDebug/UefiImageExtraActionLibDebug.inf
TimerLib|UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf TimerLib|UefiCpuPkg/Library/SecPeiDxeTimerLibUefiCpu/SecPeiDxeTimerLibUefiCpu.inf

View File

@ -48,7 +48,6 @@
PcdLib PcdLib
DebugAgentLib DebugAgentLib
CpuLib CpuLib
UefiCpuLib
UefiImageExtraActionLib UefiImageExtraActionLib
CpuExceptionHandlerLib CpuExceptionHandlerLib
ReportStatusCodeLib ReportStatusCodeLib

View File

@ -25,7 +25,6 @@
#include <Library/BaseMemoryLib.h> #include <Library/BaseMemoryLib.h>
#include <Library/PlatformSecLib.h> #include <Library/PlatformSecLib.h>
#include <Library/CpuLib.h> #include <Library/CpuLib.h>
#include <Library/UefiCpuLib.h>
#include <Library/UefiImageExtraActionLib.h> #include <Library/UefiImageExtraActionLib.h>
#include <Library/DebugAgentLib.h> #include <Library/DebugAgentLib.h>

View File

@ -344,6 +344,7 @@
!endif !endif
CpuArchLib|UefiCpuPkg/Library/CpuArchLib/CpuArchLib.inf CpuArchLib|UefiCpuPkg/Library/CpuArchLib/CpuArchLib.inf
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
CpuPageTableLib|UefiCpuPkg/Library/CpuPageTableLib/CpuPageTableLib.inf
[LibraryClasses.common.DXE_DRIVER] [LibraryClasses.common.DXE_DRIVER]
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf