Update capsule pei module to pass IPF build.

Signed-off-by: li-elvin
Reviewed-by: lgao4
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12280 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/CapsulePei/Capsule.h b/MdeModulePkg/Universal/CapsulePei/Capsule.h
index 8d8658a0c115ab04e97b64db569b970eca088ad0..5b7caae67498ce9276875f3d2c6644e68d4b50d5 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/Capsule.h
+++ b/MdeModulePkg/Universal/CapsulePei/Capsule.h
@@ -38,6 +38,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <IndustryStandard/PeImage.h>\r
 #include "Common/CommonHeader.h"\r
 \r
+#ifdef MDE_CPU_IA32 \r
+\r
 #pragma pack(1)\r
 \r
 //\r
@@ -99,3 +101,5 @@ EFI_STATUS
   );\r
 \r
 #endif\r
+\r
+#endif\r

diff --git a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf b/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
index 2599cdbcd12c658f80fa2ee77f7b3acee3887072..72f1ba52f6a6316361079dbe5c8096e7ab8ca34d 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
+++ b/MdeModulePkg/Universal/CapsulePei/CapsulePei.inf
@@ -49,22 +49,26 @@
   DebugLib\r
   PeiServicesTablePointerLib\r
   PrintLib\r
-  PeCoffLib\r
+  ReportStatusCodeLib\r
+\r
+[LibraryClasses.IA32]\r
   PeCoffGetEntryPointLib\r
   PcdLib\r
-  ReportStatusCodeLib\r
 \r
 [Guids]\r
   gEfiCapsuleVendorGuid                         # ALWAYS_CONSUMED\r
 \r
-\r
 [Ppis]\r
   gEfiPeiReadOnlyVariable2PpiGuid               # PPI ALWAYS_CONSUMED\r
   gPeiCapsulePpiGuid                            # PPI ALWAYS_CONSUMED\r
+  \r
+[Ppis.IA32]  \r
   gEfiPeiLoadFilePpiGuid                        # PPI ALWAYS_CONSUMED\r
 \r
-[Pcd]\r
+[Pcd.IA32]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdCapsuleCoalesceFile\r
+\r
+[FeaturePcd.IA32]\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode\r
 \r
 [Depex]\r

diff --git a/MdeModulePkg/Universal/CapsulePei/Common/CommonHeader.h b/MdeModulePkg/Universal/CapsulePei/Common/CommonHeader.h
index 5c0aa3068c0fc331da5df2c9ac0be403f7f8d648..0f7f7aea41cb556a307208e1e3f67033337f4fc7 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/Common/CommonHeader.h
+++ b/MdeModulePkg/Universal/CapsulePei/Common/CommonHeader.h
@@ -12,11 +12,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#ifndef _CAPSULE_THUNK_32_TO_64_\r
-#define _CAPSULE_THUNK_32_TO_64_\r
-\r
-#include <Uefi.h>\r
-#include "PiPei.h"\r
+#ifndef _CAPSULE_COMMON_HEADER_\r
+#define _CAPSULE_COMMON_HEADER_\r
 \r
 //\r
 // This capsule PEIM puts its private data at the start of the\r
@@ -31,6 +28,7 @@ typedef struct {
 \r
 #define CAPSULE_TEST_SIGNATURE SIGNATURE_32('T', 'E', 'S', 'T')\r
 \r
+#if defined (MDE_CPU_IA32) || defined (MDE_CPU_X64)\r
 typedef struct {\r
   EFI_PHYSICAL_ADDRESS  EntryPoint;\r
   EFI_PHYSICAL_ADDRESS  StackBufferBase;\r
@@ -47,6 +45,7 @@ typedef struct {
   UINT64                ReturnStatus;\r
   IA32_DESCRIPTOR       Gdtr;\r
 } SWITCH_64_TO_32_CONTEXT;\r
+#endif\r
 \r
 /**\r
   The function to coalesce a fragmented capsule in memory.\r

diff --git a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
index 5598755d4623c964c8ad874b29f3fb454d88dccf..da37e671fea5e4e63e6ab530e02a8be542c11df8 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
+++ b/MdeModulePkg/Universal/CapsulePei/UefiCapsule.c
@@ -16,6 +16,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 #include "Capsule.h"\r
 \r
+#ifdef MDE_CPU_IA32\r
 //\r
 // Global Descriptor Table (GDT)\r
 //\r
@@ -417,6 +418,67 @@ ModeSwitch (
 \r
 }\r
 \r
+/**\r
+  Locates the coalesce image entry point, and detects its machine type.\r
+\r
+  @param CoalesceImageEntryPoint   Pointer to coalesce image entry point for output.\r
+  @param CoalesceImageMachineType  Pointer to machine type of coalesce image.\r
+\r
+  @retval EFI_SUCCESS     Coalesce image successfully located.\r
+  @retval Others          Failed to locate the coalesce image.\r
+\r
+**/\r
+EFI_STATUS\r
+FindCapsuleCoalesceImage (\r
+  OUT EFI_PHYSICAL_ADDRESS    *CoalesceImageEntryPoint,\r
+  OUT UINT16                  *CoalesceImageMachineType\r
+  )\r
+{\r
+  EFI_STATUS                           Status;\r
+  UINTN                                Instance;\r
+  EFI_PEI_LOAD_FILE_PPI                *LoadFile;\r
+  EFI_PEI_FV_HANDLE                    VolumeHandle;\r
+  EFI_PEI_FILE_HANDLE                  FileHandle;\r
+  EFI_PHYSICAL_ADDRESS                 CoalesceImageAddress;\r
+  UINT64                               CoalesceImageSize;\r
+  UINT32                               AuthenticationState;\r
+\r
+  Instance = 0;\r
+\r
+  while (TRUE) {\r
+    Status = PeiServicesFfsFindNextVolume (Instance++, &VolumeHandle);\r
+    if (EFI_ERROR (Status)) {\r
+      return Status;\r
+    }\r
+    Status = PeiServicesFfsFindFileByName (PcdGetPtr(PcdCapsuleCoalesceFile), VolumeHandle, &FileHandle);\r
+    if (!EFI_ERROR (Status)) {\r
+      Status = PeiServicesLocatePpi (&gEfiPeiLoadFilePpiGuid, 0, NULL, (VOID **) &LoadFile);\r
+      ASSERT_EFI_ERROR (Status);\r
+\r
+      Status = LoadFile->LoadFile (\r
+                           LoadFile,\r
+                           FileHandle,\r
+                           &CoalesceImageAddress,\r
+                           &CoalesceImageSize,\r
+                           CoalesceImageEntryPoint,\r
+                           &AuthenticationState\r
+                           );\r
+      if (EFI_ERROR (Status)) {\r
+        DEBUG ((EFI_D_ERROR, "Unable to find PE32 section in CapsuleRelocate image ffs %r!\n", Status));\r
+        return Status;\r
+      }\r
+      *CoalesceImageMachineType = PeCoffLoaderGetMachineType ((VOID *) (UINTN) CoalesceImageAddress);\r
+      break;\r
+    } else {\r
+      continue;\r
+    }\r
+  }\r
+\r
+  return Status;\r
+}\r
+\r
+#endif\r
+\r
 /**\r
   Checks for the presence of capsule descriptors.\r
   Get capsule descriptors from variable CapsuleUpdateData, CapsuleUpdateData1, CapsuleUpdateData2...\r
@@ -526,65 +588,6 @@ GetCapsuleDescriptors (
   return EFI_SUCCESS;\r
 }\r
 \r
-/**\r
-  Locates the coalesce image entry point, and detects its machine type.\r
-\r
-  @param CoalesceImageEntryPoint   Pointer to coalesce image entry point for output.\r
-  @param CoalesceImageMachineType  Pointer to machine type of coalesce image.\r
-\r
-  @retval EFI_SUCCESS     Coalesce image successfully located.\r
-  @retval Others          Failed to locate the coalesce image.\r
-\r
-**/\r
-EFI_STATUS\r
-FindCapsuleCoalesceImage (\r
-  OUT EFI_PHYSICAL_ADDRESS    *CoalesceImageEntryPoint,\r
-  OUT UINT16                  *CoalesceImageMachineType\r
-  )\r
-{\r
-  EFI_STATUS                           Status;\r
-  UINTN                                Instance;\r
-  EFI_PEI_LOAD_FILE_PPI                *LoadFile;\r
-  EFI_PEI_FV_HANDLE                    VolumeHandle;\r
-  EFI_PEI_FILE_HANDLE                  FileHandle;\r
-  EFI_PHYSICAL_ADDRESS                 CoalesceImageAddress;\r
-  UINT64                               CoalesceImageSize;\r
-  UINT32                               AuthenticationState;\r
-\r
-  Instance = 0;\r
-\r
-  while (TRUE) {\r
-    Status = PeiServicesFfsFindNextVolume (Instance++, &VolumeHandle);\r
-    if (EFI_ERROR (Status)) {\r
-      return Status;\r
-    }\r
-    Status = PeiServicesFfsFindFileByName (PcdGetPtr(PcdCapsuleCoalesceFile), VolumeHandle, &FileHandle);\r
-    if (!EFI_ERROR (Status)) {\r
-      Status = PeiServicesLocatePpi (&gEfiPeiLoadFilePpiGuid, 0, NULL, (VOID **) &LoadFile);\r
-      ASSERT_EFI_ERROR (Status);\r
-\r
-      Status = LoadFile->LoadFile (\r
-                           LoadFile,\r
-                           FileHandle,\r
-                           &CoalesceImageAddress,\r
-                           &CoalesceImageSize,\r
-                           CoalesceImageEntryPoint,\r
-                           &AuthenticationState\r
-                           );\r
-      if (EFI_ERROR (Status)) {\r
-        DEBUG ((EFI_D_ERROR, "Unable to find PE32 section in CapsuleRelocate image ffs %r!\n", Status));\r
-        return Status;\r
-      }\r
-      *CoalesceImageMachineType = PeCoffLoaderGetMachineType ((VOID *) (UINTN) CoalesceImageAddress);\r
-      break;\r
-    } else {\r
-      continue;\r
-    }\r
-  }\r
-\r
-  return Status;\r
-}\r
-\r
 /**\r
   Gets the reserved long mode buffer.\r
 \r

diff --git a/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c b/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c
index c64fe1017c0c931a80b13db008fedc569d3b8913..a4e44a4f5ef1964bf39963214ee322c663335821 100644 (file)
--- a/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c
+++ b/MdeModulePkg/Universal/CapsulePei/X64/X64Entry.c
@@ -12,7 +12,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 **/\r
 \r
-#include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
 #include "CommonHeader.h"\r
 \r