!endif\r
\r
ResetSystemLib|OvmfPkg/Library/ResetSystemLib/ResetSystemLib.inf\r
- LocalApicLib|UefiCpuPkg/Library/BaseXApicLib/BaseXApicLib.inf\r
+ LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.inf\r
DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf\r
\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
!endif\r
!if $(SMM_REQUIRE) == TRUE\r
gUefiOvmfPkgTokenSpaceGuid.PcdSmmSmramRequire|TRUE\r
+ gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE\r
!endif\r
\r
[PcdsFixedAtBuild]\r
!endif\r
\r
[PcdsFixedAtBuild.X64]\r
+!if $(SMM_REQUIRE) == TRUE\r
+ gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmSyncMode|0x01\r
+!endif\r
+\r
!if $(SECURE_BOOT_ENABLE) == TRUE\r
# override the default values from SecurityPkg to ensure images from all sources are verified in secure boot\r
gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04\r