Reviewed-by: Zailiang Sun <zailiang....@intel.com> > -----Original Message----- > From: Kinney, Michael D > Sent: Thursday, May 9, 2019 12:31 PM > To: devel@edk2.groups.io > Cc: Sun, Zailiang <zailiang....@intel.com>; Qian, Yi <yi.q...@intel.com> > Subject: [Patch 08/16] Vlv2TbltDevicePkg: Use CpuDxe from UefiCpuPkg > > Use CpuDxe module from UefiCPuPkg instead of pre-built binary module > MpCpu. > > Cc: Zailiang Sun <zailiang....@intel.com> > Cc: Yi Qian <yi.q...@intel.com> > Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com> > --- > Vlv2TbltDevicePkg/PlatformPkg.fdf | 2 +- > Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 2 +- > Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 8 ++++++-- > Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 7 +++++-- > Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 10 ++++++++-- > 5 files changed, 21 insertions(+), 8 deletions(-) > > diff --git a/Vlv2TbltDevicePkg/PlatformPkg.fdf > b/Vlv2TbltDevicePkg/PlatformPkg.fdf > index be05fa136b..c725cdcf31 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkg.fdf > +++ b/Vlv2TbltDevicePkg/PlatformPkg.fdf > @@ -458,7 +458,7 @@ [FV.FVMAIN] > INF > MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHan > dlerRuntimeDxe.inf > INF > MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCod > eRouterSmm.inf > INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf > -INF RuleOverride = BINARY > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ > ARCHITECTURE)/MpCpu.inf > +INF UefiCpuPkg/CpuDxe/CpuDxe.inf > INF $(PLATFORM_PACKAGE)/Metronome/Metronome.inf > INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf > !if $(ARCH) == IA32 > diff --git a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf > b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf > index d3c7409c4b..349fbb2887 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf > +++ b/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf > @@ -414,7 +414,7 @@ [FV.FVMAIN] > INF > MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHan > dlerRuntimeDxe.inf > INF > MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCod > eRouterSmm.inf > INF MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf > -INF RuleOverride = BINARY > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/$(DXE_ > ARCHITECTURE)/MpCpu.inf > +INF UefiCpuPkg/CpuDxe/CpuDxe.inf > INF $(PLATFORM_PACKAGE)/Metronome/Metronome.inf > INF IntelFrameworkModulePkg/Universal/BdsDxe/BdsDxe.inf > !if $(ARCH) == IA32 > diff --git a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > index eb1a732683..44a5806153 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > @@ -199,7 +199,8 @@ [LibraryClasses.common] > # > MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf > > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.in > f > - > CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibN > ull/CpuExceptionHandlerLibNull.inf > + > + > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeC > p > + uExceptionHandlerLib.inf > + MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf > > # > # ICH > @@ -316,7 +317,8 @@ [LibraryClasses.IA32.PEIM, > LibraryClasses.IA32.PEI_CORE, LibraryClasses.IA32.SEC > > ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiEx > tractGuidedSectionLib.inf > > MultiPlatformLib|$(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPl > atformLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf > - > + > + > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecP > e > + iCpuExceptionHandlerLib.inf > + MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf > > !if $(PERFORMANCE_ENABLE) == TRUE > > PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanc > eLib.inf > @@ -1087,6 +1089,7 @@ [Components.X64] > PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf > > MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemory > AllocationLib.inf > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > + > + > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecP > e > + iCpuExceptionHandlerLib.inf > !if $(SOURCE_DEBUG_ENABLE) == TRUE > > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAg > entLib.inf > !endif > @@ -1304,6 +1307,7 @@ [Components.X64] > # > MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf > MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf > + UefiCpuPkg/CpuDxe/CpuDxe.inf > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf > UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf > MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf > diff --git a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > index d1144db9d9..bff0fe21af 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > @@ -199,7 +199,8 @@ [LibraryClasses.common] > # > MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf > > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.in > f > - > CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibN > ull/CpuExceptionHandlerLibNull.inf > + > + > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeC > p > + uExceptionHandlerLib.inf > + MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf > > # > # ICH > @@ -316,7 +317,8 @@ [LibraryClasses.IA32.PEIM, > LibraryClasses.IA32.PEI_CORE, LibraryClasses.IA32.SEC > > ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiEx > tractGuidedSectionLib.inf > > MultiPlatformLib|$(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPl > atformLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf > - > + > + > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecP > e > + iCpuExceptionHandlerLib.inf > + MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf > > !if $(PERFORMANCE_ENABLE) == TRUE > > PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanc > eLib.inf > @@ -1292,6 +1294,7 @@ [Components.IA32] > # > MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf > MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf > + UefiCpuPkg/CpuDxe/CpuDxe.inf > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf > UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf > MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf > diff --git a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > index 1784554160..7630b48ea6 100644 > --- a/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > +++ b/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > @@ -199,7 +199,8 @@ [LibraryClasses.common] > # > MtrrLib|UefiCpuPkg/Library/MtrrLib/MtrrLib.inf > > LocalApicLib|UefiCpuPkg/Library/BaseXApicX2ApicLib/BaseXApicX2ApicLib.in > f > - > CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibN > ull/CpuExceptionHandlerLibNull.inf > + > + > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeC > p > + uExceptionHandlerLib.inf > + MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf > > # > # ICH > @@ -275,6 +276,8 @@ [LibraryClasses.common] > I2cLib|Vlv2TbltDevicePkg/Library/I2CLib/I2CLibNull.inf > !endif > ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf > + > + > ShellCommandLib|ShellPkg/Library/UefiShellCommandLib/UefiShellComma > ndL > + ib.inf > + HandleParsingLib|ShellPkg/Library/UefiHandleParsingLib/UefiHandleParsi > + ngLib.inf > FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf > SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf > !if $(FTPM_ENABLE) == TRUE || $(NETWORK_ISCSI_ENABLE) == TRUE @@ - > 316,7 +319,8 @@ [LibraryClasses.IA32.PEIM, LibraryClasses.IA32.PEI_CORE, > LibraryClasses.IA32.SEC > > ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiEx > tractGuidedSectionLib.inf > > MultiPlatformLib|$(PLATFORM_PACKAGE)/Library/MultiPlatformLib/MultiPl > atformLib.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/PeiCryptLib.inf > - > + > + > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecP > e > + iCpuExceptionHandlerLib.inf > + MpInitLib|UefiCpuPkg/Library/MpInitLib/PeiMpInitLib.inf > > !if $(PERFORMANCE_ENABLE) == TRUE > > PerformanceLib|MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanc > eLib.inf > @@ -1087,6 +1091,7 @@ [Components.X64] > PcdLib|MdePkg/Library/PeiPcdLib/PeiPcdLib.inf > > MemoryAllocationLib|MdePkg/Library/PeiMemoryAllocationLib/PeiMemory > AllocationLib.inf > HobLib|MdePkg/Library/PeiHobLib/PeiHobLib.inf > + > + > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecP > e > + iCpuExceptionHandlerLib.inf > !if $(SOURCE_DEBUG_ENABLE) == TRUE > > DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SecPeiDebugAg > entLib.inf > !endif > @@ -1304,6 +1309,7 @@ [Components.X64] > # > MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf > MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf > + UefiCpuPkg/CpuDxe/CpuDxe.inf > UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf > UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf > MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf > -- > 2.21.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40295): https://edk2.groups.io/g/devel/message/40295 Mute This Topic: https://groups.io/mt/31551777/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
