Re: [Patch] MdePkg: Fix guid conflict.

["Gao, Liming" <liming.gao@intel.com>]

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: Dong, Eric
> Sent: Friday, August 12, 2016 10:10 AM
> To: edk2-devel@lists.01.org
> Cc: Gao, Liming <liming.gao@intel.com>; Cecil Sheng <cecil.sheng@hpe.com>
> Subject: [Patch] MdePkg: Fix guid conflict.
> 
> Update Image Decoder Protocol GUID value to fix GUID
> conflict with EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_GUID.
> 
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Eric Dong <eric.dong@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Cecil Sheng <cecil.sheng@hpe.com>
> ---
>  MdePkg/Include/Protocol/ImageDecoder.h | 10 +++++++++-
>  MdePkg/MdePkg.dec                      | 14 +++++++++++---
>  2 files changed, 20 insertions(+), 4 deletions(-)
> 
> 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 <Protocol/HiiImage.h>
> 
> 
> +//
> +// 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, 0x18,
> 0xea }}
> 
> 
>  #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 @@
> 
>    ## Include/Guid/MemoryOverwriteControl.h
>    gEfiMemoryOverwriteControlDataGuid = { 0xe20939be, 0x32d4, 0x41be,
> {0xa1, 0x50, 0x89, 0x7f, 0x85, 0xd4, 0x98, 0x29 }}
> -
> +
>    ## Include/IndustryStandard/MemoryOverwriteRequestControlLock.h
>    gEfiMemoryOverwriteRequestControlLockGuid = { 0xBB983CCF, 0x151D,
> 0x40E1, {0xA0, 0x7B, 0x4A, 0x17, 0xBE, 0x16, 0x82, 0x92}}
> 
> @@ -1384,7 +1384,7 @@
> 
>    ## Include/Protocol/TrEEProtocol.h
>    gEfiTrEEProtocolGuid           = {0x607f766c, 0x7455, 0x42be, { 0x93, 0x0b, 0xe4,
> 0xd7, 0x6d, 0xb2, 0x72, 0x0f }}
> -
> +
>    ## Include/Protocol/Tcg2Protocol.h
>    gEfiTcg2ProtocolGuid           = {0x607f766c, 0x7455, 0x42be, { 0x93, 0x0b, 0xe4,
> 0xd7, 0x6d, 0xb2, 0x72, 0x0f }}
>    gEfiTcg2FinalEventsTableGuid   = {0x1e2ed096, 0x30e2, 0x4254, { 0xbd, 0x89,
> 0x86, 0x3b, 0xbe, 0xf8, 0x23, 0x25 }}
> @@ -1620,7 +1620,15 @@
>    gEfiRamDiskProtocolGuid              = { 0xab38a0df, 0x6873, 0x44a9, { 0x87,
> 0xe6, 0xd4, 0xeb, 0x56, 0x14, 0x84, 0x49 }}
> 
>    ## Include/Protocol/ImageDecoder.h
> -  gEfiHiiImageDecoderProtocolGuid      = { 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      = { 0x9e66f251, 0x727c, 0x418c, { 0xbf,
> 0xd6, 0xc2, 0xb4, 0x25, 0x28, 0x18, 0xea }}
> 
>    ## Include/Protocol/HiiImageEx.h
>    gEfiHiiImageExProtocolGuid           = { 0x1a1241e6, 0x8f19, 0x41a9, { 0xbc, 0xe,
> 0xe8, 0xef, 0x39, 0xe0, 0x65, 0x46 }}
> --
> 2.6.4.windows.1