MdeModulePkg-DxeCore: rename CoreGetMemoryMapPropertiesTable

[mirror_edk2.git] / IntelFspWrapperPkg / FspInitPei / FspInitPeiV2.c

diff --git a/IntelFspWrapperPkg/FspInitPei/FspInitPeiV2.c b/IntelFspWrapperPkg/FspInitPei/FspInitPeiV2.c
index 6ddbf7f1b37e4027473e73e5ac5327c43879dd06..50b150aedd8808d4b23ee33ef8fb8aeb1685bfe6 100644 (file)
--- a/IntelFspWrapperPkg/FspInitPei/FspInitPeiV2.c
+++ b/IntelFspWrapperPkg/FspInitPei/FspInitPeiV2.c
@@ -148,7 +148,7 @@ PeiFspMemoryInit (
   PeiServicesGetBootMode (&BootMode);\r
   DEBUG ((DEBUG_INFO, "BootMode - 0x%x\n", BootMode));\r
 \r
-  GetStackInfo (BootMode, FALSE, &StackBase, &StackSize);\r
+  GetStackInfo (BootMode, FALSE, &StackSize, &StackBase);\r
   DEBUG ((DEBUG_INFO, "StackBase - 0x%x\n", StackBase));\r
   DEBUG ((DEBUG_INFO, "StackSize - 0x%x\n", StackSize));\r
 \r
@@ -164,11 +164,13 @@ PeiFspMemoryInit (
   ASSERT(sizeof(FspUpdRgn) >= UpdRegionSize);\r
   ZeroMem (FspUpdRgn, UpdRegionSize);\r
   FspRtBuffer.UpdDataRgnPtr = UpdateFspUpdConfigs (FspUpdRgn);\r
+  FspRtBuffer.BootLoaderTolumSize = GetBootLoaderTolumSize ();\r
 \r
   ZeroMem (&FspMemoryInitParams, sizeof(FspMemoryInitParams));\r
   FspMemoryInitParams.NvsBufferPtr = GetNvsBuffer ();\r
   DEBUG ((DEBUG_INFO, "NvsBufferPtr - 0x%x\n", FspMemoryInitParams.NvsBufferPtr));\r
   FspMemoryInitParams.RtBufferPtr  = (VOID *)&FspRtBuffer;\r
+  FspHobList = NULL;\r
   FspMemoryInitParams.HobListPtr   = &FspHobList;\r
 \r
   DEBUG ((DEBUG_INFO, "FspMemoryInitParams - 0x%x\n", &FspMemoryInitParams));\r
@@ -184,6 +186,7 @@ PeiFspMemoryInit (
   ASSERT_EFI_ERROR (Status);\r
 \r
   DEBUG ((DEBUG_INFO, "  HobListPtr (returned) - 0x%x\n", FspHobList));\r
+  ASSERT (FspHobList != NULL);\r
 \r
   FspHobProcessForMemoryResource (FspHobList);\r
 \r
@@ -258,7 +261,11 @@ PeiMemoryDiscoveredNotify (
   VOID                      *FspHobList;\r
   EFI_HOB_GUID_TYPE         *GuidHob;\r
 \r
-  FspHeader = FspFindFspHeader (PcdGet32 (PcdFlashFvFspBase));\r
+  if (PcdGet32 (PcdFlashFvSecondFspBase) == 0) {\r
+    FspHeader = FspFindFspHeader (PcdGet32 (PcdFlashFvFspBase));\r
+  } else {\r
+    FspHeader = FspFindFspHeader (PcdGet32 (PcdFlashFvSecondFspBase));\r
+  }\r
   if (FspHeader == NULL) {\r
     return EFI_DEVICE_ERROR;\r
   }\r