tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-25 22:54:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

UefiPayloadPkg: Support multiple firmware volume

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4164

To support multiple FVs provided by UPL

Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Reviewed-by: James Lu <james.lu@intel.com>
Reviewed-by: Gua Guo <gua.guo@intel.com>

Signed-off-by: MarsX Lin <marsx.lin@intel.com>
This commit is contained in:
MarsX Lin 2022-11-23 15:50:06 +08:00 committed by mergify[bot]
parent 7bee249891
commit a639248bd0
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
View File

@ -310,6 +310,7 @@ BuildHobs (
UNIVERSAL_PAYLOAD_ACPI_TABLE *AcpiTable; UNIVERSAL_PAYLOAD_ACPI_TABLE *AcpiTable;
ACPI_BOARD_INFO *AcpiBoardInfo; ACPI_BOARD_INFO *AcpiBoardInfo;
EFI_HOB_HANDOFF_INFO_TABLE *HobInfo; EFI_HOB_HANDOFF_INFO_TABLE *HobInfo;
UINT8 Idx;
Hob.Raw = (UINT8 *)BootloaderParameter; Hob.Raw = (UINT8 *)BootloaderParameter;
MinimalNeededSize = FixedPcdGet32 (PcdSystemMemoryUefiRegionSize); MinimalNeededSize = FixedPcdGet32 (PcdSystemMemoryUefiRegionSize);
@ -397,11 +398,24 @@ BuildHobs (
GuidHob = GetFirstGuidHob (&gUniversalPayloadExtraDataGuid); GuidHob = GetFirstGuidHob (&gUniversalPayloadExtraDataGuid);
ASSERT (GuidHob != NULL); ASSERT (GuidHob != NULL);
ExtraData = (UNIVERSAL_PAYLOAD_EXTRA_DATA *)GET_GUID_HOB_DATA (GuidHob); ExtraData = (UNIVERSAL_PAYLOAD_EXTRA_DATA *)GET_GUID_HOB_DATA (GuidHob);
ASSERT (ExtraData->Count == 1); DEBUG ((DEBUG_INFO, "Multiple Fv Count=%d\n", ExtraData->Count));
ASSERT (AsciiStrCmp (ExtraData->Entry[0].Identifier, "uefi_fv") == 0); ASSERT (AsciiStrCmp (ExtraData->Entry[0].Identifier, "uefi_fv") == 0);
*DxeFv = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)ExtraData->Entry[0].Base; *DxeFv = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)ExtraData->Entry[0].Base;
ASSERT ((*DxeFv)->FvLength == ExtraData->Entry[0].Size); ASSERT ((*DxeFv)->FvLength == ExtraData->Entry[0].Size);
//
// support multiple FVs provided by UPL
//
for (Idx = 1; Idx < ExtraData->Count; Idx++) {
BuildFvHob (ExtraData->Entry[Idx].Base, ExtraData->Entry[Idx].Size);
DEBUG ((
DEBUG_INFO,
"UPL Multiple fv[%d], Base=0x%x, size=0x%x\n",
Idx,
ExtraData->Entry[Idx].Base,
ExtraData->Entry[Idx].Size
));
}
// //
// Create guid hob for acpi board information // Create guid hob for acpi board information