BaseTools/DevicePath: fix GCC build error in print_mem(), and clean it up

[mirror_edk2.git] / MdeModulePkg / MdeModulePkg.dec

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index b3831a21ad08740f4270501f7dd6533e48a21825..037b16e2d0f4a8df8bad9a171ef9a87fc838d6ac 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -392,6 +392,9 @@
   ## Include/Guid/PlatformHasAcpi.h\r
   gEdkiiPlatformHasAcpiGuid = { 0xf0966b41, 0xc23f, 0x41b9, { 0x96, 0x04, 0x0f, 0xf7, 0xe1, 0x11, 0x96, 0x5a } }\r
 \r
+  ## Include/Guid/EndofS3Resume.h\r
+  gEdkiiEndOfS3ResumeGuid = { 0x96f5296d, 0x05f7, 0x4f3c, {0x84, 0x67, 0xe4, 0x56, 0x89, 0x0e, 0x0c, 0xb5 } }\r
+\r
 [Ppis]\r
   ## Include/Ppi/AtaController.h\r
   gPeiAtaControllerPpiGuid       = { 0xa45e60d1, 0xc719, 0x44aa, { 0xb0, 0x7a, 0xaa, 0x77, 0x7f, 0x85, 0x90, 0x6d }}\r
@@ -556,9 +559,6 @@
   ## Include/Protocol/IoMmu.h\r
   gEdkiiIoMmuProtocolGuid = { 0x4e939de9, 0xd948, 0x4b0f, { 0x88, 0xed, 0xe6, 0xe1, 0xce, 0x51, 0x7c, 0x1e } }\r
 \r
-  ## Include/Protocol/SmmEndofS3Resume.h\r
-  gEdkiiSmmEndOfS3ResumeProtocolGuid = { 0x96f5296d, 0x05f7, 0x4f3c, {0x84, 0x67, 0xe4, 0x56, 0x89, 0x0e, 0x0c, 0xb5 } }\r
-\r
   ## Include/Protocol/SmmMemoryAttribute.h\r
   gEdkiiSmmMemoryAttributeProtocolGuid = { 0x69b792ea, 0x39ce, 0x402d, { 0xa2, 0xa6, 0xf7, 0x21, 0xde, 0x35, 0x1d, 0xfe } }\r
 \r
@@ -939,13 +939,17 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPoolType|0x0|UINT64|0x30001053\r
 \r
   ## This mask is to control Heap Guard behavior.\r
+  # Note that due to the limit of pool memory implementation and the alignment\r
+  # requirement of UEFI spec, BIT7 is a try-best setting which cannot guarantee\r
+  # that the returned pool is exactly adjacent to head guard page or tail guard\r
+  # page.\r
   #   BIT0 - Enable UEFI page guard.<BR>\r
   #   BIT1 - Enable UEFI pool guard.<BR>\r
   #   BIT2 - Enable SMM page guard.<BR>\r
   #   BIT3 - Enable SMM pool guard.<BR>\r
   #   BIT7 - The direction of Guard Page for Pool Guard.\r
-  #          0 - The returned pool is adjacent to the bottom guard page.<BR>\r
-  #          1 - The returned pool is adjacent to the top guard page.<BR>\r
+  #          0 - The returned pool is near the tail guard page.<BR>\r
+  #          1 - The returned pool is near the head guard page.<BR>\r
   # @Prompt The Heap Guard feature mask\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPropertyMask|0x0|UINT8|0x30001054\r
 \r
@@ -1903,5 +1907,16 @@
   # @Prompt If there is any test key used by the platform.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed|FALSE|BOOLEAN|0x00030003\r
 \r
+[PcdsDynamicEx]\r
+  ## This dynamic PCD enables the default variable setting.\r
+  #  Its value is the default store ID value. The default value is zero as Standard default.\r
+  #  When its value is set in PEI, it will trig the default setting to be applied as the default EFI variable.\r
+  # @Prompt NV Storage DefaultId\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSetNvStoreDefaultId|0x0|UINT16|0x00030004\r
+\r
+  ## This dynamic PCD holds the DynamicHii PCD value. Its value is the auto generated.\r
+  # @Prompt NV Storage Default Value Buffer\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdNvStoreDefaultValueBuffer|{0x0}|VOID*|0x00030005\r
+\r
 [UserExtensions.TianoCore."ExtraFiles"]\r
   MdeModulePkgExtra.uni\r