Add missing definition EFI_PEIM_ENTRY_POINT to IntelFrameworkPkg and rename original...

[mirror_edk2.git] / MdeModulePkg / Core / Pei / PeiMain.h

diff --git a/MdeModulePkg/Core/Pei/PeiMain.h b/MdeModulePkg/Core/Pei/PeiMain.h
index e7d972fa83c7f5d727d4a94e0109723423cd7340..7cdcf30a2a32a176923e904ef9f661f57a53bda0 100644 (file)
--- a/MdeModulePkg/Core/Pei/PeiMain.h
+++ b/MdeModulePkg/Core/Pei/PeiMain.h
@@ -26,13 +26,14 @@ Revision History
 \r
 #include <PiPei.h>\r
 #include <FrameworkPei.h>\r
 \r
 #include <PiPei.h>\r
 #include <FrameworkPei.h>\r

+#include <Guid/StatusCodeDataTypeId.h>\r

 #include <Ppi/DxeIpl.h>\r
 #include <Ppi/MemoryDiscovered.h>\r
 #include <Ppi/FindFv.h>\r
 #include <Ppi/StatusCode.h>\r
 #include <Ppi/Security.h>\r
 #include <Ppi/Reset.h>\r
 #include <Ppi/DxeIpl.h>\r
 #include <Ppi/MemoryDiscovered.h>\r
 #include <Ppi/FindFv.h>\r
 #include <Ppi/StatusCode.h>\r
 #include <Ppi/Security.h>\r
 #include <Ppi/Reset.h>\r

-#include <Ppi/LoadFile.h>\r
+#include <Ppi/FvLoadFile.h>\r

 #include <Library/DebugLib.h>\r
 #include <Library/PeiCoreEntryPoint.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/PeiCoreEntryPoint.h>\r
 #include <Library/BaseLib.h>\r


@@ -43,7 +44,7 @@ Revision History
 #include <Library/PeCoffGetEntryPointLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/TimerLib.h>\r
 #include <Library/PeCoffGetEntryPointLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
 #include <Library/TimerLib.h>\r

-\r
+#include <IndustryStandard/PeImage.h>\r

 \r
 extern EFI_GUID gEfiPeiCorePrivateGuid;\r
 \r
 \r
 extern EFI_GUID gEfiPeiCorePrivateGuid;\r
 \r


@@ -128,7 +129,7 @@ EFI_STATUS
 //\r
 typedef union {\r
   PEI_CORE_ENTRY_POINT         PeiCore;\r
 //\r
 typedef union {\r
   PEI_CORE_ENTRY_POINT         PeiCore;\r

-  EFI_PEIM_ENTRY_POINT         PeimEntry;\r
+  EFI_PEIM_ENTRY_POINT2        PeimEntry;\r

   EFI_PEIM_NOTIFY_ENTRY_POINT  PeimNotifyEntry;\r
   EFI_DXE_IPL_PPI              *DxeIpl;\r
   EFI_PEI_PPI_DESCRIPTOR       *PpiDescriptor;\r
   EFI_PEIM_NOTIFY_ENTRY_POINT  PeimNotifyEntry;\r
   EFI_DXE_IPL_PPI              *DxeIpl;\r
   EFI_PEI_PPI_DESCRIPTOR       *PpiDescriptor;\r