The main trunk of tip is broken by Scott's removing of PcdPeimTest driver, but forget...

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

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index e2b9542e65c67ed08cae343cec0cca6398e64f50..9c722a88381cf071546965ed65eebcf6f75d3c43 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -294,9 +294,6 @@
     <MsaFile>
       <Filename>Universal/PCD/Pei/Pcd.msa</Filename>
     </MsaFile>
     <MsaFile>
       <Filename>Universal/PCD/Pei/Pcd.msa</Filename>
     </MsaFile>

-    <MsaFile>
-      <Filename>Universal/PCD/Test/PeiPcdTest.msa</Filename>
-    </MsaFile>

     <MsaFile>
       <Filename>Universal/PCD/Dxe/Pcd.msa</Filename>
     </MsaFile>
     <MsaFile>
       <Filename>Universal/PCD/Dxe/Pcd.msa</Filename>
     </MsaFile>

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index e5bf153c7fa11de57548db8f72fa614dd59d7ad2..5fb363ccfd8cf8948cad1da497d8799d2ee15cac 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -518,113 +518,6 @@
           </PcdData>\r
         </PcdBuildDefinition>\r
       </ModuleSA>\r
           </PcdData>\r
         </PcdBuildDefinition>\r
       </ModuleSA>\r

-      <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="PeimPcdTest">\r
-        <PcdBuildDefinition>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumUnicodeStringLength</C_Name>\r
-            <Token>0x00000001</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumAsciiStringLength</C_Name>\r
-            <Token>0x00000002</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugPropertyMask</C_Name>\r
-            <Token>0x00000005</Token>\r
-            <TokenSpaceGuid>866baf87-e00c-4dc6-9733-1e23af2115ee</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x1f</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdSpinLockTimeout</C_Name>\r
-            <Token>0x00000004</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>10000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="PATCHABLE_IN_MODULE">\r
-            <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
-            <Token>0x00000006</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>0x80000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdReportStatusCodePropertyMask</C_Name>\r
-            <Token>0x00000007</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x07</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdMaximumLinkedListLength</C_Name>\r
-            <Token>0x00000003</Token>\r
-            <TokenSpaceGuid>f1a9de0d-f005-45c4-bdb5-5ec0fb468316</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>1000000</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="FIXED_AT_BUILD">\r
-            <C_Name>PcdDebugClearMemoryValue</C_Name>\r
-            <Token>0x00000008</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0xAF</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="DYNAMIC">\r
-            <C_Name>PcdTestDynamicUint8</C_Name>\r
-            <Token>0x00011000</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT8</DatumType>\r
-            <MaxDatumSize>1</MaxDatumSize>\r
-            <Value>0x1</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="DYNAMIC">\r
-            <C_Name>PcdTestDynamicUint16</C_Name>\r
-            <Token>0x00011001</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT16</DatumType>\r
-            <MaxDatumSize>2</MaxDatumSize>\r
-            <Value>0x1234</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="DYNAMIC">\r
-            <C_Name>PcdTestDynamicUint32</C_Name>\r
-            <Token>0x00011002</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT32</DatumType>\r
-            <MaxDatumSize>4</MaxDatumSize>\r
-            <Value>0</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="DYNAMIC">\r
-            <C_Name>PcdTestDynamicUint64</C_Name>\r
-            <Token>0x00011003</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>UINT64</DatumType>\r
-            <MaxDatumSize>8</MaxDatumSize>\r
-            <Value>0</Value>\r
-          </PcdData>\r
-          <PcdData ItemType="DYNAMIC">\r
-            <C_Name>PcdTestDynamicBoolean</C_Name>\r
-            <Token>0x00011004</Token>\r
-            <TokenSpaceGuid>00000000-0000-0000-0000-000000000000</TokenSpaceGuid>\r
-            <DatumType>BOOLEAN</DatumType>\r
-            <Value>FALSE</Value>\r
-          </PcdData>\r
-        </PcdBuildDefinition>      \r
-      </ModuleSA>\r

       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonoStatusCode">\r
         <PcdBuildDefinition>\r
           <PcdData ItemType="FIXED_AT_BUILD">\r
       <ModuleSA Arch="IA32" FvBinding="FV_RECOVERY" ModuleName="MonoStatusCode">\r
         <PcdBuildDefinition>\r
           <PcdData ItemType="FIXED_AT_BUILD">\r