OvmfPkg: PlatformPei: reuse PublishPeiMemory() in MemDetect()

[mirror_edk2.git] / OvmfPkg / PlatformPei / MemDetect.c

diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c
index 7192b2bf73220e9cbf02343b50017bbb71dd22aa..a1de7626814c794eeedcb94225e41a4a93f48930 100644 (file)
--- a/OvmfPkg/PlatformPei/MemDetect.c
+++ b/OvmfPkg/PlatformPei/MemDetect.c
@@ -101,6 +101,9 @@ PublishPeiMemory (
 \r
   LowerMemorySize = GetSystemMemorySizeBelow4gb ();\r
 \r
+  //\r
+  // Determine the range of memory to use during PEI\r
+  //\r
   MemoryBase = PcdGet32 (PcdOvmfMemFvBase) + PcdGet32 (PcdOvmfMemFvSize);\r
   MemorySize = LowerMemorySize - MemoryBase;\r
   if (MemorySize > SIZE_64MB) {\r
@@ -128,9 +131,6 @@ EFI_PHYSICAL_ADDRESS
 MemDetect (\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  EFI_PHYSICAL_ADDRESS        MemoryBase;\r
-  UINT64                      MemorySize;\r
   UINT64                      LowerMemorySize;\r
   UINT64                      UpperMemorySize;\r
 \r
@@ -142,21 +142,7 @@ MemDetect (
   LowerMemorySize = GetSystemMemorySizeBelow4gb ();\r
   UpperMemorySize = GetSystemMemorySizeAbove4gb ();\r
 \r
-  //\r
-  // Determine the range of memory to use during PEI\r
-  //\r
-  MemoryBase = PcdGet32 (PcdOvmfMemFvBase) + PcdGet32 (PcdOvmfMemFvSize);\r
-  MemorySize = LowerMemorySize - MemoryBase;\r
-  if (MemorySize > SIZE_64MB) {\r
-    MemoryBase = LowerMemorySize - SIZE_64MB;\r
-    MemorySize = SIZE_64MB;\r
-  }\r
-\r
-  //\r
-  // Publish this memory to the PEI Core\r
-  //\r
-  Status = PublishSystemMemory(MemoryBase, MemorySize);\r
-  ASSERT_EFI_ERROR (Status);\r
+  PublishPeiMemory ();\r
 \r
   //\r
   // Create memory HOBs\r