coreboot-mirror
/
STM
mirror of https://review.coreboot.org/STM.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make SmmMonitorService optional. 

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jiewen Yao <jiewen.yao@intel.com>
This commit is contained in:
Jiewen Yao 2016-10-28 21:45:13 +08:00
parent 25c4e6b9a5
commit 763a620874
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Test/FrmPkg/LoaderApp/Loader.c
View File

@ -891,7 +891,7 @@ LoaderEntrypoint (
Print(L"LoaderEntrypoint: LoadOptions - %s\n", LoadedImage->LoadOptions);
GetArg(LoadedImage->LoadOptions, LoadedImage->LoadOptionsSize);
if (Argc <= 2) {
if (Argc < 2) {
return EFI_INVALID_PARAMETER;
}

27
Test/FrmPkg/LoaderDriver/Loader.c
View File

@ -792,14 +792,19 @@ GetLoadedImageBaseAndSize (
NULL,
(VOID **)&LoadedImage
);
ASSERT_EFI_ERROR (Status);
DEBUG ((EFI_D_INFO, "LoadedImage - [0x%x - 0x%x]\n", (UINTN)LoadedImage->ImageBase, (UINTN)LoadedImage->ImageBase + LoadedImage->ImageSize));
if (!EFI_ERROR (Status)) {
DEBUG ((EFI_D_INFO, "LoadedImage - [0x%x - 0x%x]\n", (UINTN)LoadedImage->ImageBase, (UINTN)LoadedImage->ImageBase + LoadedImage->ImageSize));
if (Address != 0) {
ASSERT ((EFI_PHYSICAL_ADDRESS)(UINTN)LoadedImage->ImageBase <= Address);
ASSERT (Address < ((EFI_PHYSICAL_ADDRESS)(UINTN)LoadedImage->ImageBase + LoadedImage->ImageSize));
}
*ImageBase = (EFI_PHYSICAL_ADDRESS)(UINTN)LoadedImage->ImageBase;
*ImageSize = LoadedImage->ImageSize;
} else {
*ImageBase = 0;
*ImageSize = 0;
}
ASSERT ((EFI_PHYSICAL_ADDRESS)(UINTN)LoadedImage->ImageBase <= Address);
ASSERT (Address < ((EFI_PHYSICAL_ADDRESS)(UINTN)LoadedImage->ImageBase + LoadedImage->ImageSize));
*ImageBase = (EFI_PHYSICAL_ADDRESS)(UINTN)LoadedImage->ImageBase;
*ImageSize = LoadedImage->ImageSize;
return EFI_SUCCESS;
}
@ -1002,9 +1007,11 @@ LoaderEntrypoint (
NULL,
&SmMonitorServiceProtocol
);
ASSERT_EFI_ERROR (Status);
mCommunicationData.SmMonitorServiceProtocol = (EFI_PHYSICAL_ADDRESS)(UINTN)SmMonitorServiceProtocol;
if (!EFI_ERROR (Status)) {
mCommunicationData.SmMonitorServiceProtocol = (EFI_PHYSICAL_ADDRESS)(UINTN)SmMonitorServiceProtocol;
} else {
mCommunicationData.SmMonitorServiceProtocol = 0;
}
Status = GetLoadedImageBaseAndSize (
mCommunicationData.SmMonitorServiceProtocol,