Remove BaseMemoryTest PPI and related producers and consumers.

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

4 files changed, 2 insertions, 32 deletions

diff --git a/UnixPkg/UnixAutoScanPei/UnixAutoScan.c b/UnixPkg/UnixAutoScanPei/UnixAutoScan.c
index e5faba1932..56fa31edc8 100644
--- a/UnixPkg/UnixAutoScanPei/UnixAutoScan.c
+++ b/UnixPkg/UnixAutoScanPei/UnixAutoScan.c
@@ -21,7 +21,6 @@ Revision History
 

 #include "PiPei.h"

 #include <Ppi/UnixAutoScan.h>

-#include <Ppi/BaseMemoryTest.h>

 #include <Ppi/MemoryDiscovered.h>

 

 #include <Library/DebugLib.h>

@@ -57,8 +56,6 @@ Returns:
   PEI_UNIX_AUTOSCAN_PPI      *PeiUnixService;

   UINT64                      MemorySize;

   EFI_PHYSICAL_ADDRESS        MemoryBase;

-  PEI_BASE_MEMORY_TEST_PPI    *MemoryTestPpi;

-  EFI_PHYSICAL_ADDRESS        ErrorAddress;

   UINTN                       Index;

   EFI_RESOURCE_ATTRIBUTE_TYPE Attributes;

 

@@ -76,17 +73,6 @@ Returns:
              );

   ASSERT_EFI_ERROR (Status);

 

-  //

-  // Get the Memory Test PPI

-  //

-  Status = PeiServicesLocatePpi (

-             &gPeiBaseMemoryTestPpiGuid,

-             0,

-             NULL,

-            (VOID**)&MemoryTestPpi

-            );

-  ASSERT_EFI_ERROR (Status);

-

   Index = 0;

   do {

     Status = PeiUnixService->UnixAutoScan (Index, &MemoryBase, &MemorySize);

@@ -103,20 +89,7 @@ Returns:
 

       if (Index == 0) {

         //

-        // For the first area register it as PEI tested memory

-        //

-        Status = MemoryTestPpi->BaseMemoryTest (

-                                  (EFI_PEI_SERVICES **) PeiServices,

-                                  MemoryTestPpi,

-                                  MemoryBase,

-                                  MemorySize,

-                                  Quick,

-                                  &ErrorAddress

-                                  );

-        ASSERT_EFI_ERROR (Status);

-

-        //

-        // Register the "tested" memory with the PEI Core

+        // Register the memory with the PEI Core

         //

         Status = PeiServicesInstallPeiMemory (MemoryBase, MemorySize);

         ASSERT_EFI_ERROR (Status);

diff --git a/UnixPkg/UnixAutoScanPei/UnixAutoScan.inf b/UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
index 2b02e41aa8..0a7db27667 100644
--- a/UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
+++ b/UnixPkg/UnixAutoScanPei/UnixAutoScan.inf
@@ -51,10 +51,9 @@
 

 [Ppis]

   gEfiPeiMemoryDiscoveredPpiGuid                # PPI ALWAYS_PRODUCED

-  gPeiBaseMemoryTestPpiGuid                     # PPI ALWAYS_CONSUMED

   gPeiUnixAutoScanPpiGuid                       # PPI ALWAYS_CONSUMED

 

 

 [Depex]

-  gPeiUnixAutoScanPpiGuid AND gEfiPeiMasterBootModePpiGuid AND gPeiBaseMemoryTestPpiGuid

+  gPeiUnixAutoScanPpiGuid AND gEfiPeiMasterBootModePpiGuid

 

diff --git a/UnixPkg/UnixPkg.dsc b/UnixPkg/UnixPkg.dsc
index a93e88c918..c827c3c2a9 100644
--- a/UnixPkg/UnixPkg.dsc
+++ b/UnixPkg/UnixPkg.dsc
@@ -424,7 +424,6 @@
   IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf

   UnixPkg/BootModePei/BootModePei.inf

   UnixPkg/UnixFlashMapPei/FlashMap.inf

-  MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf

   MdeModulePkg/Universal/Variable/Pei/VariablePei.inf

   UnixPkg/UnixAutoScanPei/UnixAutoScan.inf

   UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf

diff --git a/UnixPkg/UnixPkg.fdf b/UnixPkg/UnixPkg.fdf
index fe3bdb2004..4ca51be0c4 100644
--- a/UnixPkg/UnixPkg.fdf
+++ b/UnixPkg/UnixPkg.fdf
@@ -161,7 +161,6 @@ INF  MdeModulePkg/Universal/PCD/Pei/Pcd.inf
 INF  IntelFrameworkModulePkg/Universal/StatusCode/Pei/PeiStatusCode.inf

 INF  UnixPkg/BootModePei/BootModePei.inf

 INF  UnixPkg/UnixFlashMapPei/FlashMap.inf

-INF  MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf

 INF  UnixPkg/UnixAutoScanPei/UnixAutoScan.inf

 INF  UnixPkg/UnixFirmwareVolumePei/UnixFwh.inf

 INF  MdeModulePkg/Universal/Variable/Pei/VariablePei.inf