Correct the token number for PcdDxePcdDatabaseTraverseEnabled

Remove PcdMaxPeiPcdCallBackNumberPerPcdEntry in PcdCoded section in Dxe/Pcd.msa as it is not used in the code.

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

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index 501fae6bacfc715c89b78e36a74537d7b8e8d1fd..6013d881f56ad5ba0111f31ad493853e73be1969 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -188,7 +188,7 @@
         </PcdData>
         <PcdData ItemType="FEATURE_FLAG">
           <C_Name>PcdDxePcdDatabaseTraverseEnabled</C_Name>
         </PcdData>
         <PcdData ItemType="FEATURE_FLAG">
           <C_Name>PcdDxePcdDatabaseTraverseEnabled</C_Name>

-          <Token>0x00000008</Token>
+          <Token>0x00010021</Token>

           <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>BOOLEAN</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>BOOLEAN</DatumType>
           <MaxDatumSize>1</MaxDatumSize>

diff --git a/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa b/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa
index 95a37c869e086f04ae511342f40bf53dc27a693e..cc87a5ef30a800e0b41df0efa8a0a890f12b3d2c 100644 (file)
--- a/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa
+++ b/EdkModulePkg/Universal/PCD/Dxe/Pcd.msa
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r

 <!--Copyright (c) 2006, Intel Corporation
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 <!--Copyright (c) 2006, Intel Corporation
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License


@@ -94,11 +94,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     </Extern>\r
   </Externs>\r
   <PcdCoded>\r
     </Extern>\r
   </Externs>\r
   <PcdCoded>\r

-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
-      <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>\r
-      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <HelpText/>\r
-    </PcdEntry>\r

     <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
       <C_Name>PcdVpdBaseAddress</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
     <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
       <C_Name>PcdVpdBaseAddress</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index cc257b0fc39fcfa0f4e07767d4bbeb52023703ad..3a757609c6c175d9ca5ade302f0813222c082d24 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -1333,14 +1333,6 @@
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
         </PcdData>
           <MaxDatumSize>4</MaxDatumSize>
           <Value>1000000</Value>
         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">
-          <C_Name>PcdMaxPeiPcdCallBackNumberPerPcdEntry</C_Name>
-          <Token>0x0001000f</Token>
-          <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
-          <DatumType>UINT32</DatumType>
-          <MaxDatumSize>4</MaxDatumSize>
-          <Value>0x8</Value>
-        </PcdData>

         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdVpdBaseAddress</C_Name>
           <Token>0x00010010</Token>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdVpdBaseAddress</C_Name>
           <Token>0x00010010</Token>


@@ -1399,7 +1391,7 @@
         </PcdData>
         <PcdData ItemType="FEATURE_FLAG">
           <C_Name>PcdDxePcdDatabaseTraverseEnabled</C_Name>
         </PcdData>
         <PcdData ItemType="FEATURE_FLAG">
           <C_Name>PcdDxePcdDatabaseTraverseEnabled</C_Name>

-          <Token>0x00000008</Token>
+          <Token>0x00010021</Token>

           <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>BOOLEAN</DatumType>
           <MaxDatumSize>1</MaxDatumSize>
           <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>BOOLEAN</DatumType>
           <MaxDatumSize>1</MaxDatumSize>