From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by ml01.01.org (Postfix) with ESMTP id 61DBC1A1E0F for ; Mon, 15 Aug 2016 19:04:09 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga101.fm.intel.com with ESMTP; 15 Aug 2016 19:04:08 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.28,528,1464678000"; d="scan'208";a="1014937957" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga001.jf.intel.com with ESMTP; 15 Aug 2016 19:03:55 -0700 Received: from fmsmsx122.amr.corp.intel.com (10.18.125.37) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 15 Aug 2016 19:03:54 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx122.amr.corp.intel.com (10.18.125.37) with Microsoft SMTP Server (TLS) id 14.3.248.2; Mon, 15 Aug 2016 19:03:54 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.147]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.150]) with mapi id 14.03.0248.002; Tue, 16 Aug 2016 10:03:52 +0800 From: "Gao, Liming" To: "Dong, Eric" , "edk2-devel@lists.01.org" CC: Cecil Sheng Thread-Topic: [Patch] MdePkg: Fix guid conflict. Thread-Index: AQHR9D6oYeD3Nq6fNUuV9MkL3F+dlaBK3EuQ Date: Tue, 16 Aug 2016 02:03:51 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A1155EB6AA@shsmsx102.ccr.corp.intel.com> References: <1470967788-23324-1-git-send-email-eric.dong@intel.com> In-Reply-To: <1470967788-23324-1-git-send-email-eric.dong@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] MdePkg: Fix guid conflict. X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 16 Aug 2016 02:04:09 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: Dong, Eric > Sent: Friday, August 12, 2016 10:10 AM > To: edk2-devel@lists.01.org > Cc: Gao, Liming ; Cecil Sheng > Subject: [Patch] MdePkg: Fix guid conflict. >=20 > Update Image Decoder Protocol GUID value to fix GUID > conflict with EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID. >=20 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Eric Dong > Cc: Liming Gao > Cc: Cecil Sheng > --- > MdePkg/Include/Protocol/ImageDecoder.h | 10 +++++++++- > MdePkg/MdePkg.dec | 14 +++++++++++--- > 2 files changed, 20 insertions(+), 4 deletions(-) >=20 > diff --git a/MdePkg/Include/Protocol/ImageDecoder.h > b/MdePkg/Include/Protocol/ImageDecoder.h > index f1985bc..aebb813 100644 > --- a/MdePkg/Include/Protocol/ImageDecoder.h > +++ b/MdePkg/Include/Protocol/ImageDecoder.h > @@ -18,8 +18,16 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY > KIND, EITHER EXPRESS OR IMPLIED. > #include >=20 >=20 > +// > +// In UEFI 2.6 spec,this guid value is duplicate with > +// EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID. Now update this guid > value to > +// avoid the duplicate guid issue. So its value is not consistent with > +// UEFI spec definition now. We have proposed to update UEFI spec to > +// use this new guid. After new spec released, we will remove this > +// comments. > +// > #define EFI_HII_IMAGE_DECODER_PROTOCOL_GUID \ > - { 0x2f707ebb, 0x4a1a, 0x11d4, {0x9a,0x38,0x00,0x90,0x27,0x3f,0xc1,0x4d= }} > + {0x9e66f251, 0x727c, 0x418c, { 0xbf, 0xd6, 0xc2, 0xb4, 0x25, 0x28, 0x1= 8, > 0xea }} >=20 >=20 > #define EFI_HII_IMAGE_DECODER_NAME_JPEG_GUID \ > diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec > index 458d568..606e2f1 100644 > --- a/MdePkg/MdePkg.dec > +++ b/MdePkg/MdePkg.dec > @@ -393,7 +393,7 @@ >=20 > ## Include/Guid/MemoryOverwriteControl.h > gEfiMemoryOverwriteControlDataGuid =3D { 0xe20939be, 0x32d4, 0x41be, > {0xa1, 0x50, 0x89, 0x7f, 0x85, 0xd4, 0x98, 0x29 }} > - > + > ## Include/IndustryStandard/MemoryOverwriteRequestControlLock.h > gEfiMemoryOverwriteRequestControlLockGuid =3D { 0xBB983CCF, 0x151D, > 0x40E1, {0xA0, 0x7B, 0x4A, 0x17, 0xBE, 0x16, 0x82, 0x92}} >=20 > @@ -1384,7 +1384,7 @@ >=20 > ## Include/Protocol/TrEEProtocol.h > gEfiTrEEProtocolGuid =3D {0x607f766c, 0x7455, 0x42be, { 0x93= , 0x0b, 0xe4, > 0xd7, 0x6d, 0xb2, 0x72, 0x0f }} > - > + > ## Include/Protocol/Tcg2Protocol.h > gEfiTcg2ProtocolGuid =3D {0x607f766c, 0x7455, 0x42be, { 0x93= , 0x0b, 0xe4, > 0xd7, 0x6d, 0xb2, 0x72, 0x0f }} > gEfiTcg2FinalEventsTableGuid =3D {0x1e2ed096, 0x30e2, 0x4254, { 0xbd= , 0x89, > 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25 }} > @@ -1620,7 +1620,15 @@ > gEfiRamDiskProtocolGuid =3D { 0xab38a0df, 0x6873, 0x44a9,= { 0x87, > 0xe6, 0xd4, 0xeb, 0x56, 0x14, 0x84, 0x49 }} >=20 > ## Include/Protocol/ImageDecoder.h > - gEfiHiiImageDecoderProtocolGuid =3D { 0x2f707ebb, 0x4a1a, 0x11d4,= { 0x9a, > 0x38, 0x00, 0x90, 0x27, 0x3f, 0xc1, 0x4d }} > + ## > + ## In UEFI 2.6 spec,this guid value is duplicate with > + ## EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID. Now update this guid > value to > + ## avoid the duplicate guid issue. So its value is not consistent with > + ## UEFI spec definition now. We have proposed to update UEFI spec to > + ## use this new guid. After new spec released, we will remove this > + ## comments. > + ## > + gEfiHiiImageDecoderProtocolGuid =3D { 0x9e66f251, 0x727c, 0x418c,= { 0xbf, > 0xd6, 0xc2, 0xb4, 0x25, 0x28, 0x18, 0xea }} >=20 > ## Include/Protocol/HiiImageEx.h > gEfiHiiImageExProtocolGuid =3D { 0x1a1241e6, 0x8f19, 0x41a9,= { 0xbc, 0xe, > 0xe8, 0xef, 0x39, 0xe0, 0x65, 0x46 }} > -- > 2.6.4.windows.1