1) Add library classes of S3Lib and RecoveryLib in MdeModulePkg

2) Add NULL instance for above library classes in MdeModulePkg
3) Add Framework implement library instance for above two library classes in IntelFrameworkModulePkg.

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

3 files changed, 6 insertions, 25 deletions

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
index 3cd9eba..9df5745 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.h
@@ -22,7 +22,6 @@ Abstract:
 

 #include <PiPei.h>

 #include <Ppi/DxeIpl.h>

-#include <Ppi/S3Resume.h>

 #include <Protocol/EdkDecompress.h>

 #include <Ppi/EndOfPeiPhase.h>

 #include <Protocol/CustomizedDecompress.h>

@@ -30,7 +29,6 @@ Abstract:
 #include <Ppi/Security.h>

 #include <Ppi/SectionExtraction.h>

 #include <Ppi/FvLoadFile.h>

-#include <Ppi/RecoveryModule.h>

 #include <Ppi/MemoryDiscovered.h>

 #include <Ppi/Decompress.h>

 #include <Ppi/FirmwareVolumeInfo.h>

@@ -52,7 +50,8 @@ Abstract:
 #include <Library/MemoryAllocationLib.h>

 #include <Library/PcdLib.h>

 #include <Library/PeCoffLib.h>

-

+#include <Library/S3Lib.h>

+#include <Library/RecoveryLib.h>

 

 #define STACK_SIZE      0x20000

 #define BSP_STORE_SIZE  0x4000

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index ff003e1..8203503 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -75,7 +75,8 @@
   BaseLib

   PeimEntryPoint

   DebugLib

-

+  S3Lib

+  RecoveryLib

 

 [Protocols]

   gEfiCustomizedDecompressProtocolGuid          # PROTOCOL SOMETIMES_PRODUCED

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 089e3bf..2042efa 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -185,8 +185,6 @@ DxeLoadCore (
   EFI_PHYSICAL_ADDRESS                      DxeCoreEntryPoint;

   EFI_PEI_PE_COFF_LOADER_PROTOCOL           *PeiEfiPeiPeCoffLoader;

   EFI_BOOT_MODE                             BootMode;

-  EFI_PEI_RECOVERY_MODULE_PPI               *PeiRecovery;

-  EFI_PEI_S3_RESUME_PPI                     *S3Resume;

   EFI_PEI_FV_HANDLE                         VolumeHandle;

   EFI_PEI_FILE_HANDLE                       FileHandle;

   UINTN                                     Instance;

@@ -198,27 +196,10 @@ DxeLoadCore (
   ASSERT_EFI_ERROR(Status);

 

   if (BootMode == BOOT_ON_S3_RESUME) {

-    Status = PeiServicesLocatePpi (

-               &gEfiPeiS3ResumePpiGuid,

-               0,

-               NULL,

-               (VOID **)&S3Resume

-               );

-    ASSERT_EFI_ERROR (Status);

-

-    Status = S3Resume->S3RestoreConfig (PeiServices);

+    Status = S3RestoreConfig();

     ASSERT_EFI_ERROR (Status);

   } else if (BootMode == BOOT_IN_RECOVERY_MODE) {

-

-    Status = PeiServicesLocatePpi (

-               &gEfiPeiRecoveryModulePpiGuid,

-               0,

-               NULL,

-               (VOID **)&PeiRecovery

-               );

-    ASSERT_EFI_ERROR (Status);

-

-    Status = PeiRecovery->LoadRecoveryCapsule (PeiServices, PeiRecovery);

+    Status = Recovery ();

     if (EFI_ERROR (Status)) {

       DEBUG ((EFI_D_ERROR, "Load Recovery Capsule Failed.(Status = %r)\n", Status));

       CpuDeadLoop ();