Transfer old <PCDs> in MSA to <PcdCoded>:

1) Add <PcdCoded> definition for library module SA in transition schema.
2) Add <PcdCoded> in all MSA instead of original <PCDs>

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

diff --git a/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.msa b/EdkModulePkg/Library/DxeCorePerformanceLib/DxeCorePerformanceLib.msa
index 3c086d233afb0b2e43885b01245d16669670bded..ae72860ff992807b12d4ce4386b060c199e1644b 100644 (file)
--- 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>\r
     </Extern>\r
   </Externs>\r
       <Constructor>DxeCorePerformanceLibConstructor</Constructor>\r
     </Extern>\r
   </Externs>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r

-      <Token>0x00000001</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa b/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa
index d7dbda688bf7bcdce22f33248013c6b8d1e6305c..85d9d1cbf20908553fac26b96127dc3c905cfc07 100644 (file)
--- 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>\r
     </Extern>\r
   </Externs>\r
       <Constructor>DebugLibConstructor</Constructor>\r
     </Extern>\r
   </Externs>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdDebugPropertyMask</C_Name>\r
       <C_Name>PcdDebugPropertyMask</C_Name>\r

-      <Token>0x00000005</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="PATCHABLE_IN_MODULE">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r

       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r

-      <Token>0x00000006</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/EdkModulePkg/Library/EdkDxePerformanceLib/EdkDxePerformanceLib.msa b/EdkModulePkg/Library/EdkDxePerformanceLib/EdkDxePerformanceLib.msa
index 5fe5bd63646c5acbaf767fdcb8eff78baaee4f5e..a0dd07c6e9f14350a60455ecedd80a370adfa5f0 100644 (file)
--- 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>\r
     </Extern>\r
   </Externs>\r
       <Constructor>PerformanceLibConstructor</Constructor>\r
     </Extern>\r
   </Externs>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r

-      <Token>0x00000001</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/EdkModulePkg/Library/EdkPeiPerformanceLib/EdkPeiPerformanceLib.msa b/EdkModulePkg/Library/EdkPeiPerformanceLib/EdkPeiPerformanceLib.msa
index e3d21cf3eba5ba0801ee4a145a9a17c7bf3c967d..9bf43a379d40deb04b0829a1817a6a7f7a8441b4 100644 (file)
--- 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>\r
     </GuidEntry>\r
   </Guids>\r
       <C_Name>PeiPerformanceHob</C_Name>\r
     </GuidEntry>\r
   </Guids>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r

-      <Token>0x00000001</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa b/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
index dd724d0128577635a919d99ef53d0194eb0b4f9e..615b7717cd6387eb937c22a9c2cb0af8c22ad6f5 100644 (file)
--- 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>\r
     </Extern>\r
   </Externs>\r
       <Constructor>DebugLibConstructor</Constructor>\r
     </Extern>\r
   </Externs>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdDebugPropertyMask</C_Name>\r
       <C_Name>PcdDebugPropertyMask</C_Name>\r

-      <Token>0x00000005</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="PATCHABLE_IN_MODULE">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r

       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r

-      <Token>0x00000006</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
index fcfa3fbafffdfcbc8e8eb1ad2623fd00e926d043..d7a13eddf9a9546773921158266f57965201244b 100644 (file)
--- 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>\r
     </Extern>\r
   </Externs>\r
       <Constructor>DebugLibConstructor</Constructor>\r
     </Extern>\r
   </Externs>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdDebugPropertyMask</C_Name>\r
       <C_Name>PcdDebugPropertyMask</C_Name>\r

-      <Token>0x00000005</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="PATCHABLE_IN_MODULE">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r

       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r

-      <Token>0x00000006</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa b/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa
index ee84d830cd0f6283cf07b52b09ded5d344a10549..3765b53f73b541ba7fe217177ab39e94ebaf107b 100644 (file)
--- 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>\r
     </Extern>\r
   </Externs>\r
       <ModuleEntryPoint>PcdDxeInit</ModuleEntryPoint>\r
     </Extern>\r
   </Externs>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
       <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r

-      <Token>0x0001000f</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdVpdBaseAddress</C_Name>\r
       <C_Name>PcdVpdBaseAddress</C_Name>\r

-      <Token>0x00010010</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </ModuleSurfaceArea>\r
 </ModuleSurfaceArea>\r

diff --git a/EdkModulePkg/Universal/PCD/Pei/Pcd.msa b/EdkModulePkg/Universal/PCD/Pei/Pcd.msa
index d9d1baee36ffe24f8a2b50fad6c8a6ad1148414c..85eadda59519aa8d72a09a36093726e6ae89063c 100644 (file)
--- 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>\r
     </Extern>\r
   </Externs>\r
       <ModuleEntryPoint>PcdPeimInit</ModuleEntryPoint>\r
     </Extern>\r
   </Externs>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
       <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r

-      <Token>0x0001000f</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdVpdBaseAddress</C_Name>\r
       <C_Name>PcdVpdBaseAddress</C_Name>\r

-      <Token>0x00010010</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </ModuleSurfaceArea>\r
 </ModuleSurfaceArea>\r

diff --git a/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.msa b/EdkModulePkg/Universal/PCD/Test/PeiPcdTest.msa
index b772e83ccd53cb0de5a278585e061406d3c4b1e3..9c57713dcc5196a976790f0e01d7c1f114357a0f 100644 (file)
--- 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>\r
     </Extern>\r
   </Externs>\r
       <ModuleEntryPoint>PcdTestPeimInit</ModuleEntryPoint>\r
     </Extern>\r
   </Externs>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
       <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r

-      <Token>0x0001000f</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="DYNAMIC">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdTestDynamicUint8</C_Name>\r
       <C_Name>PcdTestDynamicUint8</C_Name>\r

-      <Token>0x00011000</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="DYNAMIC">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdTestDynamicUint16</C_Name>\r
       <C_Name>PcdTestDynamicUint16</C_Name>\r

-      <Token>0x00011001</Token>\r
-      <DatumType>UINT16</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="DYNAMIC">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdTestDynamicUint32</C_Name>\r
       <C_Name>PcdTestDynamicUint32</C_Name>\r

-      <Token>0x00011002</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="DYNAMIC">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdTestDynamicUint64</C_Name>\r
       <C_Name>PcdTestDynamicUint64</C_Name>\r

-      <Token>0x00011003</Token>\r
-      <DatumType>UINT64</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="DYNAMIC">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdTestDynamicBoolean</C_Name>\r
       <C_Name>PcdTestDynamicBoolean</C_Name>\r

-      <Token>0x00011004</Token>\r
-      <DatumType>BOOLEAN</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </ModuleSurfaceArea>\r
 </ModuleSurfaceArea>\r

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
index 093a18c3a6b1f2927df40c3786f8bbc0a9287ca6..0d17e11f234664bf21b8e11241ed9a774559b9b4 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa
@@ -97,71 +97,45 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ComponentName>gWinNtBusDriverComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r
       <ComponentName>gWinNtBusDriverComponentName</ComponentName>\r
     </Extern>\r
   </Externs>\r

-  <PCDs>\r
-    <PcdData ItemType="DYNAMIC">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdWinNtConsole</C_Name>\r
       <C_Name>PcdWinNtConsole</C_Name>\r

-      <Token>0x0000100a</Token>\r
-      <DatumType>VOID*</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="DYNAMIC">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdWinNtUga</C_Name>\r
       <C_Name>PcdWinNtUga</C_Name>\r

-      <Token>0x00001003</Token>\r
-      <DatumType>VOID*</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="DYNAMIC">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdWinNtSerialPort</C_Name>\r
       <C_Name>PcdWinNtSerialPort</C_Name>\r

-      <Token>0x00001002</Token>\r
-      <DatumType>VOID*</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="DYNAMIC">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdWinNtFileSystem</C_Name>\r
       <C_Name>PcdWinNtFileSystem</C_Name>\r

-      <Token>0x00001004</Token>\r
-      <DatumType>VOID*</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="DYNAMIC">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdWinNtVirtualDisk</C_Name>\r
       <C_Name>PcdWinNtVirtualDisk</C_Name>\r

-      <Token>0x00001001</Token>\r
-      <DatumType>VOID*</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="DYNAMIC">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdWinNtPhysicalDisk</C_Name>\r
       <C_Name>PcdWinNtPhysicalDisk</C_Name>\r

-      <Token>0x00001000</Token>\r
-      <DatumType>VOID*</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="DYNAMIC">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdWinNtCpuModel</C_Name>\r
       <C_Name>PcdWinNtCpuModel</C_Name>\r

-      <Token>0x00001007</Token>\r
-      <DatumType>VOID*</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="DYNAMIC">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdWinNtCpuSpeed</C_Name>\r
       <C_Name>PcdWinNtCpuSpeed</C_Name>\r

-      <Token>0x00001008</Token>\r
-      <DatumType>VOID*</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="DYNAMIC">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdWinNtMemorySize</C_Name>\r
       <C_Name>PcdWinNtMemorySize</C_Name>\r

-      <Token>0x00001005</Token>\r
-      <DatumType>VOID*</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="PATCHABLE_IN_MODULE">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r

       <C_Name>PcdWinNtBinaryPatch1</C_Name>\r
       <C_Name>PcdWinNtBinaryPatch1</C_Name>\r

-      <Token>0x0001000b</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="PATCHABLE_IN_MODULE">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r

       <C_Name>PcdWinNtBinaryPatch2</C_Name>\r
       <C_Name>PcdWinNtBinaryPatch2</C_Name>\r

-      <Token>0x0001000c</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FEATURE_FLAG">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FEATURE_FLAG">\r

       <C_Name>PcdWinNtFeatureFlag1</C_Name>\r
       <C_Name>PcdWinNtFeatureFlag1</C_Name>\r

-      <Token>0x0001000d</Token>\r
-      <DatumType>BOOLEAN</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="DYNAMIC">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdWinNtDynamicUINT32</C_Name>\r
       <C_Name>PcdWinNtDynamicUINT32</C_Name>\r

-      <Token>0x0001000e</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </ModuleSurfaceArea>\r
 </ModuleSurfaceArea>\r

diff --git a/EdkNt32Pkg/Sec/SecMain.msa b/EdkNt32Pkg/Sec/SecMain.msa
index 158b75b886b743b2ec77aa9d9eff6bef69cf7a40..73e74ebfa20e8bd657bbcf664bba72665645f4db 100644 (file)
--- a/EdkNt32Pkg/Sec/SecMain.msa
+++ b/EdkNt32Pkg/Sec/SecMain.msa
@@ -68,23 +68,17 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ModuleEntryPoint></ModuleEntryPoint>\r
     </Extern>\r
   </Externs>\r
       <ModuleEntryPoint></ModuleEntryPoint>\r
     </Extern>\r
   </Externs>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r
       <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r

-      <Token>0x00001005</Token>\r
-      <DatumType>VOID*</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdWinNtFirmwareVolume</C_Name>\r
       <C_Name>PcdWinNtFirmwareVolume</C_Name>\r

-      <Token>0x00001009</Token>\r
-      <DatumType>VOID*</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdWinNtBootMode</C_Name>\r
       <C_Name>PcdWinNtBootMode</C_Name>\r

-      <Token>0x00001006</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

   <BuildOptions>\r
     <Option>BUILD_TYPE=CUSTOM_BUILD</Option>\r
   </BuildOptions>\r
   <BuildOptions>\r
     <Option>BUILD_TYPE=CUSTOM_BUILD</Option>\r
   </BuildOptions>\r

diff --git a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
index 24e2a16f63a1d98005abbde50b17a1aea7776599..f29102c48706efab8174edf97b1b0664ed904be4 100644 (file)
--- a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
+++ b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
@@ -44,21 +44,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdDebugPropertyMask</C_Name>\r
       <C_Name>PcdDebugPropertyMask</C_Name>\r

-      <Token>0x00000005</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdDebugClearMemoryValue</C_Name>\r
       <C_Name>PcdDebugClearMemoryValue</C_Name>\r

-      <Token>0x00000008</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="PATCHABLE_IN_MODULE">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r

       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r

-      <Token>0x00000006</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/MdePkg/Library/BaseDebugLibReportStatusCode/BaseDebugLibReportStatusCode.msa b/MdePkg/Library/BaseDebugLibReportStatusCode/BaseDebugLibReportStatusCode.msa
index b2ef0e31105f3dbaffaaed840242536313772842..77eae428819a5a21354229873e56296c3fbacbff 100644 (file)
--- a/MdePkg/Library/BaseDebugLibReportStatusCode/BaseDebugLibReportStatusCode.msa
+++ b/MdePkg/Library/BaseDebugLibReportStatusCode/BaseDebugLibReportStatusCode.msa
@@ -44,21 +44,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdDebugPropertyMask</C_Name>\r
       <C_Name>PcdDebugPropertyMask</C_Name>\r

-      <Token>0x00000005</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdDebugClearMemoryValue</C_Name>\r
       <C_Name>PcdDebugClearMemoryValue</C_Name>\r

-      <Token>0x00000008</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="PATCHABLE_IN_MODULE">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r

       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r

-      <Token>0x00000006</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/MdePkg/Library/BaseLib/BaseLib-Gcc.msa b/MdePkg/Library/BaseLib/BaseLib-Gcc.msa
index 19573125018a76ceb409ad4ff14c597783b59c45..aa51b2d8ea40357876f5257c0e768301c0100927 100644 (file)
--- a/MdePkg/Library/BaseLib/BaseLib-Gcc.msa
+++ b/MdePkg/Library/BaseLib/BaseLib-Gcc.msa
@@ -293,26 +293,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
  <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r
  <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
       <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r

-      <Token>0x00000001</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
       <C_Name>PcdMaximumAsciiStringLength</C_Name>\r

-      <Token>0x00000002</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdMaximumLinkedListLength</C_Name>\r
       <C_Name>PcdMaximumLinkedListLength</C_Name>\r

-      <Token>0x00000003</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdSpinLockTimeout</C_Name>\r
       <C_Name>PcdSpinLockTimeout</C_Name>\r

-      <Token>0x00000004</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/MdePkg/Library/BaseLib/BaseLib.msa b/MdePkg/Library/BaseLib/BaseLib.msa
index 0d07e79af4f513b09a154cd56baf4556c6589752..5cf3b550cc57e5351c15f7d3a7a986eea6a853d2 100644 (file)
--- a/MdePkg/Library/BaseLib/BaseLib.msa
+++ b/MdePkg/Library/BaseLib/BaseLib.msa
@@ -295,26 +295,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
  <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r
  <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
       <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r

-      <Token>0x00000001</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
       <C_Name>PcdMaximumAsciiStringLength</C_Name>\r

-      <Token>0x00000002</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdMaximumLinkedListLength</C_Name>\r
       <C_Name>PcdMaximumLinkedListLength</C_Name>\r

-      <Token>0x00000003</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdSpinLockTimeout</C_Name>\r
       <C_Name>PcdSpinLockTimeout</C_Name>\r

-      <Token>0x00000004</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
index c51521ddaea23db8fcebd5a080ee4072b6de977a..71ccc2dd1afa0548ee0caa6f1ed1c537e47f80d5 100644 (file)
--- a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
+++ b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
@@ -42,11 +42,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdPciExpressBaseAddress</C_Name>\r
       <C_Name>PcdPciExpressBaseAddress</C_Name>\r

-      <Token>0x0000000A</Token>\r
-      <DatumType>UINT64</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa b/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa
index f288f366fadc57b6e6f02e5166df426aa6422de2..dc1855442a7a7d88c0ca770cf95614b513f5437a 100644 (file)
--- a/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa
+++ b/MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.msa
@@ -42,11 +42,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r
       <C_Name>PcdPerformanceLibraryPropertyMask</C_Name>\r

-      <Token>0x00000001</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/MdePkg/Library/BasePostCodeLib80/BasePostCodeLib80.msa b/MdePkg/Library/BasePostCodeLib80/BasePostCodeLib80.msa
index 21b055edb35552ef2674c4022074c5cfcfe863c0..f17640df0be4eb1b77b065b2915fa4bdf0be0bfc 100644 (file)
--- a/MdePkg/Library/BasePostCodeLib80/BasePostCodeLib80.msa
+++ b/MdePkg/Library/BasePostCodeLib80/BasePostCodeLib80.msa
@@ -42,11 +42,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdPostCodePropertyMask</C_Name>\r
       <C_Name>PcdPostCodePropertyMask</C_Name>\r

-      <Token>0x0000000b</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa b/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa
index 0fdf59ac7171174eeff143f63c4dea998e602ca0..77820166a1f33e85e11ffd421a775ef705cf7dd2 100644 (file)
--- a/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa
+++ b/MdePkg/Library/BasePostCodeLibDebug/BasePostCodeLibDebug.msa
@@ -42,11 +42,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdPostCodePropertyMask</C_Name>\r
       <C_Name>PcdPostCodePropertyMask</C_Name>\r

-      <Token>0x0000000b</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/MdePkg/Library/BasePostCodeLibReportStatusCode/BasePostCodeLibReportStatusCode.msa b/MdePkg/Library/BasePostCodeLibReportStatusCode/BasePostCodeLibReportStatusCode.msa
index 28f84d116f9540079aad7e1f68e6b84d13c99bbc..746bd689493c48e26a722e59698fab5f09cd56cd 100644 (file)
--- a/MdePkg/Library/BasePostCodeLibReportStatusCode/BasePostCodeLibReportStatusCode.msa
+++ b/MdePkg/Library/BasePostCodeLibReportStatusCode/BasePostCodeLibReportStatusCode.msa
@@ -41,11 +41,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdPostCodePropertyMask</C_Name>\r
       <C_Name>PcdPostCodePropertyMask</C_Name>\r

-      <Token>0x0000000b</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa b/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa
index 78c20ebe2b6071fc40096045022684cfc595dad5..7dcd8978d0438bb7d9fee7b630475722bf1e4a0a 100644 (file)
--- a/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa
+++ b/MdePkg/Library/BaseReportStatusCodeLibNull/BaseReportStatusCodeLibNull.msa
@@ -50,11 +50,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <C_Name>StatusCodeDataTypeDebug</C_Name>\r
     </GuidEntry>\r
   </Guids>\r
       <C_Name>StatusCodeDataTypeDebug</C_Name>\r
     </GuidEntry>\r
   </Guids>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
       <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r

-      <Token>0x00000007</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa b/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
index 219646133cab07fb84b8f88cca48fe135fb0020a..6c1fa5f07364af73d6fbf9a23212531dc95fa047 100644 (file)
--- a/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
+++ b/MdePkg/Library/DxeReportStatusCodeLib/DxeReportStatusCodeLib.msa
@@ -60,11 +60,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <C_Name>StatusCodeSpecificData</C_Name>\r
     </GuidEntry>\r
   </Guids>\r
       <C_Name>StatusCodeSpecificData</C_Name>\r
     </GuidEntry>\r
   </Guids>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
       <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r

-      <Token>0x00000007</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa b/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
index d2d0f1796709c9ade631ef1a0219447d08710dff..98e2529c2d4aea628dc4e79a41a586363f3ba645 100644 (file)
--- a/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
+++ b/MdePkg/Library/PeiReportStatusCodeLib/PeiReportStatusCodeLib.msa
@@ -57,11 +57,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <C_Name>StatusCodeSpecificData</C_Name>\r
     </GuidEntry>\r
   </Guids>\r
       <C_Name>StatusCodeSpecificData</C_Name>\r
     </GuidEntry>\r
   </Guids>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
       <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r

-      <Token>0x00000007</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
index 1f396a489cce96adf2c8d014d032f0c97e0f4921..3ca7310e3967ab0d9572721d1567bd42d66756f3 100644 (file)
--- a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
+++ b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
@@ -45,21 +45,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdDebugPropertyMask</C_Name>\r
       <C_Name>PcdDebugPropertyMask</C_Name>\r

-      <Token>0x00000005</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdDebugClearMemoryValue</C_Name>\r
       <C_Name>PcdDebugClearMemoryValue</C_Name>\r

-      <Token>0x00000008</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="PATCHABLE_IN_MODULE">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r

       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r

-      <Token>0x00000006</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
index e894c58c93636d850dc46dc1b8ff8f2402a6c160..8802e95a0e484c45e6eda77ba37ed12beb595682 100644 (file)
--- a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
+++ b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
@@ -45,21 +45,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r
   <Includes>\r
     <PackageName>MdePkg</PackageName>\r
   </Includes>\r

-  <PCDs>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+  <PcdCoded>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdDebugPropertyMask</C_Name>\r
       <C_Name>PcdDebugPropertyMask</C_Name>\r

-      <Token>0x00000005</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="FIXED_AT_BUILD">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r

       <C_Name>PcdDebugClearMemoryValue</C_Name>\r
       <C_Name>PcdDebugClearMemoryValue</C_Name>\r

-      <Token>0x00000008</Token>\r
-      <DatumType>UINT8</DatumType>\r
-    </PcdData>\r
-    <PcdData ItemType="PATCHABLE_IN_MODULE">\r
+    </PcdEntry>\r
+    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r

       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r

-      <Token>0x00000006</Token>\r
-      <DatumType>UINT32</DatumType>\r
-    </PcdData>\r
-  </PCDs>\r
+    </PcdEntry>\r
+  </PcdCoded>\r

 </LibraryModuleSurfaceArea>\r
 </LibraryModuleSurfaceArea>\r

diff --git a/Tools/XMLSchema/SurfaceArea.xsd b/Tools/XMLSchema/SurfaceArea.xsd
index ed47c113c341dd6933ca174a867bbba354ba1fbe..ca44ce780c140969e6e28f39ce7e00580835710c 100644 (file)
--- a/Tools/XMLSchema/SurfaceArea.xsd
+++ b/Tools/XMLSchema/SurfaceArea.xsd
@@ -100,6 +100,7 @@
                 <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Guids"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="Externs"/>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="PCDs"/>\r

+                <xs:element minOccurs="0" maxOccurs="1" ref="PcdCoded"/>\r

                 <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
                 <xs:element minOccurs="0" maxOccurs="1" ref="BuildOptions"/>\r
             </xs:sequence>\r
         </xs:complexType>\r