public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Marc W Chen" <marc.w.chen@intel.com>
To: devel@edk2.groups.io
Cc: Michael D Kinney <michael.d.kinney@intel.com>,
	Kelly Steele <kelly.steele@intel.com>,
	Nate DeSimone <nathaniel.l.desimone@intel.com>
Subject: [edk2-platforms][PATCH V2 2/6] QuarkPlatformPkg: Clean up duplicated SmramMemoryReserve.h files
Date: Mon,  2 Sep 2019 23:35:49 +0800	[thread overview]
Message-ID: <20190902153553.3256-3-marc.w.chen@intel.com> (raw)
In-Reply-To: <20190902153553.3256-1-marc.w.chen@intel.com>

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>
---
 .../Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.c                 | 4 ++--
 .../Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.inf               | 2 +-
 .../Platform/Pei/PlatformInit/MrcWrapper.c                | 8 ++++----
 .../Platform/Pei/PlatformInit/PlatformEarlyInit.inf       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.c b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.c
index f7f7ca3196..479459b801 100644
--- a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.c
+++ b/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);
diff --git a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.inf b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.inf
index be80c73528..5301eccc6e 100644
--- a/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.inf
+++ b/Platform/Intel/QuarkPlatformPkg/Acpi/DxeSmm/AcpiSmm/AcpiSmmPlatform.inf
@@ -56,7 +56,7 @@
   gEfiSmmSwDispatch2ProtocolGuid
 
 [Guids]
-  gEfiSmmPeiSmramMemoryReserveGuid
+  gEfiSmmSmramMemoryGuid
   gQncS3CodeInLockBoxGuid
   gQncS3ContextInLockBoxGuid
 
diff --git a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c
index fcb5c79aaf..1bb532acfd 100644
--- a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/MrcWrapper.c
+++ b/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;
diff --git a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf b/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf
index adec9e20eb..7910446402 100644
--- a/Platform/Intel/QuarkPlatformPkg/Platform/Pei/PlatformInit/PlatformEarlyInit.inf
+++ b/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
-- 
2.17.1.windows.2


  parent reply	other threads:[~2019-09-02 15:38 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-02 15:35 [edk2-platforms][PATCH V2 0/6] clean up duplicated files in edk2-platforms Marc W Chen
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 1/6] MinPlatformPkg: Clean up duplicated SmramMemoryReserve.h files Marc W Chen
2019-09-03  9:12   ` Chiu, Chasel
2019-09-04  7:00     ` [edk2-devel] " Kubacki, Michael A
2019-09-02 15:35 ` Marc W Chen [this message]
2019-09-03 14:59   ` [edk2-platforms][PATCH V2 2/6] QuarkPlatformPkg: " Steele, Kelly
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 3/6] CoffeelakeSiliconPkg: " Marc W Chen
2019-09-03  9:13   ` Chiu, Chasel
2019-09-04  7:00   ` Kubacki, Michael A
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 4/6] KabylakeSiliconPkg: " Marc W Chen
2019-09-03  9:15   ` Chiu, Chasel
2019-09-04  7:00   ` Kubacki, Michael A
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 5/6] PurleySktPkg: " Marc W Chen
2019-09-11  2:43   ` Oram, Isaac W
2019-09-11  3:44     ` daocheng.bu
2019-09-02 15:35 ` [edk2-platforms][PATCH V2 6/6] QuarkSocPkg: " Marc W Chen
2019-09-03 14:59   ` Steele, Kelly
2019-09-12  2:23 ` [edk2-platforms][PATCH V2 0/6] clean up duplicated files in edk2-platforms Nate DeSimone

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190902153553.3256-3-marc.w.chen@intel.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox