diff options
| author | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-09-13 05:02:30 +0000 |
|---|---|---|
| committer | lgao4 <lgao4@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-09-13 05:02:30 +0000 |
| commit | fc198a79e05d1e9fe6099f5284a1cd2aba0f0410 (patch) | |
| tree | 5e11c4c235e80d4583db51995b1255d100f3a029 /EdkModulePkg/Core | |
| parent | e38eb39cb0d94f96acdc890699e850820168d8be (diff) | |
| download | edk2-platforms-fc198a79e05d1e9fe6099f5284a1cd2aba0f0410.tar.xz | |
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
Diffstat (limited to 'EdkModulePkg/Core')
| -rw-r--r-- | EdkModulePkg/Core/DxeIplX64Peim/DxeIpl.h | 2 | ||||
| -rw-r--r-- | EdkModulePkg/Core/DxeIplX64Peim/DxeIplX64.msa | 6 | ||||
| -rw-r--r-- | EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c | 10 |
3 files changed, 6 insertions, 12 deletions
diff --git a/EdkModulePkg/Core/DxeIplX64Peim/DxeIpl.h b/EdkModulePkg/Core/DxeIplX64Peim/DxeIpl.h index 5e35042861..13b1a69bae 100644 --- a/EdkModulePkg/Core/DxeIplX64Peim/DxeIpl.h +++ b/EdkModulePkg/Core/DxeIplX64Peim/DxeIpl.h @@ -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,
diff --git a/EdkModulePkg/Core/DxeIplX64Peim/DxeIplX64.msa b/EdkModulePkg/Core/DxeIplX64Peim/DxeIplX64.msa index 929a62719f..849842d20d 100644 --- a/EdkModulePkg/Core/DxeIplX64Peim/DxeIplX64.msa +++ b/EdkModulePkg/Core/DxeIplX64Peim/DxeIplX64.msa @@ -43,9 +43,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.--> <Keyword>HobLib</Keyword>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED">
- <Keyword>PerformanceLib</Keyword>
- </LibraryClass>
- <LibraryClass Usage="ALWAYS_CONSUMED">
<Keyword>PeiServicesLib</Keyword>
</LibraryClass>
<LibraryClass Usage="ALWAYS_CONSUMED">
@@ -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>
diff --git a/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c b/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c index 9a036e6246..4015222036 100644 --- a/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c +++ b/EdkModulePkg/Core/DxeIplX64Peim/DxeLoadX64.c @@ -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,
|