From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: isaac.w.oram@intel.com) Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by groups.io with SMTP; Tue, 10 Sep 2019 19:43:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 10 Sep 2019 19:43:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,491,1559545200"; d="scan'208";a="175510732" Received: from orsmsx106.amr.corp.intel.com ([10.22.225.133]) by orsmga007.jf.intel.com with ESMTP; 10 Sep 2019 19:43:55 -0700 Received: from orsmsx152.amr.corp.intel.com (10.22.226.39) by ORSMSX106.amr.corp.intel.com (10.22.225.133) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 10 Sep 2019 19:43:55 -0700 Received: from orsmsx116.amr.corp.intel.com ([169.254.7.63]) by ORSMSX152.amr.corp.intel.com ([169.254.8.93]) with mapi id 14.03.0439.000; Tue, 10 Sep 2019 19:43:55 -0700 From: "Oram, Isaac W" To: "Chen, Marc W" , "devel@edk2.groups.io" CC: "Gillispie, Thad" , "Bu, Daocheng" , "Desimone, Nathaniel L" Subject: Re: [edk2-platforms][PATCH V2 5/6] PurleySktPkg: Clean up duplicated SmramMemoryReserve.h files Thread-Topic: [edk2-platforms][PATCH V2 5/6] PurleySktPkg: Clean up duplicated SmramMemoryReserve.h files Thread-Index: AQHVYaRxKMoClZISikCIpzPURypw5acl0WqA Date: Wed, 11 Sep 2019 02:43:55 +0000 Message-ID: <3155A53C14BABF45A364D10949B7414C971F0762@ORSMSX116.amr.corp.intel.com> References: <20190902153553.3256-1-marc.w.chen@intel.com> <20190902153553.3256-6-marc.w.chen@intel.com> In-Reply-To: <20190902153553.3256-6-marc.w.chen@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.2.0.6 x-originating-ip: [10.22.254.139] MIME-Version: 1.0 Return-Path: isaac.w.oram@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Isaac Oram -----Original Message----- From: Chen, Marc W=20 Sent: Monday, September 2, 2019 8:36 AM To: devel@edk2.groups.io Cc: Gillispie, Thad ; Bu, Daocheng ; Oram, Isaac W ; Desimone, Nathaniel L Subject: [edk2-platforms][PATCH V2 5/6] PurleySktPkg: Clean up duplicated S= mramMemoryReserve.h files REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D2108 SmramMemoryReserve.h has been added into Edk2\MdePkg\Include\Guid\SmramMemo= ryReserve.h. The duplicated header file can be cleaned up. Edk2Platforms\Silicon\Intel\PurleySktPkg\Include\Guid\SmramMemoryReserve.h Cc: Thad Gillispie Cc: Daocheng Bu Cc: Isaac W Oram Co-authored-by: Nate DeSimone Signed-off-by: Marc W Chen Signed-off-by: Nate DeSimone --- .../Include/Guid/SmramMemoryReserve.h | 43 ------------------- Silicon/Intel/PurleySktPkg/SocketPkg.dec | 3 +- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 Silic= on/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h diff --git a/Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h b= /Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h deleted file mode 100644 index 46e8198f00..0000000000 --- a/Silicon/Intel/PurleySktPkg/Include/Guid/SmramMemoryReserve.h @@ -1,43 +0,0 @@ -/** @file - -Copyright (c) 2018, Intel Corporation. All rights reserved.
-SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef _EFI_SMM_PEI_SMRAM_MEMORY_RESERVE_H_ -#define _EFI_SMM_PEI_SMRAM_MEMORY_RESERVE_H_ - -#define EFI_SMM_PEI_SMRAM_MEMORY_RESERVE \ - { \ - 0x6dadf1d1, 0xd4cc, 0x4910, {0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff,= 0x3d } \ - } - -/** -* GUID specific data structure of HOB for reserving SMRAM regions. -* -* Inconsistent with specification here:=20 -* EFI_HOB_SMRAM_DESCRIPTOR_BLOCK has been changed to EFI_SMRAM_HOB_DESCRIP= TOR_BLOCK. -* This inconsistency is kept in code in order for backward compatibility. -**/ -typedef struct { - /// - /// Designates the number of possible regions in the system - /// that can be usable for SMRAM.=20 - /// - /// Inconsistent with specification here: =20 - /// In Framework SMM CIS 0.91 specification, it defines the field type a= s UINTN. - /// However, HOBs are supposed to be CPU neutral, so UINT32 should be us= ed instead. - /// - UINT32 NumberOfSmmReservedRegions; - /// - /// Used throughout this protocol to describe the candidate - /// regions for SMRAM that are supported by this platform.=20 - /// - EFI_SMRAM_DESCRIPTOR Descriptor[1]; -} EFI_SMRAM_HOB_DESCRIPTOR_BLOCK; - -extern EFI_GUID gEfiSmmPeiSmramMemoryReserveGuid; - -#endif - diff --git a/Silicon/Intel/PurleySktPkg/SocketPkg.dec b/Silicon/Intel/Purle= ySktPkg/SocketPkg.dec index 2ff937f5d8..e554a9555d 100644 --- a/Silicon/Intel/PurleySktPkg/SocketPkg.dec +++ b/Silicon/Intel/PurleySktPkg/SocketPkg.dec @@ -1,6 +1,6 @@ ### @file # -# Copyright (c) 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2018 - 2019, Intel Corporation. All rights=20 +reserved.
# # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -51,7 +51,6 @@ gEfiRasClvTesterGuid =3D { 0x9bd36f4f, 0x= 08dc, 0x4eab, { 0x86, 0x37, 0x2b, 0xc1, 0xbd, 0x5e, 0x0d, 0x95 } } gSocketPkgFpgaGuid =3D { 0x624b948f, 0x= 6eba, 0x4dfd, { 0x9d, 0xda, 0x10, 0xb0, 0x07, 0x3a, 0x37, 0x35 } } # {624B= 948F-6EBA-4DFD-9DDA-10B0073A3735} gIioPolicyHobGuid =3D { 0xcabb327, 0x= 11fe, 0x416b, { 0xae, 0x80, 0x2d, 0xe5, 0xdf, 0x60, 0xf7, 0x7d } } - gEfiSmmPeiSmramMemoryReserveGuid =3D { 0x6dadf1d1, 0x= d4cc, 0x4910, { 0xbb, 0x6e, 0x82, 0xb1, 0xfd, 0x80, 0xff, 0x3d } } =20 [Ppis] gPeiBaseMemoryTestPpiGuid =3D { 0xb6ec423c, 0x= 21d2, 0x490d, { 0x85, 0xc6, 0xdd, 0x58, 0x64, 0xea, 0xa6, 0x74 } } -- 2.17.1.windows.2