OvmfPkg/PlatformBootManagerLib: Remove unnecessary memory test

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index 08437aa4f89e974b7393b1108f3c511b7855a996..cf774a16a78bde5e1a8e77f495d6bca13a9a18f1 100644 (file)
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -1213,62 +1213,6 @@ Returns:
   gST->ConOut->ClearScreen (gST->ConOut);\r
 }\r
 \r
   gST->ConOut->ClearScreen (gST->ConOut);\r
 }\r
 \r

-VOID\r
-PlatformBdsDiagnostics (\r
-  IN EXTENDMEM_COVERAGE_LEVEL    MemoryTestLevel,\r
-  IN BOOLEAN                     QuietBoot,\r
-  IN BASEM_MEMORY_TEST           BaseMemoryTest\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Perform the platform diagnostic, such like test memory. OEM/IBV also\r
-  can customize this fuction to support specific platform diagnostic.\r
-\r
-Arguments:\r
-\r
-  MemoryTestLevel  - The memory test intensive level\r
-\r
-  QuietBoot        - Indicate if need to enable the quiet boot\r
-\r
-  BaseMemoryTest   - A pointer to BaseMemoryTest()\r
-\r
-Returns:\r
-\r
-  None.\r
-\r
---*/\r
-{\r
-  EFI_STATUS  Status;\r
-\r
-  DEBUG ((EFI_D_INFO, "PlatformBdsDiagnostics\n"));\r
-\r
-  //\r
-  // Here we can decide if we need to show\r
-  // the diagnostics screen\r
-  // Notes: this quiet boot code should be remove\r
-  // from the graphic lib\r
-  //\r
-  if (QuietBoot) {\r
-    EnableQuietBoot (PcdGetPtr(PcdLogoFile));\r
-    //\r
-    // Perform system diagnostic\r
-    //\r
-    Status = BaseMemoryTest (MemoryTestLevel);\r
-    if (EFI_ERROR (Status)) {\r
-      DisableQuietBoot ();\r
-    }\r
-\r
-    return ;\r
-  }\r
-  //\r
-  // Perform system diagnostic\r
-  //\r
-  Status = BaseMemoryTest (MemoryTestLevel);\r
-}\r
-\r
-\r

 /**\r
   Save the S3 boot script.\r
 \r
 /**\r
   Save the S3 boot script.\r
 \r


@@ -1344,9 +1288,9 @@ Routine Description:
   ASSERT (BootMode == BOOT_WITH_FULL_CONFIGURATION);\r
 \r
   //\r
   ASSERT (BootMode == BOOT_WITH_FULL_CONFIGURATION);\r
 \r
   //\r

-  // Memory test and Logo show\r
+  // Logo show\r

   //\r
   //\r

-  PlatformBdsDiagnostics (IGNORE, TRUE, BaseMemoryTest);\r
+  EnableQuietBoot (PcdGetPtr (PcdLogoFile));\r

 \r
   //\r
   // Perform some platform specific connect sequence\r
 \r
   //\r
   // Perform some platform specific connect sequence\r

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
index 5e46300e4489e8505dee8f7911753b856c921ec4..44b7c0d460dd2a8b942dbfea33e9a1348229a4d5 100644 (file)
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.h
@@ -210,11 +210,6 @@ extern PLATFORM_CONSOLE_CONNECT_ENTRY  gPlatformConsole[];
 //\r
 // Platform BDS Functions\r
 //\r
 //\r
 // Platform BDS Functions\r
 //\r

-EFI_STATUS\r
-BdsMemoryTest (\r
-  EXTENDMEM_COVERAGE_LEVEL Level\r
-  );\r
-\r

 EFI_STATUS\r
 PlatformBdsShowProgress (\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL TitleForeground,\r
 EFI_STATUS\r
 PlatformBdsShowProgress (\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL TitleForeground,\r