sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1523 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
lgao4
2006-09-13 05:02:30 +00:00
parent e38eb39cb0
commit fc198a79e0
10 changed files with 1617 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
EdkModulePkg/Core/DxeIplX64Peim/DxeIpl.h
View File

@@ -115,7 +115,7 @@ PeimInitializeDxeIpl (
);
EFI_STATUS
PeiLoadx64File (
PeiLoadPeImage (
IN EFI_PEI_PE_COFF_LOADER_PROTOCOL *PeiEfiPeiPeCoffLoader,
IN VOID *Pe32Data,
IN EFI_MEMORY_TYPE MemoryType,

6
EdkModulePkg/Core/DxeIplX64Peim/DxeIplX64.msa
View File

@@ -42,9 +42,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
<LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>HobLib</Keyword>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>PerformanceLib</Keyword>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>PeiServicesLib</Keyword>
</LibraryClass>
@@ -75,9 +72,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
<LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>MemoryAllocationLib</Keyword>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>EdkPeCoffLoaderX64Lib</Keyword>
</LibraryClass>
</LibraryClassDefinitions>
<SourceFiles>
<Filename>DxeIpl.dxs</Filename>

10
EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c
View File

@@ -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,