X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=MdePkg%2FMdePkg.dec;h=606e2f16704d64045fbaff8a469058550b9a679f;hb=02b5cf7fb1824e089f19ca03b685a1f196860bf6;hp=10de2995e8ce649e9c197fd5b658541f132174c2;hpb=03e17578402a7b0dad5def719170429ad570a21f;p=mirror_edk2.git

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 10de2995e8..606e2f1670 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 }}
@@ -1628,6 +1636,9 @@
   ## Include/Protocol/SdMmcPassThru.h
   gEfiSdMmcPassThruProtocolGuid        = { 0x716ef0d9, 0xff83, 0x4f69, {0x81, 0xe9, 0x51, 0x8b, 0xd3, 0x9a, 0x8e, 0x70 }}
 
+  ## Include/Protocol/EraseBlock.h
+  gEfiEraseBlockProtocolGuid           = { 0x95a9a93e, 0xa86e, 0x4926, {0xaa, 0xef, 0x99, 0x18, 0xe7, 0x72, 0xd9, 0x87 }}
+
 #
 # [Error.gEfiMdePkgTokenSpaceGuid]
 #   0x80000001 | Invalid value provided.