//\r
// Install the PEI Protocols that are shared between PEI and DXE\r
//\r
- PeiEfiPeiPeCoffLoader = (EFI_PEI_PE_COFF_LOADER_PROTOCOL *)GetPeCoffLoaderX64Protocol ();\r
+ PeiEfiPeiPeCoffLoader = (EFI_PEI_PE_COFF_LOADER_PROTOCOL *)GetPeCoffLoaderProtocol ();\r
ASSERT (PeiEfiPeiPeCoffLoader != NULL);\r
\r
//\r
\r
ASSERT_EFI_ERROR (Status);\r
Status = PeiRecovery->LoadRecoveryCapsule (PeiServices, PeiRecovery);\r
- ASSERT_EFI_ERROR (Status);\r
+ if (EFI_ERROR (Status)) {\r
+ DEBUG ((EFI_D_ERROR, "Load Recovery Capsule Failed.(Status = %r)\n", Status));\r
+ CpuDeadLoop ();\r
+ }\r
}\r
\r
//\r
//\r
// Load the DXE Core from a Firmware Volume\r
//\r
- Status = PeiLoadx64File (\r
+ Status = PeiLoadPeImage (\r
PeiEfiPeiPeCoffLoader,\r
DxeCorePe32Data,\r
EfiBootServicesData,\r
\r
//\r
// If we get here, then the DXE Core returned. This is an error\r
+ // Dxe Core should not return.\r
//\r
- ASSERT_EFI_ERROR (Status);\r
+ ASSERT (FALSE);\r
+ CpuDeadLoop ();\r
\r
return EFI_OUT_OF_RESOURCES;\r
}\r
}\r
\r
EFI_STATUS\r
-PeiLoadx64File (\r
+PeiLoadPeImage (\r
IN EFI_PEI_PE_COFF_LOADER_PROTOCOL *PeiEfiPeiPeCoffLoader,\r
IN VOID *Pe32Data,\r
IN EFI_MEMORY_TYPE MemoryType,\r
//\r
// Relocate DxeIpl into memory by using loadfile service\r
//\r
- Status = PeiLoadx64File (\r
+ Status = PeiLoadPeImage (\r
PeiEfiPeiPeCoffLoader,\r
(VOID *) (Section + 1),\r
EfiBootServicesData,\r
//\r
// Load the PE image from the FFS file\r
//\r
- Status = PeiLoadx64File (\r
+ Status = PeiLoadPeImage (\r
PeiEfiPeiPeCoffLoader,\r
Pe32Data,\r
EfiBootServicesData,\r