12 files changed, 44 insertions, 44 deletions
diff --git a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
index 1c43bd5143..e082695923 100644
--- a/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
+++ b/MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
@@ -60,6 +60,6 @@
 [LibraryClasses.IPF]
   PcdLib
 
-[PcdsFixedAtBuild.IPF]
-  PcdIoBlockBaseAddressForIpf|gEfiMdePkgTokenSpaceGuid
+[FixedPcd.IPF]
+  gEfiMdePkgTokenSpaceGuid.PcdIoBlockBaseAddressForIpf
 
diff --git a/MdePkg/Library/BaseLib/BaseLib.inf b/MdePkg/Library/BaseLib/BaseLib.inf
index 3517e8d1ea..a54abc0772 100644
--- a/MdePkg/Library/BaseLib/BaseLib.inf
+++ b/MdePkg/Library/BaseLib/BaseLib.inf
@@ -522,9 +522,9 @@
   BaseMemoryLib
 
 
-[PcdsFixedAtBuild.common]
-  PcdSpinLockTimeout|gEfiMdePkgTokenSpaceGuid
-  PcdMaximumLinkedListLength|gEfiMdePkgTokenSpaceGuid
-  PcdMaximumAsciiStringLength|gEfiMdePkgTokenSpaceGuid
-  PcdMaximumUnicodeStringLength|gEfiMdePkgTokenSpaceGuid
+[FixedPcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdSpinLockTimeout
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumLinkedListLength
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumAsciiStringLength
+  gEfiMdePkgTokenSpaceGuid.PcdMaximumUnicodeStringLength
 
diff --git a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
index efd5ce73f1..0a6e51a6ee 100644
--- a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
+++ b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.inf
@@ -41,6 +41,6 @@
   DebugLib
   IoLib
 
-[PcdsDynamic.common]
-  PcdPciExpressBaseAddress|gEfiMdePkgTokenSpaceGuid
+[Pcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdPciExpressBaseAddress
 
diff --git a/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf b/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
index 912e015fff..2d717d438c 100644
--- a/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
+++ b/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf
@@ -43,6 +43,6 @@
   DebugLib
 
 
-[PcdsFixedAtBuild.common]
-  PcdPerformanceLibraryPropertyMask|gEfiMdePkgTokenSpaceGuid
+[FixedPcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdPerformanceLibraryPropertyMask
 
diff --git a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf b/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
index 4f1690e0c4..5e5ddf5384 100644
--- a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
+++ b/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.inf
@@ -44,6 +44,6 @@
   DebugLib
 
 
-[PcdsFixedAtBuild.common]
-  PcdPostCodePropertyMask|gEfiMdePkgTokenSpaceGuid
+[FixedPcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask
 
diff --git a/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf b/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
index 956f37ac62..632b8d6fef 100644
--- a/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
+++ b/MdePkg/Library/BasePostCodeLibPort80/BasePostCodeLibPort80.inf
@@ -42,6 +42,6 @@
   PcdLib
 
 
-[PcdsFixedAtBuild.common]
-  PcdPostCodePropertyMask|gEfiMdePkgTokenSpaceGuid
+[FixedPcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask
 
diff --git a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf b/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf
index 04d04b8ee8..b9d40dc03e 100644
--- a/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf
+++ b/MdePkg/Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.inf
@@ -41,10 +41,10 @@
   PrintLib
   BaseLib
 
-[PcdsFixedAtBuild.common]
-  PcdDebugClearMemoryValue|gEfiMdePkgTokenSpaceGuid
-  PcdDebugPropertyMask|gEfiMdePkgTokenSpaceGuid
+[FixedPcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask
 
-[PcdsDynamic.common]
-  PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid
+[Pcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel
 
diff --git a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf b/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
index 33e7a3bf8c..55d4e61762 100644
--- a/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
+++ b/MdePkg/Library/PeiDxePostCodeLibReportStatusCode/PeiDxePostCodeLibReportStatusCode.inf
@@ -40,6 +40,6 @@
   PcdLib
   ReportStatusCodeLib
 
-[PcdsFixedAtBuild.common]
-  PcdPostCodePropertyMask|gEfiMdePkgTokenSpaceGuid
+[FixedPcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdPostCodePropertyMask
 
diff --git a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
index f955e7174a..ed815c4257 100644
--- a/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
+++ b/MdePkg/Library/SecPeiDxeTimerLibCpu/SecPeiDxeTimerLibCpu.inf
@@ -62,9 +62,9 @@
   DebugLib
 
 
-[PcdsDynamic.IA32]
-  PcdFSBClock|gEfiMdePkgTokenSpaceGuid
+[Pcd.IA32]
+  gEfiMdePkgTokenSpaceGuid.PcdFSBClock
 
-[PcdsDynamic.X64]
-  PcdFSBClock|gEfiMdePkgTokenSpaceGuid
+[Pcd.X64]
+  gEfiMdePkgTokenSpaceGuid.PcdFSBClock
 
diff --git a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
index b2b7f2821f..074ba24519 100644
--- a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
+++ b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.inf
@@ -48,11 +48,11 @@
 
 
 
-[PcdsFixedAtBuild.common]
-  PcdDebugClearMemoryValue|gEfiMdePkgTokenSpaceGuid
-  PcdDebugPropertyMask|gEfiMdePkgTokenSpaceGuid
+[FixedPcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask
 
 
-[PcdsDynamic.common]
-  PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid
+[Pcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel
 
diff --git a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
index c0da55a5bf..67aeb066b6 100644
--- a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
+++ b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf
@@ -45,11 +45,11 @@
   UefiBootServicesTableLib
 
 
-[PcdsFixedAtBuild.common]
-  PcdDebugClearMemoryValue|gEfiMdePkgTokenSpaceGuid
-  PcdDebugPropertyMask|gEfiMdePkgTokenSpaceGuid
+[FixedPcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdDebugClearMemoryValue
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask
 
 
-[PcdsDynamic.common]
-  PcdDebugPrintErrorLevel|gEfiMdePkgTokenSpaceGuid
+[Pcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdDebugPrintErrorLevel
 
diff --git a/MdePkg/Library/UefiLib/UefiLib.inf b/MdePkg/Library/UefiLib/UefiLib.inf
index 52c799b431..eac192817c 100644
--- a/MdePkg/Library/UefiLib/UefiLib.inf
+++ b/MdePkg/Library/UefiLib/UefiLib.inf
@@ -69,12 +69,12 @@
   gEfiDriverDiagnostics2ProtocolGuid             # SOMETIMES_CONSUMED
 
 
-[PcdsFixedAtBuild.common]
-  PcdUefiLibMaxPrintBufferSize|gEfiMdePkgTokenSpaceGuid
-
-[PcdsFeatureFlag.common]
-  PcdDriverDiagnosticsDisable|gEfiMdePkgTokenSpaceGuid
-  PcdComponentNameDisable|gEfiMdePkgTokenSpaceGuid
-  PcdDriverDiagnostics2Disable|gEfiMdePkgTokenSpaceGuid
-  PcdComponentName2Disable|gEfiMdePkgTokenSpaceGuid
+[FixedPcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize
+
+[FeaturePcd.common]
+  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable
+  gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable
+  gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnostics2Disable
+  gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable