From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: marc.w.chen@intel.com) Received: from mga14.intel.com (mga14.intel.com []) by groups.io with SMTP; Mon, 02 Sep 2019 08:38:15 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 Sep 2019 08:38:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,459,1559545200"; d="scan'208";a="176344496" Received: from chenmarc-mobl.gar.corp.intel.com ([10.255.160.178]) by orsmga008.jf.intel.com with ESMTP; 02 Sep 2019 08:38:06 -0700 From: "Marc W Chen" To: devel@edk2.groups.io Cc: Michael D Kinney , Kelly Steele , Nate DeSimone Subject: [edk2-platforms][PATCH V2 2/6] QuarkPlatformPkg: Clean up duplicated SmramMemoryReserve.h files Date: Mon, 2 Sep 2019 23:35:49 +0800 Message-Id: <20190902153553.3256-3-marc.w.chen@intel.com> X-Mailer: git-send-email 2.16.2.windows.1 In-Reply-To: <20190902153553.3256-1-marc.w.chen@intel.com> References: <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 Cc: Kelly Steele Co-authored-by: Nate DeSimone Signed-off-by: Marc W Chen Signed-off-by: Nate DeSimone --- .../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