MdePkg: Move gEfiSmbios3TableGuid to UEFI2.5 section in MdePkg.dec.

Also enhance the comments in MdePkg/Include/Guid/Smbios.h.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17386 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdePkg/Include/Guid/SmBios.h b/MdePkg/Include/Guid/SmBios.h
index c37d5ebc525d2dba9c73a28c58d3088bf084c721..430028808ecdc8963dff542bfc2187094bca6abf 100644 (file)
--- a/MdePkg/Include/Guid/SmBios.h
+++ b/MdePkg/Include/Guid/SmBios.h
@@ -1,7 +1,7 @@
 /** @file\r
-  GUIDs used to locate the SMBIOS tables in the UEFI 2.0 system table.\r
+  GUIDs used to locate the SMBIOS tables in the UEFI 2.5 system table.\r
 \r
-  This GUID in the system table is the only legal way to search for and \r
+  These GUIDs in the system table are the only legal ways to search for and\r
   locate the SMBIOS tables. Do not search the 0xF0000 segment to find SMBIOS\r
   tables.\r
 \r
@@ -15,7 +15,7 @@
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
 \r
   @par Revision Reference:\r
-  GUIDs defined in UEFI 2.0 spec.\r
+  GUIDs defined in UEFI 2.5 spec.\r
 \r
 **/\r
 \r

diff --git a/MdePkg/MdePkg.dec b/MdePkg/MdePkg.dec
index 8b4d556584d48f332eaf93708802a945a52b5cfd..6a1af404d810b3a3854b29544506cd62f9ec150e 100644 (file)
--- a/MdePkg/MdePkg.dec
+++ b/MdePkg/MdePkg.dec
@@ -2,7 +2,7 @@
 # This Package provides all definitions, library classes and libraries instances.\r
 #\r
 # It also provides the definitions(including PPIs/PROTOCOLs/GUIDs) of\r
-# EFI1.10/UEFI2.4/PI1.4 and some Industry Standards.\r
+# EFI1.10/UEFI2.5/PI1.4 and some Industry Standards.\r
 #\r
 # Copyright (c) 2007 - 2015, Intel Corporation. All rights reserved.<BR>\r
 # Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
@@ -308,9 +308,6 @@
   ## Include/Guid/SmBios.h\r
   gEfiSmbiosTableGuid            = { 0xEB9D2D31, 0x2D88, 0x11D3, { 0x9A, 0x16, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
 \r
-  ## Include/Guid/SmBios.h\r
-  gEfiSmbios3TableGuid           = { 0xF2FD1544, 0x9794, 0x4A2C, { 0x99, 0x2E, 0xE5, 0xBB, 0xCF, 0x20, 0xE3, 0x94 }}\r
-\r
   ## Include/Guid/Mps.h\r
   gEfiMpsTableGuid               = { 0xEB9D2D2F, 0x2D88, 0x11D3, { 0x9A, 0x16, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D }}\r
 \r
@@ -586,6 +583,9 @@
   gEfiPaddingRsaesPkcs1V1P5Guid  = { 0xe1c1d0a9, 0x40b1, 0x4632, {0xbd, 0xcc, 0xd9, 0xd6, 0xe5, 0x29, 0x56, 0x31 }}\r
   gEfiPaddingRsaesOaepGuid       = { 0xc1e63ac4, 0xd0cf, 0x4ce6, {0x83, 0x5b, 0xee, 0xd0, 0xe6, 0xa8, 0xa4, 0x5b }}\r
 \r
+  ## Include/Guid/SmBios.h\r
+  gEfiSmbios3TableGuid = { 0xF2FD1544, 0x9794, 0x4A2C, { 0x99, 0x2E, 0xE5, 0xBB, 0xCF, 0x20, 0xE3, 0x94 }}\r
+\r
   #\r
   # GUID defined in PI1.0\r
   #\r