Failed in applying to current master (
apply log)
UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.c => MdePkg/Library/BaseCpuLib/X86BaseCpuLib.c | 8 +--
OvmfPkg/Sec/SecMain.c | 2 +-
UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.c | 2 +-
UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.c | 2 +-
IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf | 2 +-
IntelFsp2Pkg/FspSecCore/SecMain.h | 2 +-
IntelFsp2Pkg/IntelFsp2Pkg.dsc | 2 +-
IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc | 1 -
IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf | 2 +-
IntelFsp2WrapperPkg/FspsWrapperPeim/FspsWrapperPeim.inf | 2 +-
IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc | 2 +-
MdePkg/Include/Library/CpuLib.h | 53 ++++++++++++++++
MdePkg/Library/BaseCpuLib/BaseCpuLib.inf | 7 +++
{UefiCpuPkg/Library/BaseUefiCpuLib => MdePkg/Library/BaseCpuLib}/Ia32/InitializeFpu.nasm | 0
{UefiCpuPkg/Library/BaseUefiCpuLib => MdePkg/Library/BaseCpuLib}/X64/InitializeFpu.nasm | 0
OvmfPkg/AmdSev/AmdSevX64.dsc | 1 -
OvmfPkg/Bhyve/BhyveX64.dsc | 1 -
OvmfPkg/CloudHv/CloudHvX64.dsc | 1 -
OvmfPkg/Microvm/MicrovmX64.dsc | 1 -
OvmfPkg/OvmfPkgIa32.dsc | 1 -
OvmfPkg/OvmfPkgIa32X64.dsc | 1 -
OvmfPkg/OvmfPkgX64.dsc | 1 -
OvmfPkg/OvmfXen.dsc | 1 -
OvmfPkg/Sec/SecMain.inf | 2 +-
PcAtChipsetPkg/PcAtChipsetPkg.dsc | 2 +-
SourceLevelDebugPkg/SourceLevelDebugPkg.dsc | 2 +-
UefiCpuPkg/CpuDxe/CpuDxe.h | 1 -
UefiCpuPkg/CpuDxe/CpuDxe.inf | 1 -
UefiCpuPkg/Include/Library/UefiCpuLib.h | 65 --------------------
UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf | 41 ------------
UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni | 16 -----
UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf | 2 +-
UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf | 2 +-
UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf | 1 -
UefiCpuPkg/Library/MpInitLib/MpLib.h | 1 -
UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf | 1 -
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.h | 2 +-
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf | 1 -
UefiCpuPkg/PiSmmCpuDxeSmm/SmmProfileInternal.h | 1 -
UefiCpuPkg/SecCore/SecCore.inf | 2 +-
UefiCpuPkg/SecCore/SecCoreNative.inf | 2 +-
UefiCpuPkg/SecCore/SecMain.h | 2 +-
UefiCpuPkg/UefiCpuPkg.dec | 5 --
UefiCpuPkg/UefiCpuPkg.dsc | 2 -
UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h | 2 +-
UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf | 2 +-
UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.inf | 2 +-
UefiPayloadPkg/UefiPayloadPkg.dsc | 1 -
48 files changed, 82 insertions(+), 174 deletions(-)
rename UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.c => MdePkg/Library/BaseCpuLib/X86BaseCpuLib.c (93%)
rename {UefiCpuPkg/Library/BaseUefiCpuLib => MdePkg/Library/BaseCpuLib}/Ia32/InitializeFpu.nasm (100%)
rename {UefiCpuPkg/Library/BaseUefiCpuLib => MdePkg/Library/BaseCpuLib}/X64/InitializeFpu.nasm (100%)
delete mode 100644 UefiCpuPkg/Include/Library/UefiCpuLib.h
delete mode 100644 UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf
delete mode 100644 UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.uni