X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFspWrapperPkg%2FFspInitPei%2FFspInitPei.c;h=48a030709b03e73e282556660673f9953c2363bc;hp=17a646836ab770e5426baf8201565c0b95e061f6;hb=95c95ac0efb10fe4b608a3388d928eb947c15085;hpb=4701d96534f2228b6f4aa925606566d2c2bb55be diff --git a/IntelFspWrapperPkg/FspInitPei/FspInitPei.c b/IntelFspWrapperPkg/FspInitPei/FspInitPei.c index 17a646836a..48a030709b 100644 --- a/IntelFspWrapperPkg/FspInitPei/FspInitPei.c +++ b/IntelFspWrapperPkg/FspInitPei/FspInitPei.c @@ -42,17 +42,21 @@ FspPeiEntryPoint ( return EFI_DEVICE_ERROR; } + ASSERT (FspHeader->TempRamInitEntryOffset != 0); + ASSERT (FspHeader->FspInitEntryOffset != 0); + ASSERT (FspHeader->NotifyPhaseEntryOffset != 0); + if ((PcdGet8 (PcdFspApiVersion) >= 2) && (FspHeader->HeaderRevision >= FSP_HEADER_REVISION_2) && - (FspHeader->ApiEntryNum >= 6) && - (FspHeader->FspMemoryInitEntryOffset != 0) && - (FspHeader->TempRamExitEntryOffset != 0) && - (FspHeader->FspSiliconInitEntryOffset != 0) ) { - PcdFspApiVersion = FSP_HEADER_REVISION_2; + (FspHeader->ApiEntryNum >= 6) ) { + ASSERT (FspHeader->FspMemoryInitEntryOffset != 0); + ASSERT (FspHeader->TempRamExitEntryOffset != 0); + ASSERT (FspHeader->FspSiliconInitEntryOffset != 0); + PcdFspApiVersion = PcdGet8 (PcdFspApiVersion); } DEBUG ((DEBUG_INFO, "PcdFspApiVersion - 0x%x\n", PcdFspApiVersion)); - if (PcdFspApiVersion == FSP_HEADER_REVISION_1) { + if (PcdFspApiVersion == 1) { PeiFspInitV1 (FspHeader); } else { PeiFspInitV2 (FspHeader);