Revert "Capsule-on-Disk entire Patch

[mirror_edk2.git] / MdeModulePkg / Core / DxeIplPeim / DxeLoad.c

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
index 859184e0d10968802eea1e24e75ad0f3471c7b28..c6e5b8330927ed093cac6222b1591160cbf0b989 100644 (file)
--- a/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeLoad.c
@@ -3,7 +3,7 @@
   Responsibility of this module is to load the DXE Core from a Firmware Volume.\r
 \r
 Copyright (c) 2016 HP Development Company, L.P.\r
-Copyright (c) 2006 - 2019, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved.<BR>\r
 SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -265,9 +265,7 @@ DxeLoadCore (
   UINTN                                     DataSize;\r
   EFI_PEI_S3_RESUME2_PPI                    *S3Resume;\r
   EFI_PEI_RECOVERY_MODULE_PPI               *PeiRecovery;\r
-  EFI_PEI_CAPSULE_ON_DISK_PPI               *PeiCapsuleOnDisk;\r
   EFI_MEMORY_TYPE_INFORMATION               MemoryData[EfiMaxMemoryType + 1];\r
-  VOID                                      *CapsuleOnDiskModePpi;\r
 \r
   //\r
   // if in S3 Resume, restore configure\r
@@ -332,32 +330,6 @@ DxeLoadCore (
     //\r
     // Now should have a HOB with the DXE core\r
     //\r
-  } else if (BootMode == BOOT_ON_FLASH_UPDATE) {\r
-    //\r
-    // If Capsule On Disk mode, call storage stack to read Capsule Relocation file\r
-    // IoMmmu is highly recommmended to enable before reading\r
-    //\r
-    Status = PeiServicesLocatePpi (\r
-               &gEdkiiPeiBootInCapsuleOnDiskModePpiGuid,\r
-               0,\r
-               NULL,\r
-               &CapsuleOnDiskModePpi\r
-               );\r
-    if (!EFI_ERROR(Status)) {\r
-      Status = PeiServicesLocatePpi (\r
-                 &gEdkiiPeiCapsuleOnDiskPpiGuid,\r
-                 0,\r
-                 NULL,\r
-                 (VOID **) &PeiCapsuleOnDisk\r
-                 );\r
-\r
-      //\r
-      // Whether failed, still goes to Firmware Update boot path. BDS will clear corresponding indicator and reboot later on\r
-      //\r
-      if (!EFI_ERROR (Status)) {\r
-        Status = PeiCapsuleOnDisk->LoadCapsuleOnDisk (PeiServices, PeiCapsuleOnDisk);\r
-      }\r
-    }\r
   }\r
 \r
   if (GetFirstGuidHob ((CONST EFI_GUID *)&gEfiMemoryTypeInformationGuid) == NULL) {\r