Bläddra i källkod

QuarkPlatformPkg: Clean up duplicated SmramMemoryReserve.h files

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2108

SmramMemoryReserve.h has been added into
Edk2\MdePkg\Include\Guid\SmramMemoryReserve.h.

The duplicated header file can be cleaned up.
Edk2Platforms\Silicon\Intel\QuarkSocPkg\QuarkNorthCluster\Include\Guid\SmramMemoryReserve.h

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Kelly Steele <kelly.steele@intel.com>

Co-authored-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
Signed-off-by: Marc W Chen <marc.w.chen@intel.com>
Signed-off-by: Nate DeSimone <nathaniel.l.desimone@intel.com>
Reviewed-by: Kelly Steele <kelly.steele@intel.com>
Marc W Chen 4 år sedan
förälder
incheckning
c253469c8d

+ 2 - 2
Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.c

@@ -3,7 +3,7 @@ ACPISMM Driver implementation file.
 
 This is QNC Smm platform driver
 
-Copyright (c) 2013-2016 Intel Corporation.
+Copyright (c) 2013-2019 Intel Corporation.
 
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -225,7 +225,7 @@ Returns:
   //
   // Get Hob list for SMRAM desc
   //
-  GuidHob    = GetFirstGuidHob (&gEfiSmmPeiSmramMemoryReserveGuid);
+  GuidHob    = GetFirstGuidHob (&gEfiSmmSmramMemoryGuid);
   ASSERT (GuidHob);
   DescriptorBlock = GET_GUID_HOB_DATA (GuidHob);
   ASSERT (DescriptorBlock);

+ 1 - 1
Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.inf

@@ -56,7 +56,7 @@
   gEfiSmmSwDispatch2ProtocolGuid
 
 [Guids]
-  gEfiSmmPeiSmramMemoryReserveGuid
+  gEfiSmmSmramMemoryGuid
   gQncS3CodeInLockBoxGuid
   gQncS3ContextInLockBoxGuid
 

+ 4 - 4
Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c

@@ -1,7 +1,7 @@
 /** @file
 Framework PEIM to initialize memory on a Quark Memory Controller.
 
-Copyright (c) 2013 - 2016, Intel Corporation.
+Copyright (c) 2013 - 2019, Intel Corporation.
 
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -836,7 +836,7 @@ InstallEfiMemory (
   BufferSize += ((SmramRanges - 1) * sizeof (EFI_SMRAM_DESCRIPTOR));
 
   Hob.Raw = BuildGuidHob (
-              &gEfiSmmPeiSmramMemoryReserveGuid,
+              &gEfiSmmSmramMemoryGuid,
               BufferSize
               );
   ASSERT (Hob.Raw);
@@ -958,7 +958,7 @@ InstallS3Memory (
   }
 
   Hob.Raw = BuildGuidHob (
-              &gEfiSmmPeiSmramMemoryReserveGuid,
+              &gEfiSmmSmramMemoryGuid,
               BufferSize
               );
   ASSERT (Hob.Raw);
@@ -1546,7 +1546,7 @@ InfoPostInstallMemory (
         }
       }
     } else if (Hob.Header->HobType == EFI_HOB_TYPE_GUID_EXTENSION) {
-      if (CompareGuid (&(Hob.Guid->Name), &gEfiSmmPeiSmramMemoryReserveGuid)) {
+      if (CompareGuid (&(Hob.Guid->Name), &gEfiSmmSmramMemoryGuid)) {
         SmramHobDescriptorBlock = (VOID*) (Hob.Raw + sizeof (EFI_HOB_GUID_TYPE));
         if (SmramDescriptorPtr != NULL) {
           *SmramDescriptorPtr = SmramHobDescriptorBlock->Descriptor;

+ 1 - 1
Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf

@@ -108,7 +108,7 @@
   gEfiAcpiVariableGuid                          # ALWAYS_CONSUMED L"AcpiGlobalVariab"
   gEfiMemoryTypeInformationGuid                 # ALWAYS_CONSUMED L"MemoryTypeInformation"
   gEfiMemoryConfigDataGuid                      # SOMETIMES_PRODUCED  Hob: GUID_EXTENSION
-  gEfiSmmPeiSmramMemoryReserveGuid              # ALWAYS_PRODUCED  Hob: GUID_EXTENSION
+  gEfiSmmSmramMemoryGuid                        # ALWAYS_PRODUCED  Hob: GUID_EXTENSION
   gEfiFirmwareFileSystem2Guid                   # ALWAYS_CONSUMED
   gPeiCapsuleOnDataCDGuid
   gPeiCapsuleOnFatIdeDiskGuid