6 files changed, 30 insertions, 48 deletions
diff --git a/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.msa b/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.msa
index 3c086d233a..ae72860ff9 100644
--- a/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.msa
+++ b/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.msa
@@ -60,11 +60,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Constructor>DxeCorePerformanceLibConstructor</Constructor>
     </Extern>
   </Externs>
-  <PCDs>
-    <PcdData ItemType="FIXED_AT_BUILD">
+  <PcdCoded>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
-      <Token>0x00000001</Token>
-      <DatumType>UINT8</DatumType>
-    </PcdData>
-  </PCDs>
+    </PcdEntry>
+  </PcdCoded>
 </LibraryModuleSurfaceArea>
diff --git a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa b/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa
index d7dbda688b..85d9d1cbf2 100644
--- a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa
+++ b/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa
@@ -54,16 +54,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Constructor>DebugLibConstructor</Constructor>
     </Extern>
   </Externs>
-  <PCDs>
-    <PcdData ItemType="FIXED_AT_BUILD">
+  <PcdCoded>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdDebugPropertyMask</C_Name>
-      <Token>0x00000005</Token>
-      <DatumType>UINT8</DatumType>
-    </PcdData>
-    <PcdData ItemType="PATCHABLE_IN_MODULE">
+    </PcdEntry>
+    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">
       <C_Name>PcdDebugPrintErrorLevel</C_Name>
-      <Token>0x00000006</Token>
-      <DatumType>UINT32</DatumType>
-    </PcdData>
-  </PCDs>
+    </PcdEntry>
+  </PcdCoded>
 </LibraryModuleSurfaceArea>
diff --git a/EdkModulePkg/Library/EdkDxePerformanceLib/EdkDxePerformanceLib.msa b/EdkModulePkg/Library/EdkDxePerformanceLib/EdkDxePerformanceLib.msa
index 5fe5bd6364..a0dd07c6e9 100644
--- a/EdkModulePkg/Library/EdkDxePerformanceLib/EdkDxePerformanceLib.msa
+++ b/EdkModulePkg/Library/EdkDxePerformanceLib/EdkDxePerformanceLib.msa
@@ -52,11 +52,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Constructor>PerformanceLibConstructor</Constructor>
     </Extern>
   </Externs>
-  <PCDs>
-    <PcdData ItemType="FIXED_AT_BUILD">
+  <PcdCoded>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
-      <Token>0x00000001</Token>
-      <DatumType>UINT8</DatumType>
-    </PcdData>
-  </PCDs>
+    </PcdEntry>
+  </PcdCoded>
 </LibraryModuleSurfaceArea>
diff --git a/EdkModulePkg/Library/EdkPeiPerformanceLib/EdkPeiPerformanceLib.msa b/EdkModulePkg/Library/EdkPeiPerformanceLib/EdkPeiPerformanceLib.msa
index e3d21cf3eb..9bf43a379d 100644
--- a/EdkModulePkg/Library/EdkPeiPerformanceLib/EdkPeiPerformanceLib.msa
+++ b/EdkModulePkg/Library/EdkPeiPerformanceLib/EdkPeiPerformanceLib.msa
@@ -51,11 +51,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <C_Name>PeiPerformanceHob</C_Name>
     </GuidEntry>
   </Guids>
-  <PCDs>
-    <PcdData ItemType="FIXED_AT_BUILD">
+  <PcdCoded>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>
-      <Token>0x00000001</Token>
-      <DatumType>UINT8</DatumType>
-    </PcdData>
-  </PCDs>
+    </PcdEntry>
+  </PcdCoded>
 </LibraryModuleSurfaceArea>
diff --git a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa b/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
index dd724d0128..615b7717cd 100644
--- a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
+++ b/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
@@ -54,16 +54,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Constructor>DebugLibConstructor</Constructor>
     </Extern>
   </Externs>
-  <PCDs>
-    <PcdData ItemType="FIXED_AT_BUILD">
+  <PcdCoded>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdDebugPropertyMask</C_Name>
-      <Token>0x00000005</Token>
-      <DatumType>UINT8</DatumType>
-    </PcdData>
-    <PcdData ItemType="PATCHABLE_IN_MODULE">
+    </PcdEntry>
+    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">
       <C_Name>PcdDebugPrintErrorLevel</C_Name>
-      <Token>0x00000006</Token>
-      <DatumType>UINT32</DatumType>
-    </PcdData>
-  </PCDs>
+    </PcdEntry>
+  </PcdCoded>
 </LibraryModuleSurfaceArea>
diff --git a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
index fcfa3fbaff..d7a13eddf9 100644
--- a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
+++ b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
@@ -54,16 +54,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Constructor>DebugLibConstructor</Constructor>
     </Extern>
   </Externs>
-  <PCDs>
-    <PcdData ItemType="FIXED_AT_BUILD">
+  <PcdCoded>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdDebugPropertyMask</C_Name>
-      <Token>0x00000005</Token>
-      <DatumType>UINT8</DatumType>
-    </PcdData>
-    <PcdData ItemType="PATCHABLE_IN_MODULE">
+    </PcdEntry>
+    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">
       <C_Name>PcdDebugPrintErrorLevel</C_Name>
-      <Token>0x00000006</Token>
-      <DatumType>UINT32</DatumType>
-    </PcdData>
-  </PCDs>
+    </PcdEntry>
+  </PcdCoded>
 </LibraryModuleSurfaceArea>