3 files changed, 26 insertions, 46 deletions
diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa b/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa
index ee84d830cd..3765b53f73 100644
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa
@@ -74,16 +74,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleEntryPoint>PcdDxeInit</ModuleEntryPoint>
     </Extern>
   </Externs>
-  <PCDs>
-    <PcdData ItemType="FIXED_AT_BUILD">
+  <PcdCoded>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
-      <Token>0x0001000f</Token>
-      <DatumType>UINT32</DatumType>
-    </PcdData>
-    <PcdData ItemType="FIXED_AT_BUILD">
+    </PcdEntry>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdVpdBaseAddress</C_Name>
-      <Token>0x00010010</Token>
-      <DatumType>UINT32</DatumType>
-    </PcdData>
-  </PCDs>
+    </PcdEntry>
+  </PcdCoded>
 </ModuleSurfaceArea>
diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.msa b/EdkModulePkg/Universal/PCD/Pei/Pcd.msa
index d9d1baee36..85eadda595 100644
--- a/EdkModulePkg/Universal/PCD/Pei/Pcd.msa
+++ b/EdkModulePkg/Universal/PCD/Pei/Pcd.msa
@@ -80,16 +80,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleEntryPoint>PcdPeimInit</ModuleEntryPoint>
     </Extern>
   </Externs>
-  <PCDs>
-    <PcdData ItemType="FIXED_AT_BUILD">
+  <PcdCoded>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
-      <Token>0x0001000f</Token>
-      <DatumType>UINT32</DatumType>
-    </PcdData>
-    <PcdData ItemType="FIXED_AT_BUILD">
+    </PcdEntry>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdVpdBaseAddress</C_Name>
-      <Token>0x00010010</Token>
-      <DatumType>UINT32</DatumType>
-    </PcdData>
-  </PCDs>
+    </PcdEntry>
+  </PcdCoded>
 </ModuleSurfaceArea>
diff --git a/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.msa b/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.msa
index b772e83ccd..9c57713dcc 100644
--- a/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.msa
+++ b/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.msa
@@ -68,36 +68,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleEntryPoint>PcdTestPeimInit</ModuleEntryPoint>
     </Extern>
   </Externs>
-  <PCDs>
-    <PcdData ItemType="FIXED_AT_BUILD">
+  <PcdCoded>
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">
       <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
-      <Token>0x0001000f</Token>
-      <DatumType>UINT32</DatumType>
-    </PcdData>
-    <PcdData ItemType="DYNAMIC">
+    </PcdEntry>
+    <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdTestDynamicUint8</C_Name>
-      <Token>0x00011000</Token>
-      <DatumType>UINT8</DatumType>
-    </PcdData>
-    <PcdData ItemType="DYNAMIC">
+    </PcdEntry>
+    <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdTestDynamicUint16</C_Name>
-      <Token>0x00011001</Token>
-      <DatumType>UINT16</DatumType>
-    </PcdData>
-    <PcdData ItemType="DYNAMIC">
+    </PcdEntry>
+    <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdTestDynamicUint32</C_Name>
-      <Token>0x00011002</Token>
-      <DatumType>UINT32</DatumType>
-    </PcdData>
-    <PcdData ItemType="DYNAMIC">
+    </PcdEntry>
+    <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdTestDynamicUint64</C_Name>
-      <Token>0x00011003</Token>
-      <DatumType>UINT64</DatumType>
-    </PcdData>
-    <PcdData ItemType="DYNAMIC">
+    </PcdEntry>
+    <PcdEntry PcdItemType="DYNAMIC">
       <C_Name>PcdTestDynamicBoolean</C_Name>
-      <Token>0x00011004</Token>
-      <DatumType>BOOLEAN</DatumType>
-    </PcdData>
-  </PCDs>
+    </PcdEntry>
+  </PcdCoded>
 </ModuleSurfaceArea>