Update MdeModulePkg package surface area:

1. Retire Print protocol
2. Retire platform variable GUID
3. Merge Performance Protocol GUID C Name, Pei Performance HOB, and performance variable
4. Introduce dynamic PCD: PcdConOutRow, PcdConOutColumn for console output mode.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7573 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 386b0a0f70546416c022e61a0a7b770244957fd1..a99044806e96f5e2aaa2fefd71bc0bd1e23ef8a4 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -161,14 +161,6 @@
   ## Include/Guid/CapsuleVendor.h\r
   gEfiCapsuleVendorGuid          = { 0x711C703F, 0xC285, 0x4B10, { 0xA3, 0xB0, 0x36, 0xEC, 0xBD, 0x3C, 0x8B, 0xE2 }}\r
   \r
-  ## Performance guid for the performance entry in the HOB list\r
-  ## Include/Guid/PeiPerformanceHob.h\r
-  gPeiPerformanceHobGuid         = { 0xEC4DF5AF, 0x4395, 0x4CC9, { 0x94, 0xDE, 0x77, 0x50, 0x6D, 0x12, 0xC7, 0xB8 }}\r
-  \r
-  ## The genenic platform guid for EFI variable.\r
-  ## Include/Guid/GenericPlatformVariable.h\r
-  gEfiGenericPlatformVariableGuid = { 0x59d1c24f, 0x50f1, 0x401a, { 0xb1, 0x01, 0xf3, 0x3e, 0x0d, 0xae, 0xd4, 0x43 }}\r
-  \r
   ## Guid specify the Shell application.\r
   ## Include/Guid/ShellFile.h\r
   gEfiShellFileGuid              = { 0xC57AD6B7, 0x0515, 0x40A8, { 0x9D, 0x21, 0x55, 0x16, 0x52, 0x85, 0x4E, 0x37 }}\r
@@ -188,6 +180,10 @@
   ## Platform Override Variable guid\r
   ## Include/Guid/OverrideVariable.h\r
   gEfiOverrideVariableGuid       = { 0x8e3d4ad5, 0xf762, 0x438a, { 0xa1, 0xc1, 0x5b, 0x9f, 0xe6, 0x8c, 0x6b, 0x15 }}\r
+  \r
+  ## Performance protocol guid that also acts as the performance HOB guid and performance variable GUID\r
+  ## Include/Guid/Performance.h\r
+  gPerformanceProtocolGuid       = { 0x76B6BDFA, 0x2ACD, 0x4462, { 0x9E, 0x3F, 0xCB, 0x58, 0xC9, 0x69, 0xD9, 0x37 }}\r
 \r
 [Protocols.common]\r
   ## Capsule Arch protocol specify capsule runtime services are installed.  \r
@@ -198,10 +194,6 @@
   ## Include/Protocol/LoadPe32Image.h\r
   gEfiLoadPeImageProtocolGuid    = { 0x5CB5C776, 0x60D5, 0x45EE, { 0x88, 0x3C, 0x45, 0x27, 0x08, 0xCD, 0x74, 0x3F }}\r
   \r
-  ## Print protocol defines only one basic print function.\r
-  ## Include/Protocol/Print.h\r
-  gEfiPrintProtocolGuid       = { 0xdf2d868e, 0x32fc, 0x4cf0, {0x8e, 0x6b, 0xff, 0xd9, 0x5d, 0x13, 0x43, 0xd0} }\r
-\r
   ## Print protocol defines six basic print functions to print the format unicode and ascii string.\r
   ## Include/Protocol/Print2.h\r
   gEfiPrint2ProtocolGuid          = { 0x5bcc3dbc, 0x8c57, 0x450a, { 0xbb, 0x0c, 0xa1, 0xc0, 0xbd, 0xde, 0x48, 0x0c }}\r
@@ -231,10 +223,6 @@
   ## Include/Protocol/OEMBadging.h\r
   gEfiOEMBadgingProtocolGuid     = { 0x170E13C0, 0xBF1B, 0x4218, { 0x87, 0x1D, 0x2A, 0xBD, 0xC6, 0xF8, 0x87, 0xBC }}\r
   \r
-  ## Performance protocol interfaces to support cross module performance logging.\r
-  ## Include/Protocol/Performance.h\r
-  gPerformanceProtocolGuid       = { 0x76B6BDFA, 0x2ACD, 0x4462, { 0x9E, 0x3F, 0xCB, 0x58, 0xC9, 0x69, 0xD9, 0x37 }}\r
-  \r
   ## Protocol guid is defined for CRC32 encapsulation scheme.\r
   ## Include/Protocol/Crc32GuidedSectionExtraction.h\r
   gEfiCrc32GuidedSectionExtractionProtocolGuid = { 0xFC1BCDB0, 0x7D31, 0x49aa, {0x93, 0x6A, 0xA4, 0x60, 0x0D, 0x9D, 0xD0, 0x83 } }\r
@@ -492,6 +480,16 @@
   ##\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdHelloWorldPrintTimes|1|UINT32|0x40000005\r
 \r
+  ##\r
+  #  This PCD defines the Console output column and the default value is 25 according to UEFI spec\r
+  ##\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutRow|25|UINT32|0x40000006\r
+  \r
+  ##\r
+  #  This PCD defines the Console output row and the default value is 80 according to UEFI spec\r
+  ##\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdConOutColumn|80|UINT32|0x40000007\r
+\r
 [PcdsPatchableInModule.common]\r
   ## Maximun number of performance log entries during PEI phase.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|40|UINT8|0x0001002f\r