Remove Ppi/LoadFile.h and Ppi/FindFv.h from MdeModulePkg.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@3394 6f19259b-4bc3-4df7-8a09-765794883524

6 files changed, 9 insertions, 189 deletions

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index ae8b90be8f..64383919e8 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
@@ -29,7 +29,7 @@ Abstract:
 #include <Protocol/Decompress.h>

 #include <Ppi/Security.h>

 #include <Ppi/SectionExtraction.h>

-#include <Ppi/LoadFile.h>

+#include <Ppi/FvLoadFile.h>

 #include <Ppi/RecoveryModule.h>

 #include <Ppi/MemoryDiscovered.h>

 #include <Library/DebugLib.h>

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index e7d972fa83..3c7395e983 100644
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -32,7 +32,7 @@ Revision History
 #include <Ppi/StatusCode.h>

 #include <Ppi/Security.h>

 #include <Ppi/Reset.h>

-#include <Ppi/LoadFile.h>

+#include <Ppi/FvLoadFile.h>

 #include <Library/DebugLib.h>

 #include <Library/PeiCoreEntryPoint.h>

 #include <Library/BaseLib.h>

diff --git a/MdeModulePkg/Include/Ppi/FindFv.h b/MdeModulePkg/Include/Ppi/FindFv.h
deleted file mode 100644
index 9a3e173742..0000000000
--- a/MdeModulePkg/Include/Ppi/FindFv.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/** @file

-  This file declares FindFv PPI used to locate FVs that contain PEIMs in PEI

-

-  Copyright (c) 2006, Intel Corporation                                                         

-  All rights reserved. This program and the accompanying materials                          

-  are licensed and made available under the terms and conditions of the BSD License         

-  which accompanies this distribution.  The full text of the license may be found at        

-  http://opensource.org/licenses/bsd-license.php                                            

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

-

-  Module Name:  FindFv.h

-

-  @par Revision Reference:

-  This PPI is defined in PEI CIS

-  Version 0.91

-

-**/

-

-#ifndef __FIND_FV_H__

-#define __FIND_FV_H__

-

-#define EFI_PEI_FIND_FV_PPI_GUID \

-  { \

-    0x36164812, 0xa023, 0x44e5, {0xbd, 0x85, 0x5, 0xbf, 0x3c, 0x77, 0x0, 0xaa } \

-  }

-

-typedef struct _EFI_PEI_FIND_FV_PPI EFI_PEI_FIND_FV_PPI;

-

-/**

-  This interface returns the base address of the firmware volume whose index 

-  was passed in FvNumber.Once this function reports a firmware volume 

-  index/base address pair, that index/address pairing must continue throughout PEI.

-

-  @param  PeiServices    Pointer to the PEI Services Table.

-  @param  This           Interface pointer that implements the Find FV service.

-  @param  FvNumber       The index of the firmware volume to locate.

-  @param  FvAddress      The address of the volume to discover.

-

-  @retval EFI_SUCCESS           An additional firmware volume was found.

-  @retval EFI_OUT_OF_RESOURCES  There are no firmware volumes for the given FvNumber.

-  @retval EFI_INVALID_PARAMETER *FvAddress is NULL.

-

-**/

-typedef

-EFI_STATUS

-(EFIAPI *EFI_PEI_FIND_FV_FINDFV) (

-  IN EFI_PEI_FIND_FV_PPI      *This,

-  IN EFI_PEI_SERVICES         **PeiServices,

-  UINT8                       *FvNumber,

-  EFI_FIRMWARE_VOLUME_HEADER  **FVAddress

-  );

-

-/**

-  @par Ppi Description:

-  Hardware mechanisms for locating FVs in a platform vary widely.

-  EFI_PEI_FIND_FV_PPI serves to abstract this variation so that the 

-  PEI Foundation can remain standard across a wide variety of platforms.

-

-  @param FindFv

-  Service that abstracts the location of additional firmware volumes.

-

-**/

-struct _EFI_PEI_FIND_FV_PPI {

-  EFI_PEI_FIND_FV_FINDFV  FindFv;

-};

-

-extern EFI_GUID gEfiFindFvPpiGuid;

-

-#endif

diff --git a/MdeModulePkg/Include/Ppi/LoadFile.h b/MdeModulePkg/Include/Ppi/LoadFile.h
deleted file mode 100644
index f6d8a704ee..0000000000
--- a/MdeModulePkg/Include/Ppi/LoadFile.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/** @file

-  Load image file from fv to memory. 

-

-  Copyright (c) 2006, Intel Corporation                                                         

-  All rights reserved. This program and the accompanying materials                          

-  are licensed and made available under the terms and conditions of the BSD License         

-  which accompanies this distribution.  The full text of the license may be found at        

-  http://opensource.org/licenses/bsd-license.php                                            

-

-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

-

-  Module Name:  LoadFile.h

-

-  @par Revision Reference:

-  This PPI is defined in PEI CIS spec Version 0.91.

-

-**/

-

-#ifndef __FV_FILE_LOADER_PPI_H__

-#define __FV_FILE_LOADER_PPI_H__

-

-#define EFI_PEI_FV_FILE_LOADER_GUID \

-  { \

-    0x7e1f0d85, 0x4ff, 0x4bb2, {0x86, 0x6a, 0x31, 0xa2, 0x99, 0x6a, 0x48, 0xa8 } \

-  }

-

-typedef struct _EFI_PEI_FV_FILE_LOADER_PPI  EFI_PEI_FV_FILE_LOADER_PPI;

-

-/**

-  Loads a PEIM into memory for subsequent execution.

-

-  @param  This           Interface pointer that implements the Load File PPI instance.

-  @param  FfsHeader      Pointer to the FFS header of the file to load.

-  @param  ImageAddress   Pointer to the address of the loaded Image

-  @param  ImageSize      Pointer to the size of the loaded image.

-  @param  EntryPoint     Pointer to the entry point of the image.

-

-  @retval EFI_SUCCESS           The image was loaded successfully.

-  @retval EFI_OUT_OF_RESOURCES  There was not enough memory.

-  @retval EFI_INVALID_PARAMETER The contents of the FFS file did not

-                                contain a valid PE/COFF image that could be loaded.

-

-**/

-typedef

-EFI_STATUS

-(EFIAPI *EFI_PEI_FV_LOAD_FILE) (

-  IN EFI_PEI_FV_FILE_LOADER_PPI                 *This,

-  IN  EFI_FFS_FILE_HEADER                       *FfsHeader,

-  OUT EFI_PHYSICAL_ADDRESS                      *ImageAddress,

-  OUT UINT64                                    *ImageSize,

-  OUT EFI_PHYSICAL_ADDRESS                      *EntryPoint

-  );

-

-/**

-  @par Ppi Description:

-  This PPI is a pointer to the Load File service. This service will be 

-  published by a PEIM.The PEI Foundation will use this service to 

-  launch the known non-XIP PE/COFF PEIM images.  This service may 

-  depend upon the presence of the EFI_PEI_PERMANENT_MEMORY_INSTALLED_PPI.

-

-  @param FvLoadFile

-  Loads a PEIM into memory for subsequent execution

-

-**/

-struct _EFI_PEI_FV_FILE_LOADER_PPI {

-  EFI_PEI_FV_LOAD_FILE  FvLoadFile;

-};

-

-extern EFI_GUID gEfiPeiFvFileLoaderPpiGuid;

-

-#endif

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 92242c5425..296a798530 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -16,12 +16,6 @@
 #**/

 

 

-################################################################################

-#

-# Defines Section - statements that will be processed to create a Makefile.

-#

-################################################################################

-

 [Defines]

   DEC_SPECIFICATION              = 0x00010005

   PACKAGE_NAME                   = MdeModulePkg

@@ -31,21 +25,13 @@
 [Includes.common]

   Include

 

-################################################################################

-#

-# Global Guid Definition section - list of Global Guid C Name Data Structures

-#                                  that are provided by this package.

-#

-################################################################################

 [Guids.common]

   gEfiShellFileGuid              = { 0xC57AD6B7, 0x0515, 0x40A8, { 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }}

   gEfiMemoryTypeInformationGuid  = { 0x4C19049F, 0x4137, 0x4DD3, { 0x9C, 0x10, 0x8B, 0x97, 0xA8, 0x3F, 0xFD, 0xFA }}

   gEfiFlashMapHobGuid            = { 0xB091E7D2, 0x05A0, 0x4198, { 0x94, 0xF0, 0x74, 0xB7, 0xB8, 0xC5, 0x54, 0x59 }}

-  gEfiPeiPeCoffLoaderGuid        = { 0xD8117CFF, 0x94A6, 0x11D4, { 0x9A, 0x3A, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}

   gEfiGenericPlatformVariableGuid = { 0x59d1c24f, 0x50f1, 0x401a, { 0xb1, 0x01, 0xf3, 0x3e, 0x0d, 0xae, 0xd4, 0x43 }}

   gPeiPerformanceHobGuid         = { 0xEC4DF5AF, 0x4395, 0x4CC9, { 0x94, 0xDE, 0x77, 0x50, 0x6D, 0x12, 0xC7, 0xB8 }}

   gEfiCapsuleVendorGuid          = { 0x711C703F, 0xC285, 0x4B10, { 0xA3, 0xB0, 0x36, 0xEC, 0xBD, 0x3C, 0x8B, 0xE2 }}

-  gEfiPciHotplugDeviceGuid       = { 0x0B280816, 0x52E7, 0x4E51, { 0xAA, 0x57, 0x11, 0xBD, 0x41, 0xCB, 0xEF, 0xC3 }}

   gEfiBootStateGuid              = { 0x60B5E939, 0x0FCF, 0x4227, { 0xBA, 0x83, 0x6B, 0xBE, 0xD4, 0x5B, 0xC0, 0xE3 }}

   gEfiDefaultBmpLogoGuid         = { 0x7BB28B99, 0x61BB, 0x11D5, { 0x9A, 0x5D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}

   gEfiPrimaryConsoleOutDeviceGuid = { 0x62BDF38A, 0xE3D5, 0x492C, { 0x95, 0x0C, 0x23, 0xA7, 0xF6, 0x6E, 0x67, 0x2E }}

@@ -64,20 +50,14 @@
   gPcdPeiCallbackFnTableHobGuid  = { 0xC625F4B2, 0xEA09, 0x4675, { 0x82, 0xD7, 0xBA, 0x36, 0x82, 0x15, 0x7A, 0x14 }}

   gPcdDataBaseHobGuid            = { 0xEA296D92, 0x0B69, 0x423C, { 0x8C, 0x28, 0x33, 0xB4, 0xE0, 0xA9, 0x12, 0x68 }}

   gEfiMdeModulePkgTokenSpaceGuid       = { 0xA1AFF049, 0xFDEB, 0x442a, { 0xB3, 0x20, 0x13, 0xAB, 0x4C, 0xB7, 0x2B, 0xBC }}

-  ##gEfiPeiPeCoffLoaderGuid will be removed in future

-  gEfiPeiPeCoffLoaderGuid        = { 0xd8117cff, 0x94a6, 0x11d4, {0x9a, 0x3a, 0x0, 0x90, 0x27, 0x3f, 0xc1, 0x4d } }

   gEfiPeiCorePrivateGuid         = { 0xd641a0f5, 0xcb7c, 0x4846, { 0xa3, 0x80, 0x1d, 0x01, 0xb4, 0xd9, 0xe3, 0xb9 }}

+

+  gEfiPeiPeCoffLoaderGuid        = { 0xD8117CFF, 0x94A6, 0x11D4, { 0x9A, 0x3A, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}

+

+[Guids.Ipf]

   gEfiExtendedSalVariableServicesProtocolGuid = {0x4ecb6c53, 0xc641, 0x4370, {0x8c, 0xb2, 0x3b, 0x0e, 0x49, 0x6e, 0x83, 0x78 }}

 

-################################################################################

-#

-# Global Protocols Definition section - list of Global Protocols C Name Data

-#                                  Structures that are provided by this package.

-#

-################################################################################

 [Protocols.common]

-  gEfiFindFvPpiGuid              = { 0x36164812, 0xA023, 0x44E5, { 0xBD, 0x85, 0x05, 0xBF, 0x3C, 0x77, 0x00, 0xAA }}

-  gEfiScsiIoProtocolGuid         = { 0x403CD195, 0xF233, 0x48EC, { 0x84, 0x55, 0xB2, 0xE5, 0x2F, 0x1D, 0x9E, 0x02 }}

   gPerformanceProtocolGuid       = { 0x76B6BDFA, 0x2ACD, 0x4462, { 0x9E, 0x3F, 0xCB, 0x58, 0xC9, 0x69, 0xD9, 0x37 }}

   gEfiUsbAtapiProtocolGuid       = { 0x2B2F68DA, 0x0CD2, 0x44CF, { 0x8E, 0x8B, 0xBB, 0xA2, 0x0B, 0x1B, 0x5B, 0x75 }}

   gEfiOEMBadgingProtocolGuid     = { 0x170E13C0, 0xBF1B, 0x4218, { 0x87, 0x1D, 0x2A, 0xBD, 0xC6, 0xF8, 0x87, 0xBC }}

@@ -93,29 +73,12 @@
   gEfiCapsuleArchProtocolGuid    = { 0x5053697E, 0x2EBC, 0x4819, { 0x90, 0xD9, 0x05, 0x80, 0xDE, 0xEE, 0x57, 0x54 }}

   gEfiCrc32GuidedSectionExtractionProtocolGuid = { 0xFC1BCDB0, 0x7D31, 0x49aa, {0x93, 0x6A, 0xA4, 0x60, 0x0D, 0x9D, 0xD0, 0x83 } }

 

-

-

-

-################################################################################

-#

-# Global Ppis Definition section - list of Global Ppis C Name Data Structures

-#                                  that are provided by this package.

-#

-################################################################################

 [Ppis.common]

   gPeiBaseMemoryTestPpiGuid      = { 0xB6EC423C, 0x21D2, 0x490D, { 0x85, 0xC6, 0xDD, 0x58, 0x64, 0xEA, 0xA6, 0x74 }}

-  gEfiPeiFvFileLoaderPpiGuid     = { 0x7e1f0d85, 0x04ff, 0x4bb2, { 0x86, 0x6a, 0x31, 0xa2, 0x99, 0x6a, 0x48, 0xa8 }}

+

   ##gPeiFlashMapPpiGuid will be removed in future

   gPeiFlashMapPpiGuid            = { 0xf34c2fa0, 0xde88, 0x4270, {0x84, 0x14, 0x96, 0x12, 0x22, 0xf4, 0x52, 0x1c } }

 

-################################################################################

-#

-# PCD Declarations section - list of all PCDs Declared by this Package

-#                            Only this package should be providing the

-#                            declaration, other packages should not.

-#

-################################################################################

-

 [PcdsFeatureFlag.common]

   PcdSupportUpdateCapsuleRest|0x0001001d|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|FALSE

   PcdPeiPcdDatabaseTraverseEnabled|0x00010020|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 1209c3819d..73cb07a97c 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -430,8 +430,6 @@
   $(WORKSPACE)/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf

 

   $(WORKSPACE)/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

-  $(WORKSPACE)/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

-  $(WORKSPACE)/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf

 

 [Components.Ia32]

   $(WORKSPACE)/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf

@@ -446,6 +444,8 @@
   $(WORKSPACE)/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf

   $(WORKSPACE)/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf

   $(WORKSPACE)/MdeModulePkg/Universal/PcatRealTimeClockRuntimeDxe/PcatRealTimeClockRuntimeDxe.inf

+  $(WORKSPACE)/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf

+  $(WORKSPACE)/MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf

 

 [Components.IPF]

   $(WORKSPACE)/MdeModulePkg/Universal/EbcDxe/EbcDxe.inf