On Thu, 2 Jun 2022 at 21:08, Dov Murik <dovmu...@linux.ibm.com> wrote: > > Gerd, thanks for the cleanup. > > > Tested-by: Dov Murik <dovmu...@linux.ibm.com> > Reviewed-by: Dov Murik <dovmu...@linux.ibm.com> >
Merged as #2939. Thanks. > > On 02/06/2022 12:11, Gerd Hoffmann wrote: > > Signed-off-by: Gerd Hoffmann <kra...@redhat.com> > > --- > > OvmfPkg/AmdSev/AmdSevX64.dsc | 47 ------------------------------------ > > OvmfPkg/AmdSev/AmdSevX64.fdf | 15 ------------ > > 2 files changed, 62 deletions(-) > > > > diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc > > index fc1fdb2e2297..6b3827f7f6ed 100644 > > --- a/OvmfPkg/AmdSev/AmdSevX64.dsc > > +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc > > @@ -93,14 +93,6 @@ [BuildOptions.common.EDKII.DXE_RUNTIME_DRIVER] > > XCODE:*_*_*_MTOC_FLAGS = -align 0x1000 > > CLANGPDB:*_*_*_DLINK_FLAGS = /ALIGN:4096 > > > > -# Force PE/COFF sections to be aligned at 4KB boundaries to support page > > level > > -# protection of DXE_SMM_DRIVER/SMM_CORE modules > > -[BuildOptions.common.EDKII.DXE_SMM_DRIVER, > > BuildOptions.common.EDKII.SMM_CORE] > > - GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000 > > - XCODE:*_*_*_DLINK_FLAGS = -seg1addr 0x1000 -segalign 0x1000 > > - XCODE:*_*_*_MTOC_FLAGS = -align 0x1000 > > - CLANGPDB:*_*_*_DLINK_FLAGS = /ALIGN:4096 > > - > > > > ################################################################################ > > # > > # SKU Identification section - list of all SKU IDs supported by this > > Platform. > > @@ -380,45 +372,6 @@ [LibraryClasses.common.UEFI_APPLICATION] > > !endif > > PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > > > > -[LibraryClasses.common.DXE_SMM_DRIVER] > > - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > > - TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > > - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf > > - > > MemoryAllocationLib|MdePkg/Library/SmmMemoryAllocationLib/SmmMemoryAllocationLib.inf > > - > > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf > > - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > > - SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf > > - > > MmServicesTableLib|MdePkg/Library/MmServicesTableLib/MmServicesTableLib.inf > > - > > SmmServicesTableLib|MdePkg/Library/SmmServicesTableLib/SmmServicesTableLib.inf > > -!ifdef $(DEBUG_ON_SERIAL_PORT) > > - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > > -!else > > - > > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > > -!endif > > - > > CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf > > -!if $(SOURCE_DEBUG_ENABLE) == TRUE > > - DebugAgentLib|SourceLevelDebugPkg/Library/DebugAgent/SmmDebugAgentLib.inf > > -!endif > > - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf > > - PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > > - > > -[LibraryClasses.common.SMM_CORE] > > - PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf > > - TimerLib|OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf > > - ResetSystemLib|OvmfPkg/Library/ResetSystemLib/DxeResetSystemLib.inf > > - > > SmmCorePlatformHookLib|MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf > > - > > MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf > > - > > ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.inf > > - HobLib|MdePkg/Library/DxeHobLib/DxeHobLib.inf > > - SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf > > - > > SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf > > -!ifdef $(DEBUG_ON_SERIAL_PORT) > > - DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf > > -!else > > - > > DebugLib|OvmfPkg/Library/PlatformDebugLibIoPort/PlatformDebugLibIoPort.inf > > -!endif > > - PciLib|OvmfPkg/Library/DxePciLibI440FxQ35/DxePciLibI440FxQ35.inf > > - > > > > ################################################################################ > > # > > # Pcd Section - list of all EDK II PCD Entries defined by this Platform. > > diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf > > index 844ba8a116d8..4658e1d30ed0 100644 > > --- a/OvmfPkg/AmdSev/AmdSevX64.fdf > > +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf > > @@ -436,18 +436,3 @@ [Rule.Common.SEC.RESET_VECTOR] > > FILE RAW = $(NAMED_GUID) { > > RAW BIN Align = 16 |.bin > > } > > - > > -[Rule.Common.SMM_CORE] > > - FILE SMM_CORE = $(NAMED_GUID) { > > - PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi > > - UI STRING="$(MODULE_NAME)" Optional > > - VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) > > - } > > - > > -[Rule.Common.DXE_SMM_DRIVER] > > - FILE SMM = $(NAMED_GUID) { > > - SMM_DEPEX SMM_DEPEX Optional $(INF_OUTPUT)/$(MODULE_NAME).depex > > - PE32 PE32 $(INF_OUTPUT)/$(MODULE_NAME).efi > > - UI STRING="$(MODULE_NAME)" Optional > > - VERSION STRING="$(INF_VERSION)" Optional BUILD_NUM=$(BUILD_NUMBER) > > - } -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#90171): https://edk2.groups.io/g/devel/message/90171 Mute This Topic: https://groups.io/mt/91495846/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-