GUIDs should go below the correct comment block in MdePkg.dec.

Signed-off-by: lzeng14
Reviewed-by: lgao4
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@12051 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Guid/ImageAuthentication.h b/MdePkg/Include/Guid/ImageAuthentication.h
index e7a42ca9e38bc0542effbe9301e196d36128c00a..bf5295a0463f1a0faf1c54ed6d2ff9569a178915 100644 (file)
--- a/MdePkg/Include/Guid/ImageAuthentication.h
+++ b/MdePkg/Include/Guid/ImageAuthentication.h
@@ -12,7 +12,7 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
   @par Revision Reference:\r
-  GUIDs defined in UEFI 2.2 spec.\r
+  GUIDs defined in UEFI 2.3.1 spec.\r
 **/\r
 \r
 #ifndef __IMAGE_AUTHTICATION_H__\r
@@ -271,5 +271,8 @@ extern EFI_GUID gEfiCertRsa2048Sha256Guid;
 extern EFI_GUID gEfiCertSha1Guid;\r
 extern EFI_GUID gEfiCertRsa2048Sha1Guid;\r
 extern EFI_GUID gEfiCertX509Guid;\r
+extern EFI_GUID gEfiCertSha224Guid;\r
+extern EFI_GUID gEfiCertSha384Guid;\r
+extern EFI_GUID gEfiCertSha512Guid;\r
 \r
 #endif\r

diff --git a/MdePkg/Include/Protocol/StorageSecurityCommand.h b/MdePkg/Include/Protocol/StorageSecurityCommand.h
index ca9c6c7e62d09a2b0b05651596bb436f3c794361..96ac7c164d68d8bc06aae3fdbc48b257d667ed0a 100644 (file)
--- a/MdePkg/Include/Protocol/StorageSecurityCommand.h
+++ b/MdePkg/Include/Protocol/StorageSecurityCommand.h
@@ -1,5 +1,5 @@
 /** @file\r
-  EFI Storage Security Command Protocol as defined in UEFI specification.\r
+  EFI Storage Security Command Protocol as defined in UEFI 2.3.1 specification.\r
   This protocol is used to abstract mass storage devices to allow code running in\r
   the EFI boot services environment to send security protocol commands to mass\r
   storage devices without specific knowledge of the type of device or controller\r

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 89a49379a8b37d2ecfebb7bb607f48e2f704561b..2e4b06f55f9b512c1071811d5a1d0301f5eba9a2 100644 (file)
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -347,40 +347,9 @@
   ## Include/Guid/WinCertificate.h\r
   gEfiCertTypeRsa2048Sha256Guid = { 0xa7717414, 0xc616, 0x4977, {0x94, 0x20, 0x84, 0x47, 0x12, 0xa7, 0x35, 0xbf }}\r
 \r
-  ## Include/Guid/ImageAuthentication.h\r
-  gEfiImageSecurityDatabaseGuid = { 0xd719b2cb, 0x3d3a, 0x4596, { 0xa3, 0xbc, 0xda, 0xd0, 0xe, 0x67, 0x65, 0x6f }}\r
-\r
-  ## Include/Guid/ImageAuthentication.h\r
-  gEfiCertSha256Guid = { 0xc1c41626, 0x504c, 0x4092, {0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 }}\r
-\r
-  ## Include/Guid/ImageAuthentication.h\r
-  gEfiCertRsa2048Guid = { 0x3c5766e8, 0x269c, 0x4e34, {0xaa, 0x14, 0xed, 0x77, 0x6e, 0x85, 0xb3, 0xb6 }}\r
-\r
-  ## Include/Guid/ImageAuthentication.h\r
-  gEfiCertRsa2048Sha256Guid = { 0xe2b36190, 0x879b, 0x4a3d, {0xad, 0x8d, 0xf2, 0xe7, 0xbb, 0xa3, 0x27, 0x84 }}\r
-\r
-  ## Include/Guid/ImageAuthentication.h\r
-  gEfiCertSha1Guid = { 0x826ca512, 0xcf10, 0x4ac9, {0xb1, 0x87, 0xbe, 0x1, 0x49, 0x66, 0x31, 0xbd }}\r
-\r
-  ## Include/Guid/ImageAuthentication.h\r
-  gEfiCertRsa2048Sha1Guid = {0x67f8444f, 0x8743, 0x48f1, {0xa3, 0x28, 0x1e, 0xaa, 0xb8, 0x73, 0x60, 0x80 }}\r
-\r
-  ## Include/Guid/ImageAuthentication.h\r
-  gEfiCertX509Guid = { 0xa5c059a1, 0x94e4, 0x4aa7, {0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 }}\r
-\r
-  ## Include/Guid/ImageAuthentication.h\r
-  gEfiCertSha224Guid = { 0xb6e5233, 0xa65c, 0x44c9, {0x94, 0x7, 0xd9, 0xab, 0x83, 0xbf, 0xc8, 0xbd }}\r
-\r
-  ## Include/Guid/ImageAuthentication.h\r
-  gEfiCertSha384Guid = { 0xff3e5307, 0x9fd0, 0x48c9, {0x85, 0xf1, 0x8a, 0xd5, 0x6c, 0x70, 0x1e, 0x1 }}\r
-\r
-  ## Include/Guid/ImageAuthentication.h\r
-  gEfiCertSha512Guid = { 0x93e0fae, 0xa6c4, 0x4f50, {0x9f, 0x1b, 0xd4, 0x1e, 0x2b, 0x89, 0xc1, 0x9a }}\r
-\r
   #\r
   # GUID defined in UEFI2.2\r
   #\r
-\r
   ## Include/Protocol/UserManager.h\r
   gEfiEventUserProfileChangedGuid = { 0xbaf1e6de, 0x209e, 0x4adb, {0x8d, 0x96, 0xfd, 0x8b, 0x71, 0xf3, 0xf6, 0x83 }}\r
 \r
@@ -411,6 +380,15 @@
   ## Include/Protocol/UserManager.h\r
   gEfiUserInfoAccessSetupRestrictedGuid = { 0xbdb38125, 0x4d63, 0x49f4, { 0x82, 0x12, 0x61, 0xcf, 0x5a, 0x19, 0xa, 0xf8 }}\r
 \r
+  ## Include/Guid/ImageAuthentication.h\r
+  gEfiImageSecurityDatabaseGuid  = { 0xd719b2cb, 0x3d3a, 0x4596, {0xa3, 0xbc, 0xda, 0xd0,  0xe, 0x67, 0x65, 0x6f }}\r
+  gEfiCertSha256Guid             = { 0xc1c41626, 0x504c, 0x4092, {0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 }}\r
+  gEfiCertRsa2048Guid            = { 0x3c5766e8, 0x269c, 0x4e34, {0xaa, 0x14, 0xed, 0x77, 0x6e, 0x85, 0xb3, 0xb6 }}\r
+  gEfiCertRsa2048Sha256Guid      = { 0xe2b36190, 0x879b, 0x4a3d, {0xad, 0x8d, 0xf2, 0xe7, 0xbb, 0xa3, 0x27, 0x84 }}\r
+  gEfiCertSha1Guid               = { 0x826ca512, 0xcf10, 0x4ac9, {0xb1, 0x87, 0xbe,  0x1, 0x49, 0x66, 0x31, 0xbd }}\r
+  gEfiCertRsa2048Sha1Guid        = { 0x67f8444f, 0x8743, 0x48f1, {0xa3, 0x28, 0x1e, 0xaa, 0xb8, 0x73, 0x60, 0x80 }}\r
+  gEfiCertX509Guid               = { 0xa5c059a1, 0x94e4, 0x4aa7, {0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 }}\r
+\r
   #\r
   # GUIDs defined in UEFI2.3.1\r
   #\r
@@ -440,6 +418,11 @@
   gEfiKmsFormatRsasha2562048Guid = { 0xa477af13, 0x877d, 0x4060, {0xba, 0xa1, 0x25, 0xd1, 0xbe, 0xa0, 0x8a, 0xd3 }}\r
   gEfiKmsFormatRsasha2563072Guid = { 0x4e1356c2,  0xeed, 0x463f, {0x81, 0x47, 0x99, 0x33, 0xab, 0xdb, 0xc7, 0xd5 }}\r
 \r
+  ## Include/Guid/ImageAuthentication.h\r
+  gEfiCertSha224Guid             = { 0xb6e5233,  0xa65c, 0x44c9, {0x94, 0x7,  0xd9, 0xab, 0x83, 0xbf, 0xc8, 0xbd }}\r
+  gEfiCertSha384Guid             = { 0xff3e5307, 0x9fd0, 0x48c9, {0x85, 0xf1, 0x8a, 0xd5, 0x6c, 0x70, 0x1e,  0x1 }}\r
+  gEfiCertSha512Guid             = { 0x93e0fae,  0xa6c4, 0x4f50, {0x9f, 0x1b, 0xd4, 0x1e, 0x2b, 0x89, 0xc1, 0x9a }}\r
+\r
   #\r
   # GUID defined in PI1.0\r
   #\r
@@ -926,9 +909,6 @@
   ## Include/Protocol/BlockIo.h\r
   gEfiBlockIoProtocolGuid        = { 0x964E5B21, 0x6459, 0x11D2, { 0x8E, 0x39, 0x00, 0xA0, 0xC9, 0x69, 0x72, 0x3B }}\r
 \r
-  ## Include/Protocol/BlockIo2.h\r
-  gEfiBlockIo2ProtocolGuid       = { 0xa77b2472, 0xe282, 0x4e9f, {0xa2, 0x45, 0xc2, 0xc0, 0xe2, 0x7b, 0xbc, 0xc1 }}\r
-\r
   ## Include/Protocol/UnicodeCollation.h\r
   gEfiUnicodeCollationProtocolGuid = { 0x1D85CD7F, 0xF43D, 0x11D2, { 0x9A, 0x0C, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
 \r
@@ -1151,15 +1131,18 @@
   ## Include/Protocol/IpSec.h\r
   gEfiIpSec2ProtocolGuid               = { 0xa3979e64, 0xace8, 0x4ddc, {0xbc, 0x7, 0x4d, 0x66, 0xb8, 0xfd, 0x9, 0x77 }}\r
 \r
-  ## Include/Protocol/StorageSecurityCommand.h\r
-  gEfiStorageSecurityCommandProtocolGuid = { 0xc88b0b6d, 0x0dfc, 0x49a7, { 0x9c, 0xb4, 0x49, 0x7, 0x4b, 0x4c, 0x3a, 0x78 } } \r
-\r
   #\r
   # Protocols defined in UEFI2.3.1\r
   #\r
   ## Include/Protocol/Kms.h\r
   gEfiKmsProtocolGuid                  = { 0xEC3A978D, 0x7C4E, 0x48FA, {0x9A, 0xBE, 0x6A, 0xD9, 0x1C, 0xC8, 0xF8, 0x11 }}\r
 \r
+  ## Include/Protocol/BlockIo2.h\r
+  gEfiBlockIo2ProtocolGuid             = { 0xa77b2472, 0xe282, 0x4e9f, {0xa2, 0x45, 0xc2, 0xc0, 0xe2, 0x7b, 0xbc, 0xc1 }}\r
+\r
+  ## Include/Protocol/StorageSecurityCommand.h\r
+  gEfiStorageSecurityCommandProtocolGuid    = { 0xc88b0b6d, 0x0dfc, 0x49a7, {0x9c, 0xb4, 0x49, 0x7, 0x4b, 0x4c, 0x3a, 0x78 }}\r
+\r
 [PcdsFeatureFlag]\r
   ## If TRUE, the component name protocol will not be installed.\r
   gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE|BOOLEAN|0x0000000d\r