Update all INF, DEC and DSC file to confirm to newest INF spec 0.44, DEC spec 0.41, DSC spec 0.40.

Mainly PCD syntax update.
Check in new build.exe and GenFds.exe
Check in PcdSyntaxUpdate.exe tool. 

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

21 files changed, 206 insertions, 207 deletions

diff --git a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
index f3384787eb..34017086a4 100644
--- a/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf
@@ -66,12 +66,12 @@
   gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED

   gEfiSimpleTextInProtocolGuid                  # PROTOCOL ALWAYS_CONSUMED

 

-[PcdsFixedAtBuild]

-  PcdStatusCodeValueKeyboardEnable|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueKeyboardPresenceDetect|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueKeyboardDisable|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueKeyboardReset|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueKeyboardClearBuffer|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueKeyboardSelfTest|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueKeyboardInterfaceError|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueKeyboardInputError|gEfiMdePkgTokenSpaceGuid
\ No newline at end of file
+[FixedPcd]

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardEnable

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardPresenceDetect

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardDisable

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardReset

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardClearBuffer

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardSelfTest

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardInterfaceError

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardInputError
\ No newline at end of file
diff --git a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
index 2bca1c2c2f..dd85cada44 100644
--- a/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
+++ b/MdeModulePkg/Bus/Usb/UsbMouseDxe/UsbMouseDxe.inf
@@ -58,11 +58,11 @@
   gEfiDevicePathProtocolGuid                    # PROTOCOL ALWAYS_CONSUMED

   gEfiSimplePointerProtocolGuid                 # PROTOCOL ALWAYS_CONSUMED

 

-[PcdsFixedAtBuild]

-  PcdStatusCodeValueMouseInterfaceError|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueMouseEnable|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueMouseDisable|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueMouseInputError|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueMouseReset|gEfiMdePkgTokenSpaceGuid

+[FixedPcd]

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInterfaceError

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseEnable

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseDisable

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInputError

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseReset

 

 

diff --git a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
index ab571dff62..d76e904b8d 100644
--- a/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
+++ b/MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
@@ -96,14 +96,14 @@
   gEfiPeiPeCoffLoaderGuid                       

 

 

-[PcdsFeatureFlag.common]

-  PcdDxeIplSupportCustomDecompress|gEfiMdeModulePkgTokenSpaceGuid

-  PcdDxeIplSupportTianoDecompress|gEfiMdeModulePkgTokenSpaceGuid

-  PcdDxeIplSupportEfiDecompress|gEfiMdeModulePkgTokenSpaceGuid

-  PcdDxeIplBuildShareCodeHobs|gEfiMdeModulePkgTokenSpaceGuid

-

-[PcdsFeatureFlag.IA32]

-  PcdDxeIplSwitchToLongMode|gEfiMdeModulePkgTokenSpaceGuid

+[FeaturePcd.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportCustomDecompress

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportTianoDecompress

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportEfiDecompress

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildShareCodeHobs

+

+[FeaturePcd.IA32]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode

 

 

 [Depex]

diff --git a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
index 282daa9348..7a348d683f 100644
--- a/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
+++ b/MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf
@@ -56,8 +56,8 @@
   gEfiRuntimeArchProtocolGuid                   # PROTOCOL ALWAYS_PRODUCED

   gEfiLoadedImageProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED

 

-[PcdsFixedAtBuild.common]

-  PcdStatusCodeValueSetVirtualAddressMap|gEfiMdePkgTokenSpaceGuid

+[FixedPcd.common]

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueSetVirtualAddressMap

   

 [depex]

   TRUE  
\ No newline at end of file
diff --git a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
index cdd3cd9daa..b4c2ef3cc7 100644
--- a/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
+++ b/MdeModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.inf
@@ -59,10 +59,10 @@
   gPerformanceProtocolGuid                      # PROTOCOL ALWAYS_PRODUCED

 

 

-[PcdsFixedAtBuild.common]

-  PcdPerformanceLibraryPropertyMask|gEfiMdePkgTokenSpaceGuid

+[FixedPcd.common]

+  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask

 

 

-[PcdsDynamic.common]

-  PcdMaxPeiPerformanceLogEntries|gEfiMdeModulePkgTokenSpaceGuid

+[Pcd.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries

 

diff --git a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
index 8ea0877e7e..1f3902bc24 100644
--- a/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
+++ b/MdeModulePkg/Library/DxePerformanceLib/DxePerformanceLib.inf
@@ -50,6 +50,6 @@
   gPerformanceProtocolGuid                      # PROTOCOL ALWAYS_CONSUMED

 

 

-[PcdsFixedAtBuild.common]

-  PcdPerformanceLibraryPropertyMask|gEfiMdePkgTokenSpaceGuid

+[FixedPcd.common]

+  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask

 

diff --git a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
index 0fc6f5cb9f..ab4384b85f 100644
--- a/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
+++ b/MdeModulePkg/Library/PeiPerformanceLib/PeiPerformanceLib.inf
@@ -53,10 +53,10 @@
   gPeiPerformanceHobGuid                        # SOMETIMES_CONSUMED

 

 

-[PcdsFixedAtBuild.common]

-  PcdPerformanceLibraryPropertyMask|gEfiMdePkgTokenSpaceGuid

+[FixedPcd.common]

+  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask

 

 

-[PcdsDynamic.common]

-  PcdMaxPeiPerformanceLogEntries|gEfiMdeModulePkgTokenSpaceGuid

+[Pcd.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries

 

diff --git a/MdeModulePkg/Logo/Logo.inf b/MdeModulePkg/Logo/Logo.inf
index 03743cbb17..a6e2501f7d 100644
--- a/MdeModulePkg/Logo/Logo.inf
+++ b/MdeModulePkg/Logo/Logo.inf
@@ -21,7 +21,6 @@
   FILE_GUID                      = 7BB28B99-61BB-11D5-9A5D-0090273FC14D

   MODULE_TYPE                    = BASE

   VERSION_STRING                 = 1.0

-  BINARY_MODULE                  = true

   EDK_RELEASE_VERSION            = 0x00020000

   EFI_SPECIFICATION_VERSION      = 0x00020000

 

@@ -33,5 +32,5 @@
 #

 

 [Binaries.common]

-  BIN|RELEASE|Logo.bmp

+  BIN|Logo.bmp|RELEASE

 

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 170910a203..752ed16694 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -99,66 +99,66 @@
   gPeiFlashMapPpiGuid            = { 0xf34c2fa0, 0xde88, 0x4270, {0x84, 0x14, 0x96, 0x12, 0x22, 0xf4, 0x52, 0x1c } }

 

 [PcdsFeatureFlag.common]

-  PcdSupportUpdateCapsuleRest|0x0001001d|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|FALSE

-  PcdPeiPcdDatabaseTraverseEnabled|0x00010020|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE

-  PcdDxePcdDatabaseTraverseEnabled|0x00010021|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE

-  PcdPeiPcdDatabaseSetEnabled|0x00010030|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE

-  PcdPeiPcdDatabaseGetSizeEnabled|0x00010031|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE

-  PcdPeiPcdDatabaseCallbackOnSetEnabled|0x00010032|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE

-  PcdPeiPcdDatabaseExEnabled|0x00010033|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE

-  PcdDxeIplSupportEfiDecompress|0x00010034|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE

-  PcdDxeIplSupportTianoDecompress|0x00010035|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE

-  PcdDxeIplSupportCustomDecompress|0x00010036|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE

-  PcdDevicePathSupportDevicePathToText|0x00010037|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|FALSE

-  PcdDevicePathSupportDevicePathFromText|0x00010038|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|FALSE

-  PcdDxeIplBuildShareCodeHobs|0x0001003c|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|FALSE

-  PcdNtEmulatorEnable|0x0001003e|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleRest|FALSE|BOOLEAN|0x0001001d

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled|TRUE|BOOLEAN|0x00010020

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled|TRUE|BOOLEAN|0x00010021

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled|TRUE|BOOLEAN|0x00010030

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled|TRUE|BOOLEAN|0x00010031

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled|TRUE|BOOLEAN|0x00010032

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled|TRUE|BOOLEAN|0x00010033

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportEfiDecompress|TRUE|BOOLEAN|0x00010034

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportTianoDecompress|TRUE|BOOLEAN|0x00010035

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportCustomDecompress|TRUE|BOOLEAN|0x00010036

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|FALSE|BOOLEAN|0x00010037

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|FALSE|BOOLEAN|0x00010038

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildShareCodeHobs|FALSE|BOOLEAN|0x0001003c

+  gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|FALSE|BOOLEAN|0x0001003e

 

 [PcdsFixedAtBuild.common]

-  PcdMaxPeiPcdCallBackNumberPerPcdEntry|0x0001000f|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x08

-  PcdVpdBaseAddress|0x00010010|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdMaxSizePopulateCapsule|0x0001001e|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdMaxSizeNonPopulateCapsule|0x0001001f|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdMaxPeiPerformanceLogEntries|0x0001002f|gEfiMdeModulePkgTokenSpaceGuid|UINT8|28

-  PcdFlashNvStorageVariableBase|0x30000001|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageVariableSize|0x30000002|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageFtwSpareBase|0x30000013|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageFtwSpareSize|0x30000014|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageFtwWorkingBase|0x30000010|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageFtwWorkingSize|0x30000011|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdStatusCodeValueMouseInterfaceError|0x30001000|gEfiMdePkgTokenSpaceGuid|UINT32|0x01020005

-  PcdStatusCodeValueMouseEnable|0x30001001|gEfiMdePkgTokenSpaceGuid|UINT32|0x01020004

-  PcdStatusCodeValueMouseDisable|0x3001002|gEfiMdePkgTokenSpaceGuid|UINT32|0x01020002

-  PcdStatusCodeValueKeyboardEnable|0x3001003|gEfiMdePkgTokenSpaceGuid|UINT32|0x01010004

-  PcdStatusCodeValueKeyboardDisable|0x3001004|gEfiMdePkgTokenSpaceGuid|UINT32|0x01010002

-  PcdStatusCodeValueKeyboardPresenceDetect|0x30001005|gEfiMdePkgTokenSpaceGuid|UINT32|0x01010003

-  PcdStatusCodeValueKeyboardReset|0x30001006|gEfiMdePkgTokenSpaceGuid|UINT32|0x01010001

-  PcdStatusCodeValueKeyboardClearBuffer|0x30001007|gEfiMdePkgTokenSpaceGuid|UINT32|0x01011000

-  PcdStatusCodeValueKeyboardSelfTest|0x30001008|gEfiMdePkgTokenSpaceGuid|UINT32|0x01011001

-  PcdStatusCodeValueKeyboardInterfaceError|0x30001009|gEfiMdePkgTokenSpaceGuid|UINT32|0x01010005

-  PcdStatusCodeValueKeyboardInputError|0x3000100a|gEfiMdePkgTokenSpaceGuid|UINT32|0x01010007

-  PcdStatusCodeValueMouseInputError|0x30001000b|gEfiMdePkgTokenSpaceGuid|UINT32|0x01020007

-  PcdStatusCodeValueMouseReset|0x30001000c|gEfiMdePkgTokenSpaceGuid|UINT32|0x01020001

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry|0x08|UINT32|0x0001000f

+  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0|UINT32|0x00010010

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizePopulateCapsule|0x0|UINT32|0x0001001e

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizeNonPopulateCapsule|0x0|UINT32|0x0001001f

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|28|UINT8|0x0001002f

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0|UINT32|0x30000001

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x0|UINT32|0x30000002

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x0|UINT32|0x30000013

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x0|UINT32|0x30000014

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x0|UINT32|0x30000010

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x0|UINT32|0x30000011

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInterfaceError|0x01020005|UINT32|0x30001000

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseEnable|0x01020004|UINT32|0x30001001

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseDisable|0x01020002|UINT32|0x3001002

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardEnable|0x01010004|UINT32|0x3001003

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardDisable|0x01010002|UINT32|0x3001004

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardPresenceDetect|0x01010003|UINT32|0x30001005

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardReset|0x01010001|UINT32|0x30001006

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardClearBuffer|0x01011000|UINT32|0x30001007

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardSelfTest|0x01011001|UINT32|0x30001008

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardInterfaceError|0x01010005|UINT32|0x30001009

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardInputError|0x01010007|UINT32|0x3000100a

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInputError|0x01020007|UINT32|0x30001000b

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseReset|0x01020001|UINT32|0x30001000c

 

 [PcdsDynamic.common]

-  PcdFlashNvStorageVariableBase|0x30000001|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageVariableSize|0x30000002|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageFtwSpareBase|0x30000013|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageFtwSpareSize|0x30000014|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageFtwWorkingBase|0x30000010|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageFtwWorkingSize|0x30000011|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0|UINT32|0x30000001

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x0|UINT32|0x30000002

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x0|UINT32|0x30000013

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x0|UINT32|0x30000014

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x0|UINT32|0x30000010

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x0|UINT32|0x30000011

 

 [PcdsPatchableInModule.common]

-  PcdMaxPeiPerformanceLogEntries|0x0001002f|gEfiMdeModulePkgTokenSpaceGuid|UINT8|28

-  PcdFlashNvStorageVariableBase|0x30000001|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageVariableSize|0x30000002|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageFtwSpareBase|0x30000013|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageFtwSpareSize|0x30000014|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageFtwWorkingBase|0x30000010|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

-  PcdFlashNvStorageFtwWorkingSize|0x30000011|gEfiMdeModulePkgTokenSpaceGuid|UINT32|0x0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|28|UINT8|0x0001002f

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0|UINT32|0x30000001

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x0|UINT32|0x30000002

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x0|UINT32|0x30000013

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x0|UINT32|0x30000014

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x0|UINT32|0x30000010

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x0|UINT32|0x30000011

 

 

 [PcdsFeatureFlag.IA32]

-  PcdDxeIplSwitchToLongMode|0x0001003b|gEfiMdeModulePkgTokenSpaceGuid|BOOLEAN|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE|BOOLEAN|0x0001003b

 

 

diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 07e51b1e6d..4899a23b64 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -280,87 +280,87 @@
   TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf

 

 [PcdsFeatureFlag.common]

-  PcdSupportUpdateCapsuleRest|gEfiMdeModulePkgTokenSpaceGuid|FALSE

-  PcdComponentNameDisable|gEfiMdePkgTokenSpaceGuid|FALSE

-  PcdDriverDiagnosticsDisable|gEfiMdePkgTokenSpaceGuid|FALSE

-  PcdComponentName2Disable|gEfiMdePkgTokenSpaceGuid|TRUE

-  PcdDriverDiagnostics2Disable|gEfiMdePkgTokenSpaceGuid|TRUE

-  PcdSupportUpdateCapsuleRest|gEfiMdeModulePkgTokenSpaceGuid|FALSE

-  PcdDxePcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdPeiPcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdPeiPcdDatabaseSetEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdPeiPcdDatabaseGetSizeEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdPeiPcdDatabaseCallbackOnSetEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdPeiPcdDatabaseExEnabled|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdNtEmulatorEnable|gEfiMdeModulePkgTokenSpaceGuid|FALSE

-  PcdDevicePathSupportDevicePathFromText|gEfiMdeModulePkgTokenSpaceGuid|FALSE

-  PcdDevicePathSupportDevicePathToText|gEfiMdeModulePkgTokenSpaceGuid|FALSE

-  PcdDxeIplSupportCustomDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdDxeIplBuildShareCodeHobs|gEfiMdeModulePkgTokenSpaceGuid|FALSE

-  PcdDxeIplSupportEfiDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdDxeIplSupportTianoDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE

-  PcdDxeIplSupportCustomDecompress|gEfiMdeModulePkgTokenSpaceGuid|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleRest|FALSE

+  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|FALSE

+  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|FALSE

+  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable|TRUE

+  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleRest|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportCustomDecompress|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplBuildShareCodeHobs|FALSE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportEfiDecompress|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportTianoDecompress|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSupportCustomDecompress|TRUE

 

 [PcdsFeatureFlag.IA32]

-  PcdDxeIplSwitchToLongMode|gEfiMdeModulePkgTokenSpaceGuid|TRUE

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxeIplSwitchToLongMode|TRUE

 

 [PcdsFixedAtBuild.common]

-  PcdMaximumUnicodeStringLength|gEfiMdePkgTokenSpaceGuid|1000000

-  PcdMaximumAsciiStringLength|gEfiMdePkgTokenSpaceGuid|1000000

-  PcdMaximumLinkedListLength|gEfiMdePkgTokenSpaceGuid|1000000

-  PcdSpinLockTimeout|gEfiMdePkgTokenSpaceGuid|10000000

-  PcdDebugPropertyMask|gEfiMdePkgTokenSpaceGuid|0x0f

-  PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid|0x80000000

-  PcdReportStatusCodePropertyMask|gEfiMdePkgTokenSpaceGuid|0x06

-  PcdDebugClearMemoryValue|gEfiMdePkgTokenSpaceGuid|0xAF

-  PcdPerformanceLibraryPropertyMask|gEfiMdePkgTokenSpaceGuid|0

-  PcdPostCodePropertyMask|gEfiMdePkgTokenSpaceGuid|0

-  PcdPciExpressBaseAddress|gEfiMdePkgTokenSpaceGuid|0xE0000000

-  PcdFSBClock|gEfiMdePkgTokenSpaceGuid|200000000

-  PcdUefiLibMaxPrintBufferSize|gEfiMdePkgTokenSpaceGuid|320

-  PcdMaxSizeNonPopulateCapsule|gEfiMdeModulePkgTokenSpaceGuid|0x0

-  PcdMaxSizePopulateCapsule|gEfiMdeModulePkgTokenSpaceGuid|0x0

-  PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid|0x0

-  PcdFlashNvStorageFtwSpareSize|gEfiMdeModulePkgTokenSpaceGuid|0x0

-  PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid|0x0

-  PcdFlashNvStorageFtwWorkingSize|gEfiMdeModulePkgTokenSpaceGuid|0x0

-  PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid|0x0

-  PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid|0x0

-  PcdMaxPeiPerformanceLogEntries|gEfiMdeModulePkgTokenSpaceGuid|28

-  PcdVpdBaseAddress|gEfiMdeModulePkgTokenSpaceGuid|0x0

-  PcdMaxPeiPcdCallBackNumberPerPcdEntry|gEfiMdeModulePkgTokenSpaceGuid|0x08

-  PcdStatusCodeValueEfiWatchDogTimerExpired|gEfiMdePkgTokenSpaceGuid|0x00011003   # EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_CU_HP_EC_TIMER_EXPIRED

-  PcdStatusCodeValueMemoryTestStarted|gEfiMdePkgTokenSpaceGuid|0x00051006         # EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_RS_PC_SET_VIRTUAL_ADDRESS_MAP

-  PcdStatusCodeValueSetVirtualAddressMap|gEfiMdePkgTokenSpaceGuid|0x03101004      # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_PC_TEST

-  PcdStatusCodeValueUncorrectableMemoryError|gEfiMdePkgTokenSpaceGuid|0x0005100   # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE3

-  PcdStatusCodeValueRemoteConsoleError|gEfiMdePkgTokenSpaceGuid|0x01040006        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR

-  PcdStatusCodeValueRemoteConsoleReset|gEfiMdePkgTokenSpaceGuid|0x01040001        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET

-  PcdStatusCodeValueRemoteConsoleInputError|gEfiMdePkgTokenSpaceGuid|0x01040007   # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR

-  PcdStatusCodeValueRemoteConsoleOutputError|gEfiMdePkgTokenSpaceGuid|0x01040008  # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR

-

-  PcdStatusCodeValueMouseInterfaceError|gEfiMdePkgTokenSpaceGuid|0x01020005       # EFI_PERIPHERAL_MOUSE | EFI_P_EC_INTERFACE_ERROR

-  PcdStatusCodeValueMouseEnable|gEfiMdePkgTokenSpaceGuid|0x01020004               # EFI_PERIPHERAL_MOUSE | EFI_P_PC_ENABLE

-  PcdStatusCodeValueMouseDisable|gEfiMdePkgTokenSpaceGuid|0x01020002              # EFI_PERIPHERAL_MOUSE | EFI_P_PC_DISABLE

-  PcdStatusCodeValueKeyboardEnable|gEfiMdePkgTokenSpaceGuid|0x01010004            # EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_ENABLE

-  PcdStatusCodeValueKeyboardPresenceDetect|gEfiMdePkgTokenSpaceGuid|0x01010003    # EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_PRESENCE_DETECT

-  PcdStatusCodeValueKeyboardDisable|gEfiMdePkgTokenSpaceGuid|0x01010002           # EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_DISABLE

-  PcdStatusCodeValueKeyboardReset|gEfiMdePkgTokenSpaceGuid|0x01010001             # EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_RESET

-  PcdStatusCodeValueKeyboardClearBuffer|gEfiMdePkgTokenSpaceGuid|0x01011000       # EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_CLEAR_BUFFER
-  PcdStatusCodeValueKeyboardSelfTest|gEfiMdePkgTokenSpaceGuid|0x01011001          # EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_SELF_TEST

-  PcdStatusCodeValueKeyboardInterfaceError|gEfiMdePkgTokenSpaceGuid|0x01010005    # EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_INTERFACE_ERROR

-  PcdStatusCodeValueKeyboardInputError|gEfiMdePkgTokenSpaceGuid|0x01010007        # EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_INPUT_ERROR

-  PcdStatusCodeValueMouseInputError|gEfiMdePkgTokenSpaceGuid|0x01020007           # EFI_PERIPHERAL_MOUSE | EFI_P_EC_INPUT_ERROR

-  PcdStatusCodeValueMouseReset|gEfiMdePkgTokenSpaceGuid|0x01020001                # EFI_PERIPHERAL_MOUSE | EFI_P_PC_RESET

-

-  PcdUartDefaultBaudRate|gEfiMdePkgTokenSpaceGuid|115200

-  PcdUartDefaultDataBits|gEfiMdePkgTokenSpaceGuid|8

-  PcdUartDefaultParity|gEfiMdePkgTokenSpaceGuid|1

-  PcdUartDefaultStopBits|gEfiMdePkgTokenSpaceGuid|1

-  PcdDefaultTerminalType|gEfiMdePkgTokenSpaceGuid|0

+  gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength|1000000

+  gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength|1000000

+  gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength|1000000

+  gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout|10000000

+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0f

+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel|0x80000000

+  gEfiMdePkgTokenSpaceGuid.PcdReportStatusCodePropertyMask|0x06

+  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue|0xAF

+  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask|0

+  gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask|0

+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress|0xE0000000

+  gEfiMdePkgTokenSpaceGuid.PcdFSBClock|200000000

+  gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|320

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizeNonPopulateCapsule|0x0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizePopulateCapsule|0x0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase|0x0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize|0x0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase|0x0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize|0x0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPerformanceLogEntries|28

+  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress|0x0

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry|0x08

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueEfiWatchDogTimerExpired|0x00011003   # EFI_COMPUTING_UNIT_HOST_PROCESSOR | EFI_CU_HP_EC_TIMER_EXPIRED

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMemoryTestStarted|0x00051006         # EFI_SOFTWARE_EFI_BOOT_SERVICE | EFI_SW_RS_PC_SET_VIRTUAL_ADDRESS_MAP

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueSetVirtualAddressMap|0x03101004      # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_PC_TEST

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueUncorrectableMemoryError|0x0005100   # EFI_COMPUTING_UNIT_MEMORY | EFI_CU_MEMORY_EC_UNCORRECTABLE3

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleError|0x01040006        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_CONTROLLER_ERROR

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleReset|0x01040001        # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_PC_RESET

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleInputError|0x01040007   # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_INPUT_ERROR

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleOutputError|0x01040008  # EFI_PERIPHERAL_REMOTE_CONSOLE | EFI_P_EC_OUTPUT_ERROR

+

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInterfaceError|0x01020005       # EFI_PERIPHERAL_MOUSE | EFI_P_EC_INTERFACE_ERROR

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseEnable|0x01020004               # EFI_PERIPHERAL_MOUSE | EFI_P_PC_ENABLE

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseDisable|0x01020002              # EFI_PERIPHERAL_MOUSE | EFI_P_PC_DISABLE

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardEnable|0x01010004            # EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_ENABLE

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardPresenceDetect|0x01010003    # EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_PRESENCE_DETECT

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardDisable|0x01010002           # EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_DISABLE

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardReset|0x01010001             # EFI_PERIPHERAL_KEYBOARD | EFI_P_PC_RESET

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardClearBuffer|0x01011000       # EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_CLEAR_BUFFER

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardSelfTest|0x01011001          # EFI_PERIPHERAL_KEYBOARD | EFI_P_KEYBOARD_PC_SELF_TEST

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardInterfaceError|0x01010005    # EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_INTERFACE_ERROR

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueKeyboardInputError|0x01010007        # EFI_PERIPHERAL_KEYBOARD | EFI_P_EC_INPUT_ERROR

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseInputError|0x01020007           # EFI_PERIPHERAL_MOUSE | EFI_P_EC_INPUT_ERROR

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMouseReset|0x01020001                # EFI_PERIPHERAL_MOUSE | EFI_P_PC_RESET

+

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|115200

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits|8

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity|1

+  gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits|1

+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType|0

 

 

 [PcdsFixedAtBuild.IPF]

-  PcdIoBlockBaseAddressForIpf|gEfiMdePkgTokenSpaceGuid|0x0ffffc000000

+  gEfiMdePkgTokenSpaceGuid.PcdIoBlockBaseAddressForIpf|0x0ffffc000000

 

 ################################################################################

 #

diff --git a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
index ca9f79dd70..2891113c43 100644
--- a/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
@@ -55,12 +55,12 @@
 [Protocols]

   gEfiCapsuleArchProtocolGuid                   # PROTOCOL ALWAYS_CONSUMED

 

-[PcdsFeatureFlag.common]

-  PcdSupportUpdateCapsuleRest|gEfiMdeModulePkgTokenSpaceGuid

+[FeaturePcd.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdSupportUpdateCapsuleRest

 

-[PcdsFixedAtBuild.common]

-  PcdMaxSizeNonPopulateCapsule|gEfiMdeModulePkgTokenSpaceGuid

-  PcdMaxSizePopulateCapsule|gEfiMdeModulePkgTokenSpaceGuid

+[FixedPcd.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizeNonPopulateCapsule

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxSizePopulateCapsule

 

 [Depex]

   gEfiVariableArchProtocolGuid

diff --git a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
index 9cee2294ca..2e279f2a39 100644
--- a/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
+++ b/MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf
@@ -74,10 +74,10 @@
   gEfiSimpleTextInProtocolGuid                  # PROTOCOL BY_START

   gEfiSimpleTextOutProtocolGuid                 # PROTOCOL BY_START

 

-[PcdsDynamic]

-  PcdStatusCodeValueRemoteConsoleError|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueRemoteConsoleReset|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueRemoteConsoleInputError|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueRemoteConsoleOutputError|gEfiMdePkgTokenSpaceGuid

-  PcdDefaultTerminalType|gEfiMdePkgTokenSpaceGuid

+[Pcd]

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleError

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleReset

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleInputError

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueRemoteConsoleOutputError

+  gEfiMdePkgTokenSpaceGuid.PcdDefaultTerminalType

   

diff --git a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
index d48493db06..ca4162fd29 100644
--- a/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
+++ b/MdeModulePkg/Universal/DebugSupportDxe/DebugSupportDxe.inf
@@ -79,8 +79,8 @@
   gEfiDebugSupportProtocolGuid                  # PROTOCOL SOMETIMES_PRODUCED

 

 

-[PcdsFeatureFlag.IA32]

-  PcdNtEmulatorEnable|gEfiMdeModulePkgTokenSpaceGuid

+[FeaturePcd.IA32]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdNtEmulatorEnable

 

 

 [Depex]

diff --git a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
index 15340b4f86..f735f7e71d 100644
--- a/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
+++ b/MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf
@@ -66,7 +66,7 @@
   gEfiDevicePathUtilitiesProtocolGuid           # PROTOCOL ALWAYS_PRODUCED

   gEfiDebugPortProtocolGuid                     # PROTOCOL ALWAYS_CONSUMED

 

-[PcdsFeatureFlag.common]

-  PcdDevicePathSupportDevicePathFromText|gEfiMdeModulePkgTokenSpaceGuid

-  PcdDevicePathSupportDevicePathToText|gEfiMdeModulePkgTokenSpaceGuid

+[FeaturePcd.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathFromText

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDevicePathSupportDevicePathToText

 

diff --git a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf
index 05cd625c1a..39be764630 100644
--- a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf
+++ b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.inf
@@ -80,11 +80,11 @@
   gEfiPciRootBridgeIoProtocolGuid               # PROTOCOL ALWAYS_CONSUMED

 

 

-[PcdsDynamic.common]

-  PcdFlashNvStorageFtwWorkingSize|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageFtwWorkingBase|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageFtwSpareSize|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageFtwSpareBase|gEfiMdeModulePkgTokenSpaceGuid

+[Pcd.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingSize

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwWorkingBase

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase

 

 [Depex]

   gEfiFirmwareVolumeBlockProtocolGuid AND gEfiAlternateFvBlockGuid

diff --git a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf
index 06f81cce54..c0b2f87d68 100644
--- a/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf
+++ b/MdeModulePkg/Universal/MemoryTest/BaseMemoryTestPei/BaseMemoryTestPei.inf
@@ -43,7 +43,7 @@
 [Ppis]

   gPeiBaseMemoryTestPpiGuid                     # PPI ALWAYS_PRODUCED

 

-[PcdsFixedAtBuild.common]

-  PcdStatusCodeValueMemoryTestStarted|gEfiMdePkgTokenSpaceGuid

-  PcdStatusCodeValueUncorrectableMemoryError|gEfiMdePkgTokenSpaceGuid

+[FixedPcd.common]

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueMemoryTestStarted

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueUncorrectableMemoryError

 

diff --git a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
index fb4634857f..57b8d70f7b 100644
--- a/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Dxe/Pcd.inf
@@ -59,11 +59,11 @@
 [Protocols]

   gPcdProtocolGuid                              # PROTOCOL ALWAYS_PRODUCED

 

-[PcdsFeatureFlag.common]

-  PcdDxePcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid

+[FeaturePcd.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdDxePcdDatabaseTraverseEnabled

 

-[PcdsFixedAtBuild.common]

-  PcdVpdBaseAddress|gEfiMdeModulePkgTokenSpaceGuid

+[FixedPcd.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress

 

 [Depex]

   TRUE

diff --git a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
index a9022b951b..a2963d60a3 100644
--- a/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
+++ b/MdeModulePkg/Universal/PCD/Pei/Pcd.inf
@@ -60,16 +60,16 @@
   gEfiPeiReadOnlyVariable2PpiGuid               # PPI ALWAYS_CONSUMED

   gPcdPpiGuid                                   # PPI ALWAYS_PRODUCED

 

-[PcdsFeatureFlag.common]

-  PcdPeiPcdDatabaseSetEnabled|gEfiMdeModulePkgTokenSpaceGuid

-  PcdPeiPcdDatabaseGetSizeEnabled|gEfiMdeModulePkgTokenSpaceGuid

-  PcdPeiPcdDatabaseExEnabled|gEfiMdeModulePkgTokenSpaceGuid

-  PcdPeiPcdDatabaseCallbackOnSetEnabled|gEfiMdeModulePkgTokenSpaceGuid

-  PcdPeiPcdDatabaseTraverseEnabled|gEfiMdeModulePkgTokenSpaceGuid

+[FeaturePcd.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseSetEnabled

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseGetSizeEnabled

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseExEnabled

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseCallbackOnSetEnabled

+  gEfiMdeModulePkgTokenSpaceGuid.PcdPeiPcdDatabaseTraverseEnabled

 

-[PcdsFixedAtBuild.common]

-  PcdVpdBaseAddress|gEfiMdeModulePkgTokenSpaceGuid

-  PcdMaxPeiPcdCallBackNumberPerPcdEntry|gEfiMdeModulePkgTokenSpaceGuid

+[FixedPcd.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdVpdBaseAddress

+  gEfiMdeModulePkgTokenSpaceGuid.PcdMaxPeiPcdCallBackNumberPerPcdEntry

 

 [Depex]

   TRUE

diff --git a/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf b/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
index ebcd09b872..da591bbd3f 100644
--- a/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
+++ b/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
@@ -62,8 +62,8 @@
 [Ppis]

   gEfiPeiReadOnlyVariable2PpiGuid                # PPI ALWAYS_CONSUMED

 

-[PcdsDynamic.common]

-  PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid

+[Pcd.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase

 

 [Depex]

   TRUE

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
index e58affbf1e..0630a1d659 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf
@@ -66,9 +66,9 @@
   gEfiVariableWriteArchProtocolGuid             # PROTOCOL ALWAYS_PRODUCED

   gEfiVariableArchProtocolGuid                  # PROTOCOL ALWAYS_PRODUCED

 

-[PcdsDynamic.common]

-  PcdFlashNvStorageVariableSize|gEfiMdeModulePkgTokenSpaceGuid

-  PcdFlashNvStorageVariableBase|gEfiMdeModulePkgTokenSpaceGuid

+[Pcd.common]

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize

+  gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase

 

 [Depex]

   gEfiFirmwareVolumeBlockProtocolGuid AND gEfiAlternateFvBlockGuid AND gEfiFaultTolerantWriteLiteProtocolGuid

diff --git a/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf b/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf
index 5c9f3dfa4b..30d30f8e45 100644
--- a/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf
+++ b/MdeModulePkg/Universal/WatchDogTimerDxe/WatchDogTimer.inf
@@ -48,8 +48,8 @@
 [Protocols]

   gEfiWatchdogTimerArchProtocolGuid             # PROTOCOL ALWAYS_PRODUCED

 

-[PcdsFixedAtBuild.common]

-  PcdStatusCodeValueEfiWatchDogTimerExpired|gEfiMdePkgTokenSpaceGuid

+[FixedPcd.common]

+  gEfiMdePkgTokenSpaceGuid.PcdStatusCodeValueEfiWatchDogTimerExpired

 

 [depex]

   gEfiTimerArchProtocolGuid