Hello EDK II community, This fixes allow finish building without errors. Now we are trying start payload by SBL. fix: fixing uefi for building with smm (for spi variables saving) --- .gitignore                        |  2 ++ UefiPayloadPkg/UefiPayloadPkg.dsc | 21 ++++++++++++++++----- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 274a66ce80..1d301e800e 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,5 @@ __pycache__/ tags/ .vscode/ .venv/ + +*.log \ No newline at end of file diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc index 776773fcb5..3ebdfe90ce 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.dsc +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc @@ -27,11 +27,12 @@ PCD_DYNAMIC_AS_DYNAMICEX            = TRUE DEFINE SOURCE_DEBUG_ENABLE          = FALSE -  DEFINE PS2_KEYBOARD_ENABLE          = FALSE +  DEFINE PS2_KEYBOARD_ENABLE          = TRUE DEFINE RAM_DISK_ENABLE              = FALSE -  DEFINE SIO_BUS_ENABLE               = FALSE +  DEFINE SIO_BUS_ENABLE               = TRUE DEFINE SECURITY_STUB_ENABLE         = TRUE -  DEFINE SMM_SUPPORT                  = FALSE +  DEFINE SMM_SUPPORT                  = TRUE +  #DEFINE SMM_SUPPORT                  = FALSE DEFINE PLATFORM_BOOT_TIMEOUT        = 3 DEFINE BOOT_MANAGER_ESCAPE          = FALSE DEFINE ATA_ENABLE                   = TRUE @@ -56,7 +57,8 @@ # ELF: Build UniversalPayload file as UniversalPayload.elf # FIT: Build UniversalPayload file as UniversalPayload.fit # -  DEFINE UNIVERSAL_PAYLOAD            = FALSE +  DEFINE UNIVERSAL_PAYLOAD            = TRUE +  #DEFINE UNIVERSAL_PAYLOAD            = FALSE DEFINE UNIVERSAL_PAYLOAD_FORMAT     = ELF # @@ -126,7 +128,8 @@ # SPI:      UEFI payload with SPI NV variable support # NONE:     UEFI payload with no variable modules # -  DEFINE VARIABLE_SUPPORT      = EMU +  #DEFINE VARIABLE_SUPPORT      = EMU +  DEFINE VARIABLE_SUPPORT      = SPI DEFINE DISABLE_RESET_SYSTEM  = FALSE DEFINE NETWORK_DRIVER_ENABLE = FALSE @@ -436,6 +439,7 @@ SmmCorePlatformHookLib|MdeModulePkg/Library/SmmCorePlatformHookLibNull/SmmCorePlatformHookLibNull.inf SmmMemLib|MdePkg/Library/SmmMemLib/SmmMemLib.inf ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf +  SmmCpuSyncLib|UefiCpuPkg/Library/SmmCpuSyncLib/SmmCpuSyncLib.inf !if $(PERFORMANCE_MEASUREMENT_ENABLE) PerformanceLib|MdeModulePkg/Library/SmmCorePerformanceLib/SmmCorePerformanceLib.inf !endif @@ -455,6 +459,7 @@ CpuExceptionHandlerLib|UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf ReportStatusCodeLib|MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.inf SmmCpuRendezvousLib|UefiCpuPkg/Library/SmmCpuRendezvousLib/SmmCpuRendezvousLib.inf +  SmmCpuSyncLib|UefiCpuPkg/Library/SmmCpuSyncLib/SmmCpuSyncLib.inf !if $(PERFORMANCE_MEASUREMENT_ENABLE) PerformanceLib|MdeModulePkg/Library/SmmPerformanceLib/SmmPerformanceLib.inf !endif @@ -916,6 +921,12 @@ MdeModulePkg/Core/PiSmmCore/PiSmmCore.inf UefiPayloadPkg/PchSmiDispatchSmm/PchSmiDispatchSmm.inf UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf +  UefiCpuPkg/PiSmmCpuDxeSmm/PiSmmCpuDxeSmm.inf { +    # +    #  FILE_GUID = B7242C74-BD21-49EE-84B4-07162E8C080D +     +      MmSaveStateLib|UefiCpuPkg/Library/MmSaveStateLib/IntelMmSaveStateLib.inf +  } UefiCpuPkg/CpuIo2Smm/CpuIo2Smm.inf !if $(PERFORMANCE_MEASUREMENT_ENABLE) MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/FirmwarePerformanceSmm.inf -- -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#121152): https://edk2.groups.io/g/devel/message/121152 Mute This Topic: https://groups.io/mt/110868214/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-