Change PcdDebugPrintErrorLevel PCD declare in msa as DYNAMIC, because this PCD type...

FIXED_AT_BUILD and PATCHABLE_IN_MODULE.
Change Some WINNT PCDs type declared in EdkNt32Pkg.spd as DYNAMIC, because they is used in Nt32 emluator platform as DYNAMIC type.

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

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 6359d649e8775bd9dcca8c57eda06d44e246a11e..81109f8c7cdd1721a5fd482d3f69eb95a0a64012 100644 (file)
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -826,7 +826,7 @@
     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdSupportUpdateCapsuleRest</C_Name>\r
     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdSupportUpdateCapsuleRest</C_Name>\r

-      <Token>0x00010020</Token>\r
+      <Token>0x0001001d</Token>\r

       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>BOOLEAN</DatumType>\r
       <ValidUsage>FEATURE_FLAG</ValidUsage>\r
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>BOOLEAN</DatumType>\r
       <ValidUsage>FEATURE_FLAG</ValidUsage>\r


@@ -834,7 +834,7 @@
     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdMaxSizePopulateCapsule</C_Name>\r
     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdMaxSizePopulateCapsule</C_Name>\r

-      <Token>0x00010021</Token>\r
+      <Token>0x0001001e</Token>\r

       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r


@@ -842,7 +842,7 @@
     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdMaxSizeNonPopulateCapsule</C_Name>\r
     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdMaxSizeNonPopulateCapsule</C_Name>\r

-      <Token>0x00010022</Token>\r
+      <Token>0x0001001f</Token>\r

       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r
       <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r

diff --git a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa b/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa
index 05b927d4bd2e8948f8d9a9db62027116129dbc72..4b631eab42bda4b49178d7c8786fedde83da96f7 100644 (file)
--- a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa
+++ b/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa
@@ -89,7 +89,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r
       <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r

-    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa b/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
index 93fa1d27059c39df00e8b0355d8d2c4a75b73542..a63524bb823c2b6a49750dc2195ffa103fffe398 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
+++ b/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
@@ -89,7 +89,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r
       <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r

-    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
index 0991e9786b4212adf6def83725612e4055e67038..89a9811f6d355024478c0015770df5e479aeb3d3 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
+++ b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
@@ -89,7 +89,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r
       <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r

-    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r

diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index c3195ac337326074fa75a29f2d0dd6333d889b11..d0998fe906e48d01318f841927965419639d7a40 100644 (file)
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -234,8 +234,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ValidUsage>DYNAMIC</ValidUsage>\r
       <DefaultValue>L"E:RW;245760;512"</DefaultValue>\r
       <HelpText>This PCD defines physical disk which will be simualted as a \r
       <ValidUsage>DYNAMIC</ValidUsage>\r
       <DefaultValue>L"E:RW;245760;512"</DefaultValue>\r
       <HelpText>This PCD defines physical disk which will be simualted as a \r

-        harddisk in simulator.\r
-        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
+        harddisk in simulator. The item type of this PCD can only be "DYNAMIC".</HelpText>\r

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


@@ -245,8 +244,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ValidUsage>DYNAMIC</ValidUsage>\r
       <DefaultValue>L"FW;40960;512"</DefaultValue>\r
       <HelpText>This PCD defines the devices which use a file to emulate a hard disk or \r
       <ValidUsage>DYNAMIC</ValidUsage>\r
       <DefaultValue>L"FW;40960;512"</DefaultValue>\r
       <HelpText>This PCD defines the devices which use a file to emulate a hard disk or \r

-        removable media device\r
-        The item type if this PCD can only be "DYNAMIC".</HelpText>\r
+        removable media device.The item type of this PCD can only be "DYNAMIC".</HelpText>\r

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


@@ -273,7 +271,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Token>0x00001004</Token>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
       <Token>0x00001004</Token>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <ValidUsage>DYNAMIC</ValidUsage>\r

       <DefaultValue>L".!..\\..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>\r
       <HelpText>This PCD defines the windows directory who will be mounted as \r
         harddisk in simulator.\r
       <DefaultValue>L".!..\\..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>\r
       <HelpText>This PCD defines the windows directory who will be mounted as \r
         harddisk in simulator.\r


@@ -284,28 +282,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Token>0x00001005</Token>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
       <Token>0x00001005</Token>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
-      <DefaultValue>L"64!64"</DefaultValue>\r
-      <HelpText>This PCD defines the size of simulated memory size.\r
-        The item type of this PCD can only be "DYNAMIC".</HelpText>\r
-    </PcdEntry>\r
-    <PcdEntry>\r
-      <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r
-      <Token>0x00001005</Token>\r
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <DatumType>VOID*</DatumType>\r
-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <ValidUsage>DYNAMIC</ValidUsage>\r

       <DefaultValue>L"64!64"</DefaultValue>\r
       <HelpText>This PCD defines the memory size of simulated machine. Simulator will allocate\r
       <DefaultValue>L"64!64"</DefaultValue>\r
       <HelpText>This PCD defines the memory size of simulated machine. Simulator will allocate\r

-        the size of PcdWinNtMemorySizeForSecMain in windows platform.\r
-        The item type of this PCD can only be "FIXED_AT_BUILD".</HelpText>\r
+        the size of PcdWinNtMemorySize in windows platform.\r
+        The item type of this PCD can only be "DYNAMIC".</HelpText>\r

     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdWinNtBootMode</C_Name>\r
       <Token>0x00001006</Token>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r
     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdWinNtBootMode</C_Name>\r
       <Token>0x00001006</Token>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>\r

       <DefaultValue>1</DefaultValue>\r
       <HelpText>This PCD defines the boot mode for simualtor. \r
         The boot mode can be set as following value:\r
       <DefaultValue>1</DefaultValue>\r
       <HelpText>This PCD defines the boot mode for simualtor. \r
         The boot mode can be set as following value:\r


@@ -319,15 +307,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           0x10: Boot on S2 resume. \r
           0x11: Boot on S3 resume.\r
           0x12: Boot on flash update.\r
           0x10: Boot on S2 resume. \r
           0x11: Boot on S3 resume.\r
           0x12: Boot on flash update.\r

-          0x20: Boot in reovery mode.\r
-        The item type of this PCD can only be "FIXED_AT_BUILD".</HelpText>\r
+          0x20: Boot in reovery mode.</HelpText>\r

     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdWinNtCpuModel</C_Name>\r
       <Token>0x00001007</Token>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdWinNtCpuModel</C_Name>\r
       <Token>0x00001007</Token>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <ValidUsage>DYNAMIC</ValidUsage>\r

       <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>\r
       <HelpText>This PCD defines simulated CPU model string.\r
         The item type of this PCD can only be "DYNAMIC".</HelpText>\r
       <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>\r
       <HelpText>This PCD defines simulated CPU model string.\r
         The item type of this PCD can only be "DYNAMIC".</HelpText>\r


@@ -337,26 +324,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Token>0x00001008</Token>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
       <Token>0x00001008</Token>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <ValidUsage>DYNAMIC</ValidUsage>\r

       <DefaultValue>L"3000"</DefaultValue>\r
       <DefaultValue>L"3000"</DefaultValue>\r

-      <HelpText>This PCD defines simulated CPU speed string.</HelpText>\r
+      <HelpText>This PCD defines simulated CPU speed string.\r
+        The item type of this PCD can only be "DYNAMIC".</HelpText>\r

     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdWinNtFirmwareVolume</C_Name>\r
       <Token>0x00001009</Token>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdWinNtFirmwareVolume</C_Name>\r
       <Token>0x00001009</Token>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>\r

       <DefaultValue>L"..\\..\\Fv\\Fv_Recovery.fd"</DefaultValue>\r
       <DefaultValue>L"..\\..\\Fv\\Fv_Recovery.fd"</DefaultValue>\r

-      <HelpText>This PCD defines the FD file windows path string. Simulator will load the FD file and execute.\r
-        The item type of this PCD can only be "FIXED_AT_BUILD".</HelpText>\r
+      <HelpText>This PCD defines the FD file windows path string. Simulator will load the FD file and execute.</HelpText>\r

     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdWinNtConsole</C_Name>\r
       <Token>0x0000100a</Token>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r
     </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdWinNtConsole</C_Name>\r
       <Token>0x0000100a</Token>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>VOID*</DatumType>\r

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>\r
+      <ValidUsage>DYNAMIC</ValidUsage>\r

       <DefaultValue>L"Bus Driver Console Window"</DefaultValue>\r
       <HelpText>This PCD declares the title string of the text console window. \r
         such as "My EFI Console".\r
       <DefaultValue>L"Bus Driver Console Window"</DefaultValue>\r
       <HelpText>This PCD declares the title string of the text console window. \r
         such as "My EFI Console".\r


@@ -371,5 +358,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DefaultValue>FALSE</DefaultValue>\r
       <HelpText>Select which type of driver the library links against.</HelpText>\r
     </PcdEntry>\r
       <DefaultValue>FALSE</DefaultValue>\r
       <HelpText>Select which type of driver the library links against.</HelpText>\r
     </PcdEntry>\r

+    <PcdEntry>\r
+      <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r
+      <Token>0x0000100c</Token>\r
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
+      <DatumType>VOID*</DatumType>\r
+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>\r
+      <DefaultValue>L"64!64"</DefaultValue>\r
+      <HelpText>This PCD defines the memory size of simulated machine. Simulator will allocate\r
+        the size of PcdWinNtMemorySizeForSecMain in windows platform.</HelpText>\r
+    </PcdEntry>\r

   </PcdDeclarations>\r
 </PackageSurfaceArea>
   </PcdDeclarations>\r
 </PackageSurfaceArea>

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 32647a5fdc35e9d20118c43b463b28d25dd8e328..8a62342c1660ad66e8ecbdccb14fb576adfab08a 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -192,14 +192,6 @@
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
         </PcdData>\r
           <MaxDatumSize>4</MaxDatumSize>\r
           <Value>1000000</Value>\r
         </PcdData>\r

-        <PcdData ItemType="DYNAMIC">\r
-          <C_Name>PcdWinNtCpuModel</C_Name>\r
-          <Token>0x00001007</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>VOID*</DatumType>\r
-          <MaxDatumSize>48</MaxDatumSize>\r
-          <Value>L"Intel(R) Processor Model"</Value>\r
-        </PcdData>\r

         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdWinNtFirmwareVolume</C_Name>\r
           <Token>0x00001009</Token>\r
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdWinNtFirmwareVolume</C_Name>\r
           <Token>0x00001009</Token>\r


@@ -224,14 +216,6 @@
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
         </PcdData>\r
           <MaxDatumSize>1</MaxDatumSize>\r
           <Value>0xAF</Value>\r
         </PcdData>\r

-        <PcdData ItemType="DYNAMIC">\r
-          <C_Name>PcdWinNtMemorySize</C_Name>\r
-          <Token>0x00001005</Token>\r
-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-          <DatumType>VOID*</DatumType>\r
-          <MaxDatumSize>10</MaxDatumSize>\r
-          <Value>L"64!64"</Value>\r
-        </PcdData>\r

         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r
           <Token>0x00001005</Token>\r
         <PcdData ItemType="FIXED_AT_BUILD">\r
           <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r
           <Token>0x00001005</Token>\r


@@ -7054,17 +7038,6 @@
         <Value>L"UGA Window 1!UGA Window 2"</Value>\r
       </SkuInfo>\r
     </PcdBuildData>\r
         <Value>L"UGA Window 1!UGA Window 2"</Value>\r
       </SkuInfo>\r
     </PcdBuildData>\r

-    <PcdBuildData ItemType="DYNAMIC_EX">\r
-      <C_Name>PcdTestDynamicBoolean</C_Name>\r
-      <Token>0x00011004</Token>\r
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <DatumType>BOOLEAN</DatumType>\r
-      <MaxDatumSize>1</MaxDatumSize>\r
-      <SkuInfo>\r
-        <SkuId>0</SkuId>\r
-        <Value>FALSE</Value>\r
-      </SkuInfo>\r
-    </PcdBuildData>\r

     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtCpuSpeed</C_Name>\r
       <Token>0x00001008</Token>\r
     <PcdBuildData ItemType="DYNAMIC">\r
       <C_Name>PcdWinNtCpuSpeed</C_Name>\r
       <Token>0x00001008</Token>\r

diff --git a/EdkNt32Pkg/Sec/SecMain.msa b/EdkNt32Pkg/Sec/SecMain.msa
index 535d7351d3eb56111c6d23ac1a4159ebcdf4ecd3..705efcef7a248004917638ea8cc2318a2c6806a6 100644 (file)
--- a/EdkNt32Pkg/Sec/SecMain.msa
+++ b/EdkNt32Pkg/Sec/SecMain.msa
@@ -91,20 +91,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   </Externs>\r
   <PcdCoded>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   </Externs>\r
   <PcdCoded>\r

-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>This PCD defines the memory size of simulated machine. Simulator will allocate\r
       <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>This PCD defines the memory size of simulated machine. Simulator will allocate\r

-        the size of PcdWinNtMemorySizeForSecMain in windows platform.\r
-        The item type of this PCD can only be "FIXED_AT_BUILD".</HelpText>\r
+        the size of PcdWinNtMemorySizeForSecMain in windows platform.</HelpText>\r

     </PcdEntry>\r
     </PcdEntry>\r

-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdWinNtFirmwareVolume</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <C_Name>PcdWinNtFirmwareVolume</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r

-      <HelpText>This PCD defines the FD file windows path string. Simulator will load the FD file and execute.\r
-        The item type of this PCD can only be "FIXED_AT_BUILD".</HelpText>\r
+      <HelpText>This PCD defines the FD file windows path string. Simulator will load the FD file and execute.</HelpText>\r

     </PcdEntry>\r
     </PcdEntry>\r

-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdWinNtBootMode</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>This PCD defines the boot mode for simualtor. \r
       <C_Name>PcdWinNtBootMode</C_Name>\r
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>This PCD defines the boot mode for simualtor. \r


@@ -119,8 +117,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
           0x10: Boot on S2 resume. \r
           0x11: Boot on S3 resume.\r
           0x12: Boot on flash update.\r
           0x10: Boot on S2 resume. \r
           0x11: Boot on S3 resume.\r
           0x12: Boot on flash update.\r

-          0x20: Boot in reovery mode.\r
-        The item type of this PCD can only be "FIXED_AT_BUILD".</HelpText>\r
+          0x20: Boot in reovery mode.</HelpText>\r

     </PcdEntry>\r
   </PcdCoded>\r
 </ModuleSurfaceArea>
\ No newline at end of file
     </PcdEntry>\r
   </PcdCoded>\r
 </ModuleSurfaceArea>
\ No newline at end of file

diff --git a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
index a71f9ac8fffc5312b696c284cb48923d769695ba..97678b4774ff1a69bb0f8aed0b61b3afc2ca1e68 100644 (file)
--- a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
+++ b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
@@ -72,7 +72,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r
       <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r

-    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r

diff --git a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
index 7996aeb86d5231131e4fb67be5f5294c6205d582..155a7276a5924bb195f1e45e73db38a7fdde3bde 100644 (file)
--- a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
+++ b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
@@ -57,7 +57,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   </Externs>\r
   <PcdCoded>\r
     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>\r
   </Externs>\r
   <PcdCoded>\r

-    <PcdEntry PcdItemType="FIXED_AT_BUILD">\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdPciExpressBaseAddress</C_Name>\r
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The base address of PCI Express MMIO window.</HelpText>\r
       <C_Name>PcdPciExpressBaseAddress</C_Name>\r
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The base address of PCI Express MMIO window.</HelpText>\r

diff --git a/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa b/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa
index c80705b97d28b93c675be9a0647ff69ea0a7354b..9b9c59ccc7b64bc5dd0982790f254dcb8ca124ce 100644 (file)
--- a/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa
+++ b/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa
@@ -77,7 +77,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r
       <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r

-    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r

diff --git a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
index b85d4d5b4eca29ca9313d4d2c71b738411ae16d1..4f4541d8d13316f0e745b96bc5a827b33c502116 100644 (file)
--- a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
+++ b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
@@ -75,7 +75,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r
       <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r

-    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r

diff --git a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
index ac16e2cc5f1d21326cb7fd09afbae7aa7b135ada..9d7408b9e7e87db319d7231860e39d72fd9688c0 100644 (file)
--- a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
+++ b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
@@ -75,7 +75,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r
       <HelpText>The value used by DebugClearMemory () to fill a certain range\r
                 of memory.</HelpText>\r
     </PcdEntry>\r

-    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">\r
+    <PcdEntry PcdItemType="DYNAMIC">\r

       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r
       <C_Name>PcdDebugPrintErrorLevel</C_Name>\r
           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r

diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 89c1f2b2fc9db02a31eb02ce9b51c8cf7b102a7d..3fbc1532ab13a54676b2ce2e599434090334ac43 100644 (file)
--- a/MdePkg/MdePkg.spd
+++ b/MdePkg/MdePkg.spd
@@ -2285,7 +2285,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Token>0x00000006</Token>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r
       <Token>0x00000006</Token>\r
       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>\r
       <DatumType>UINT32</DatumType>\r

-      <ValidUsage>PATCHABLE_IN_MODULE</ValidUsage>\r
+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>\r

       <DefaultValue>0x80000000</DefaultValue>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r
                 output when Debug Print is enabled.</HelpText>\r
       <DefaultValue>0x80000000</DefaultValue>\r
       <HelpText>The bitmask of flags that specify the kind of debug message\r
                 output when Debug Print is enabled.</HelpText>\r