Skip to content

Commit

Permalink
Platform/Intel: Include required StandaloneMm modules
Browse files Browse the repository at this point in the history 
Include required StandaloneMm Drivers and Libs under
PcdStandaloneMmEnable PCD.

Change the PcdStandaloneMmEnable to TRUE to enable
the MM on QSP.

Signed-off-by: Jiaxin Wu <[email protected]>
  • Loading branch information
@jiaxinwu @ChaselChiu
jiaxinwu authored and ChaselChiu committed Sep 18, 2024
1 parent 5ee0b00 commit ff36115
Show file tree
Hide file tree
Showing 10 changed files with 167 additions and 57 deletions.
2 changes: 1 addition & 1 deletion Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
#
# Platform
#
TimerLib|PcAtChipsetPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.inf
TimerLib|UefiCpuPkg/Library/CpuTimerLib/BaseCpuTimerLib.inf

#
# Misc
Expand Down
64 changes: 46 additions & 18 deletions Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeInclude.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,25 @@
#
# Real variables for stages 5+
#
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable == TRUE
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandaloneMm.inf
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf {
<LibraryClasses>
NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
NULL|MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLibStandaloneMm.inf
}

!else
MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf {
<LibraryClasses>
NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
NULL|MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLib.inf
}
!endif

MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf {
<LibraryClasses>
NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
NULL|MdeModulePkg/Library/VarCheckHiiLib/VarCheckHiiLib.inf
NULL|MdeModulePkg/Library/VarCheckPolicyLib/VarCheckPolicyLib.inf
}

MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf

Expand Down Expand Up @@ -126,21 +137,33 @@
PcdLib|MdePkg/Library/DxePcdLib/DxePcdLib.inf
}

MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable == TRUE
StandaloneMmPkg/Drivers/StandaloneMmIplPei/StandaloneMmIplPei.inf
StandaloneMmPkg/Core/StandaloneMmCore.inf {
<LibraryClasses>
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
HobPrintLib|MdeModulePkg/Library/HobPrintLib/HobPrintLib.inf
}

MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterStandaloneMm.inf
MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerStandaloneMm.inf
UefiCpuPkg/CpuIo2Smm/CpuIo2StandaloneMm.inf
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceStandaloneMm.inf
!else
MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf

MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
!endif

MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf

#UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf

UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf
MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf

MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf

!if gMinPlatformPkgTokenSpaceGuid.PcdUefiSecureBootEnable == TRUE
Expand All @@ -155,7 +178,12 @@
NULL|SecurityPkg/Library/Tpm2DeviceLibDTpm/Tpm2InstanceLibDTpm.inf
NULL|SecurityPkg/Library/HashInstanceLibSha256/HashInstanceLibSha256.inf
}
SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable == TRUE
SecurityPkg/Tcg/Tcg2Smm/Tcg2StandaloneMm.inf
!else
SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
!endif

SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf
SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
!endif
Expand Down
31 changes: 30 additions & 1 deletion Platform/Intel/MinPlatformPkg/Include/Dsc/CoreDxeLib.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@

HstiLib|MdePkg/Library/DxeHstiLib/DxeHstiLib.inf

LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable == TRUE
LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf
!else
LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxDxeLib.inf
!endif

CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf
MpInitLib|UefiCpuPkg/Library/MpInitLib/DxeMpInitLib.inf
Expand Down Expand Up @@ -93,6 +97,31 @@
VariableReadLib|MinPlatformPkg/Library/SmmVariableReadLib/TraditionalMmVariableReadLib.inf
VariableWriteLib|MinPlatformPkg/Library/SmmVariableWriteLib/TraditionalMmVariableWriteLib.inf

[LibraryClasses.common.MM_STANDALONE]
MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmMemoryAllocationLib/StandaloneMmMemoryAllocationLib.inf
ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/StandaloneMmReportStatusCodeLib.inf
HobLib|StandaloneMmPkg/Library/StandaloneMmHobLib/StandaloneMmHobLib.inf
StandaloneMmDriverEntryPoint|MdePkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf
DebugLib|MdePkg/Library/BaseDebugLibSerialPort/BaseDebugLibSerialPort.inf
MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/StandaloneMmServicesTableLib.inf
MemLib|StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf
DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibStandaloneMm.inf
SmmCpuPlatformHookLib|UefiCpuPkg/Library/SmmCpuPlatformHookLibNull/SmmCpuPlatformHookLibNull.inf
MmSaveStateLib|UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf
SmmCpuFeaturesLib|UefiCpuPkg/Library/SmmCpuFeaturesLib/StandaloneMmCpuFeaturesLib.inf
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf
CcExitLib|UefiCpuPkg/Library/CcExitLibNull/CcExitLibNull.inf

[LibraryClasses.common.MM_CORE_STANDALONE]
HobLib|StandaloneMmPkg/Library/StandaloneMmCoreHobLib/StandaloneMmCoreHobLib.inf
ReportStatusCodeLib|MdeModulePkg/Library/SmmReportStatusCodeLib/StandaloneMmReportStatusCodeLib.inf
ExtractGuidedSectionLib|MdePkg/Library/BaseExtractGuidedSectionLib/BaseExtractGuidedSectionLib.inf
FvLib|StandaloneMmPkg/Library/FvLib/FvLib.inf
MemoryAllocationLib|StandaloneMmPkg/Library/StandaloneMmCoreMemoryAllocationLib/StandaloneMmCoreMemoryAllocationLib.inf
MemLib|StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf
StandaloneMmCoreEntryPoint|StandaloneMmPkg/Library/StandaloneMmCoreEntryPoint/StandaloneMmCoreEntryPoint.inf
MmServicesTableLib|MdePkg/Library/StandaloneMmServicesTableLib/StandaloneMmServicesTableLib.inf

[LibraryClasses.common.SMM_CORE]
MemoryAllocationLib|MdeModulePkg/Library/PiSmmCoreMemoryAllocationLib/PiSmmCoreMemoryAllocationLib.inf
SmmServicesTableLib|MdeModulePkg/Library/PiSmmCoreSmmServicesTableLib/PiSmmCoreSmmServicesTableLib.inf
Expand Down
7 changes: 6 additions & 1 deletion Platform/Intel/MinPlatformPkg/Include/Dsc/CorePeiLib.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@
ReportStatusCodeLib|MdeModulePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.inf
ExtractGuidedSectionLib|MdePkg/Library/PeiExtractGuidedSectionLib/PeiExtractGuidedSectionLib.inf
DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibBase.inf
LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable == TRUE
LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf
!else
LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
!endif
CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf

!if gMinPlatformPkgTokenSpaceGuid.PcdPerformanceEnable == TRUE
Expand Down Expand Up @@ -64,3 +68,4 @@

SmmRelocationLib|UefiCpuPkg/Library/SmmRelocationLib/SmmRelocationLib.inf
SmmControlLib|IntelSiliconPkg/Feature/SmmControl/Library/PeiSmmControlLib/PeiSmmControlLib.inf
MmUnblockMemoryLib|UefiCpuPkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLib.inf
48 changes: 33 additions & 15 deletions Platform/Intel/MinPlatformPkg/Include/Fdf/CoreOsBootInclude.fdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,44 @@
##

!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmmRuntimeDxe.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable == TRUE
INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteStandaloneMm.inf
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableStandaloneMm.inf
!else
INF MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteSmm.inf
INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf
!endif
!endif

!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf
INF MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
INF MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
#INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
INF MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf
INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
INF MdeModulePkg/Universal/SmmCommunicationBufferDxe/SmmCommunicationBufferDxe.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable == TRUE
INF StandaloneMmPkg/Core/StandaloneMmCore.inf
INF StandaloneMmPkg/Drivers/StandaloneMmIplPei/StandaloneMmIplPei.inf

INF MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterStandaloneMm.inf
INF MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerStandaloneMm.inf
INF UefiCpuPkg/CpuIo2Smm/CpuIo2StandaloneMm.inf
!else
INF MdeModulePkg/Core/PiSmmCore/PiSmmIpl.inf
INF MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf

INF MdeModulePkg/Universal/ReportStatusCodeRouter/Smm/ReportStatusCodeRouterSmm.inf
INF MdeModulePkg/Universal/StatusCodeHandler/Smm/StatusCodeHandlerSmm.inf
INF UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf
INF MdeModulePkg/Universal/LockBox/SmmLockBox/SmmLockBox.inf
!endif
!endif

!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/FirmwarePerformanceDxe.inf
INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable == TRUE
INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceStandaloneMm.inf
!else
INF MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf
!endif
!endif

14 changes: 9 additions & 5 deletions Platform/Intel/MinPlatformPkg/Include/Fdf/CoreSecurityLateInclude.fdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,13 @@ INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.i
!endif

!if gMinPlatformPkgTokenSpaceGuid.PcdTpm2Enable == TRUE
INF SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
INF SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
INF RuleOverride = DRIVER_ACPITABLE SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf
INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
INF SecurityPkg/Tcg/MemoryOverwriteControl/TcgMor.inf
INF SecurityPkg/Tcg/Tcg2Dxe/Tcg2Dxe.inf
INF RuleOverride = DRIVER_ACPITABLE SecurityPkg/Tcg/Tcg2Acpi/Tcg2Acpi.inf
INF SecurityPkg/Tcg/Tcg2Config/Tcg2ConfigDxe.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable == TRUE
INF SecurityPkg/Tcg/Tcg2Smm/Tcg2StandaloneMm.inf
!else
INF SecurityPkg/Tcg/Tcg2Smm/Tcg2Smm.inf
!endif
!endif
1 change: 1 addition & 0 deletions Platform/Intel/MinPlatformPkg/MinPlatformPkg.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
TestPointCheckLib|MinPlatformPkg/Test/Library/TestPointCheckLib/PeiTestPointCheckLib.inf
TestPointLib|MinPlatformPkg/Test/Library/TestPointLib/PeiTestPointLib.inf
SetCacheMtrrLib|MinPlatformPkg/Library/SetCacheMtrrLib/SetCacheMtrrLibNull.inf
MmUnblockMemoryLib|UefiCpuPkg/Library/MmUnblockMemoryLib/MmUnblockMemoryLib.inf

[LibraryClasses.common.DXE_DRIVER]
#
Expand Down
43 changes: 30 additions & 13 deletions Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@
CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf
SerialPortLib|PcAtChipsetPkg/Library/SerialIoLib/SerialIoLib.inf
StandaloneMmMemLib|StandaloneMmPkg/Library/StandaloneMmMemLib/StandaloneMmMemLib.inf

#####################################
# Platform Package
Expand Down Expand Up @@ -168,7 +169,7 @@
BoardBdsHookLib|$(BOARD_PKG)/Library/BoardBdsHookLib/BoardBdsHookLib.inf
BoardBootManagerLib|$(BOARD_PKG)/Library/BoardBootManagerLib/BoardBootManagerLib.inf

[LibraryClasses.common.DXE_SMM_DRIVER]
[LibraryClasses.common.DXE_SMM_DRIVER, LibraryClasses.common.MM_STANDALONE]
#######################################
# Silicon Initialization Package
#######################################
Expand All @@ -183,10 +184,7 @@
#######################################
# S3 SMM driver
# @todo: UefiCpuPkg/PiSmmCommunication/PiSmmCommunicationPei.inf
UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf {
<LibraryClasses>
LockBoxLib|MdeModulePkg/Library/SmmLockBoxLib/SmmLockBoxPeiLib.inf
}
UefiCpuPkg/Universal/Acpi/S3Resume2Pei/S3Resume2Pei.inf

#######################################
# Silicon Initialization Package
Expand Down Expand Up @@ -248,9 +246,20 @@
MdeModulePkg/Universal/PrintDxe/PrintDxe.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable == TRUE
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuStandaloneMm.inf
!else
UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
!endif
!endif
UefiCpuPkg/CpuDxe/CpuDxe.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable == TRUE
StandaloneMmPkg/Drivers/MmCommunicationDxe/MmCommunicationDxe.inf {
<LibraryClasses>
NULL|StandaloneMmPkg/Library/VariableMmDependency/VariableMmDependency.inf
NULL|StandaloneMmPkg/Library/SmmLockBoxMmDependency/SmmLockBoxMmDependency.inf
}
!endif

ShellPkg/Application/Shell/Shell.inf {
<PcdsFixedAtBuild>
Expand Down Expand Up @@ -283,18 +292,26 @@
# Silicon Initialization Package
#######################################
SimicsIch10BinPkg/UndiBinary/UndiDxe.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
$(PCH_PKG)/SmmControl/RuntimeDxe/SmmControl2Dxe.inf
$(PCH_PKG)/Spi/Smm/PchSpiSmm.inf
IntelSiliconPkg/Feature/SmmAccess/SmmAccessDxe/SmmAccess.inf
IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf
!endif
!if gMinPlatformPkgTokenSpaceGuid.PcdBootToShellOnly == FALSE
$(PCH_PKG)/SmmControl/RuntimeDxe/SmmControl2Dxe.inf
IntelSiliconPkg/Feature/SmmAccess/SmmAccessDxe/SmmAccess.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable == TRUE
$(PCH_PKG)/Spi/Smm/PchSpiStandaloneMm.inf
IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf
!else
$(PCH_PKG)/Spi/Smm/PchSpiSmm.inf
IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf
!endif
!endif

#####################################
# Platform Package
#####################################
$(PLATFORM_PACKAGE)/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf
$(PLATFORM_PACKAGE)/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf
!if gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable == TRUE
!else
$(PLATFORM_PACKAGE)/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf
!endif

#######################################
# Board Package
Expand Down
12 changes: 10 additions & 2 deletions Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkg.fdf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ INF MdeModulePkg/Bus/Scsi/ScsiDiskDxe/ScsiDiskDxe.inf

INF MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf
INF MdeModulePkg/Bus/Ata/AtaBusDxe/AtaBusDxe.inf
INF IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf
INF MdeModulePkg/Bus/Pci/NvmExpressDxe/NvmExpressDxe.inf
INF BoardModulePkg/LegacySioDxe/LegacySioDxe.inf
INF BoardModulePkg/BoardBdsHookDxe/BoardBdsHookDxe.inf
Expand All @@ -219,9 +218,18 @@ INF RuleOverride=ACPITABLE $(BOARD_PKG)/AcpiTables/AcpiTables.inf

INF $(BOARD_PKG)/SimicsVideoDxe/SimicsVideoDxe.inf
INF MinPlatformPkg/PlatformInit/PlatformInitDxe/PlatformInitDxe.inf
INF MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf
INF $(BOARD_PKG)/SimicsDxe/SimicsDxe.inf

!if gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable == TRUE
#INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuStandaloneMm.inf
INF StandaloneMmPkg/Drivers/MmCommunicationDxe/MmCommunicationDxe.inf
INF IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceStandaloneMm.inf
!else
#INF UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf
INF IntelSiliconPkg/Feature/Flash/SpiFvbService/SpiFvbServiceSmm.inf
INF MinPlatformPkg/PlatformInit/PlatformInitSmm/PlatformInitSmm.inf
!endif

FILE FREEFORM = 7BB28B99-61BB-11D5-9A5D-0090273FC14D {
SECTION RAW = $(BOARD_PKG)/Logo/Logo.bmp
}
Expand Down
2 changes: 1 addition & 1 deletion Platform/Intel/SimicsOpenBoardPkg/BoardX58Ich10/OpenBoardPkgPcd.dsc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmEnableBspElection|FALSE
gUefiCpuPkgTokenSpaceGuid.PcdSmmFeatureControlEnable|FALSE
gUefiCpuPkgTokenSpaceGuid.PcdSmrrEnable|TRUE
gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable|FALSE
gMinPlatformPkgTokenSpaceGuid.PcdStandaloneMmEnable|TRUE

######################################
# Platform Configuration
Expand Down

0 comments on commit ff36115

Please sign in to comment.