1) Change GUID of emuvariable module.

[mirror_edk2.git] / MdeModulePkg / Core / Dxe / DxeMain / DxeMain.c

diff --git a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
index 0324901ef9a80a2ef129b2cef1d22b4da83d1b81..58bdb8b8c03cff0844c7bdabc5b9237b03b733d3 100644 (file)
--- a/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
+++ b/MdeModulePkg/Core/Dxe/DxeMain/DxeMain.c
@@ -25,7 +25,6 @@ Abstract:
 // DXE Core Global Variables for Protocols from PEI\r
 //\r
 EFI_HANDLE                                mDecompressHandle = NULL;\r
-EFI_PEI_PE_COFF_LOADER_PROTOCOL           *gEfiPeiPeCoffLoader          = NULL;\r
 \r
 //\r
 // DXE Core globals for Architecture Protocols\r
@@ -300,6 +299,10 @@ Returns:
   ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
+  // The HobStart is relocated in gcd service init. Sync mHobStart varible.\r
+  //\r
+  mHobStart = HobStart;\r
+  \r
   // Install the DXE Services Table into the EFI System Tables's Configuration Table\r
   //\r
   Status = CoreInstallConfigurationTable (&gEfiDxeServicesTableGuid, gDxeCoreDS);\r
@@ -339,7 +342,7 @@ Returns:
     gDxeCoreImageHandle\r
     );\r
 \r
-  DEBUG ((EFI_D_INFO | EFI_D_LOAD, "HOBLIST address in DXE = 0x%08x\n", HobStart));\r
+  DEBUG ((EFI_D_INFO | EFI_D_LOAD, "HOBLIST address in DXE = 0x%016lx\n", (UINT64) (UINTN) HobStart));\r
 \r
   //\r
   // Initialize the Event Services\r
@@ -370,9 +373,6 @@ Returns:
               );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  gEfiPeiPeCoffLoader = GetPeCoffLoaderProtocol ();\r
-  ASSERT (gEfiPeiPeCoffLoader != NULL);\r
-\r
   //\r
   // Register for the GUIDs of the Architectural Protocols, so the rest of the\r
   // EFI Boot Services and EFI Runtime Services tables can be filled in.\r
@@ -787,7 +787,7 @@ Returns:
   //\r
   // Report that ExitBootServices() has been called\r
   //\r
-  // We are using gEfiDxeServicesTableGuid as the caller ID for Dxe Core\r
+  // We are using gEfiCallerIdGuid as the caller ID for Dxe Core\r
   //\r
   CoreReportProgressCode ((EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_BS_PC_EXIT_BOOT_SERVICES));\r
 \r
@@ -871,4 +871,3 @@ DxeMainUefiDecompress (
 \r
   return UefiDecompress (Source, Destination, Scratch);\r
 }\r
-\r