Move ConPlatform module from EdkNT32 package to EdkModulePkg, and remove EdkPeCoffLoaderX64Lib from DxeIplX64 module because EdkPeCoffLoaderLib based on new BasePeCoffLib can support 32bit and 64bit PE iamge both.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1523 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -247,7 +247,7 @@ Returns:
|
||||
//
|
||||
// Install the PEI Protocols that are shared between PEI and DXE
|
||||
//
|
||||
PeiEfiPeiPeCoffLoader = (EFI_PEI_PE_COFF_LOADER_PROTOCOL *)GetPeCoffLoaderX64Protocol ();
|
||||
PeiEfiPeiPeCoffLoader = (EFI_PEI_PE_COFF_LOADER_PROTOCOL *)GetPeCoffLoaderProtocol ();
|
||||
ASSERT (PeiEfiPeiPeCoffLoader != NULL);
|
||||
|
||||
//
|
||||
@@ -313,7 +313,7 @@ Returns:
|
||||
//
|
||||
// Load the DXE Core from a Firmware Volume
|
||||
//
|
||||
Status = PeiLoadx64File (
|
||||
Status = PeiLoadPeImage (
|
||||
PeiEfiPeiPeCoffLoader,
|
||||
DxeCorePe32Data,
|
||||
EfiBootServicesData,
|
||||
@@ -446,7 +446,7 @@ Returns:
|
||||
}
|
||||
|
||||
EFI_STATUS
|
||||
PeiLoadx64File (
|
||||
PeiLoadPeImage (
|
||||
IN EFI_PEI_PE_COFF_LOADER_PROTOCOL *PeiEfiPeiPeCoffLoader,
|
||||
IN VOID *Pe32Data,
|
||||
IN EFI_MEMORY_TYPE MemoryType,
|
||||
@@ -578,7 +578,7 @@ Returns:
|
||||
//
|
||||
// Relocate DxeIpl into memory by using loadfile service
|
||||
//
|
||||
Status = PeiLoadx64File (
|
||||
Status = PeiLoadPeImage (
|
||||
PeiEfiPeiPeCoffLoader,
|
||||
(VOID *) (Section + 1),
|
||||
EfiBootServicesData,
|
||||
@@ -659,7 +659,7 @@ Returns:
|
||||
//
|
||||
// Load the PE image from the FFS file
|
||||
//
|
||||
Status = PeiLoadx64File (
|
||||
Status = PeiLoadPeImage (
|
||||
PeiEfiPeiPeCoffLoader,
|
||||
Pe32Data,
|
||||
EfiBootServicesData,
|
||||
|
Reference in New Issue
Block a user