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

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

13 files changed, 43 insertions, 76 deletions

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 6359d649e8..81109f8c7c 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -826,7 +826,7 @@
     </PcdEntry>

     <PcdEntry>

       <C_Name>PcdSupportUpdateCapsuleRest</C_Name>

-      <Token>0x00010020</Token>

+      <Token>0x0001001d</Token>

       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <DatumType>BOOLEAN</DatumType>

       <ValidUsage>FEATURE_FLAG</ValidUsage>

@@ -834,7 +834,7 @@
     </PcdEntry>

     <PcdEntry>

       <C_Name>PcdMaxSizePopulateCapsule</C_Name>

-      <Token>0x00010021</Token>

+      <Token>0x0001001e</Token>

       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <DatumType>UINT32</DatumType>

       <ValidUsage>FIXED_AT_BUILD</ValidUsage>

@@ -842,7 +842,7 @@
     </PcdEntry>

     <PcdEntry>

       <C_Name>PcdMaxSizeNonPopulateCapsule</C_Name>

-      <Token>0x00010022</Token>

+      <Token>0x0001001f</Token>

       <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <DatumType>UINT32</DatumType>

       <ValidUsage>FIXED_AT_BUILD</ValidUsage>

diff --git a/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa b/EdkModulePkg/Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa
index 05b927d4bd..4b631eab42 100644
--- 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

                 of memory.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">

+    <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdDebugPrintErrorLevel</C_Name>

       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>The bitmask of flags that specify the kind of debug message

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa b/EdkModulePkg/Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa
index 93fa1d2705..a63524bb82 100644
--- 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

                 of memory.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">

+    <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdDebugPrintErrorLevel</C_Name>

       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>The bitmask of flags that specify the kind of debug message

diff --git a/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa b/EdkModulePkg/Library/EdkUefiDebugLibStdErr/EdkUefiDebugLibStdErr.msa
index 0991e9786b..89a9811f6d 100644
--- 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

                 of memory.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">

+    <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdDebugPrintErrorLevel</C_Name>

       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>The bitmask of flags that specify the kind of debug message

diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index c3195ac337..d0998fe906 100644
--- 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>

       <DefaultValue>L"E:RW;245760;512"</DefaultValue>

       <HelpText>This PCD defines physical disk which will be simualted as a 

-        harddisk in simulator.

-        The item type of this PCD can only be "DYNAMIC".</HelpText>

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

     </PcdEntry>

     <PcdEntry>

       <C_Name>PcdWinNtVirtualDisk</C_Name>

@@ -245,8 +244,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <ValidUsage>DYNAMIC</ValidUsage>

       <DefaultValue>L"FW;40960;512"</DefaultValue>

       <HelpText>This PCD defines the devices which use a file to emulate a hard disk or 

-        removable media device

-        The item type if this PCD can only be "DYNAMIC".</HelpText>

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

     </PcdEntry>

     <PcdEntry>

       <C_Name>PcdWinNtSerialPort</C_Name>

@@ -273,7 +271,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Token>0x00001004</Token>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

       <DatumType>VOID*</DatumType>

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>

+      <ValidUsage>DYNAMIC</ValidUsage>

       <DefaultValue>L".!..\\..\\..\\..\\..\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>

       <HelpText>This PCD defines the windows directory who will be mounted as 

         harddisk in simulator.

@@ -284,28 +282,18 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Token>0x00001005</Token>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

       <DatumType>VOID*</DatumType>

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>

-      <DefaultValue>L"64!64"</DefaultValue>

-      <HelpText>This PCD defines the size of simulated memory size.

-        The item type of this PCD can only be "DYNAMIC".</HelpText>

-    </PcdEntry>

-    <PcdEntry>

-      <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>

-      <Token>0x00001005</Token>

-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <DatumType>VOID*</DatumType>

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>

+      <ValidUsage>DYNAMIC</ValidUsage>

       <DefaultValue>L"64!64"</DefaultValue>

       <HelpText>This PCD defines the memory size of simulated machine. Simulator will allocate

-        the size of PcdWinNtMemorySizeForSecMain in windows platform.

-        The item type of this PCD can only be "FIXED_AT_BUILD".</HelpText>

+        the size of PcdWinNtMemorySize in windows platform.

+        The item type of this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

     <PcdEntry>

       <C_Name>PcdWinNtBootMode</C_Name>

       <Token>0x00001006</Token>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

       <DatumType>UINT32</DatumType>

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>

+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>

       <DefaultValue>1</DefaultValue>

       <HelpText>This PCD defines the boot mode for simualtor. 

         The boot mode can be set as following value:

@@ -319,15 +307,14 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           0x10: Boot on S2 resume. 

           0x11: Boot on S3 resume.

           0x12: Boot on flash update.

-          0x20: Boot in reovery mode.

-        The item type of this PCD can only be "FIXED_AT_BUILD".</HelpText>

+          0x20: Boot in reovery mode.</HelpText>

     </PcdEntry>

     <PcdEntry>

       <C_Name>PcdWinNtCpuModel</C_Name>

       <Token>0x00001007</Token>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

       <DatumType>VOID*</DatumType>

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>

+      <ValidUsage>DYNAMIC</ValidUsage>

       <DefaultValue>L"Intel(R) Processor Model"</DefaultValue>

       <HelpText>This PCD defines simulated CPU model string.

         The item type of this PCD can only be "DYNAMIC".</HelpText>

@@ -337,26 +324,26 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <Token>0x00001008</Token>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

       <DatumType>VOID*</DatumType>

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>

+      <ValidUsage>DYNAMIC</ValidUsage>

       <DefaultValue>L"3000"</DefaultValue>

-      <HelpText>This PCD defines simulated CPU speed string.</HelpText>

+      <HelpText>This PCD defines simulated CPU speed string.

+        The item type of this PCD can only be "DYNAMIC".</HelpText>

     </PcdEntry>

     <PcdEntry>

       <C_Name>PcdWinNtFirmwareVolume</C_Name>

       <Token>0x00001009</Token>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

       <DatumType>VOID*</DatumType>

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>

+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>

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

-      <HelpText>This PCD defines the FD file windows path string. Simulator will load the FD file and execute.

-        The item type of this PCD can only be "FIXED_AT_BUILD".</HelpText>

+      <HelpText>This PCD defines the FD file windows path string. Simulator will load the FD file and execute.</HelpText>

     </PcdEntry>

     <PcdEntry>

       <C_Name>PcdWinNtConsole</C_Name>

       <Token>0x0000100a</Token>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

       <DatumType>VOID*</DatumType>

-      <ValidUsage>FIXED_AT_BUILD</ValidUsage>

+      <ValidUsage>DYNAMIC</ValidUsage>

       <DefaultValue>L"Bus Driver Console Window"</DefaultValue>

       <HelpText>This PCD declares the title string of the text console window. 

         such as "My EFI Console".

@@ -371,5 +358,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DefaultValue>FALSE</DefaultValue>

       <HelpText>Select which type of driver the library links against.</HelpText>

     </PcdEntry>

+    <PcdEntry>

+      <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>

+      <Token>0x0000100c</Token>

+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>VOID*</DatumType>

+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>

+      <DefaultValue>L"64!64"</DefaultValue>

+      <HelpText>This PCD defines the memory size of simulated machine. Simulator will allocate

+        the size of PcdWinNtMemorySizeForSecMain in windows platform.</HelpText>

+    </PcdEntry>

   </PcdDeclarations>

 </PackageSurfaceArea>
diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index 32647a5fdc..8a62342c16 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -192,14 +192,6 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>1000000</Value>

         </PcdData>

-        <PcdData ItemType="DYNAMIC">

-          <C_Name>PcdWinNtCpuModel</C_Name>

-          <Token>0x00001007</Token>

-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>VOID*</DatumType>

-          <MaxDatumSize>48</MaxDatumSize>

-          <Value>L"Intel(R) Processor Model"</Value>

-        </PcdData>

         <PcdData ItemType="FIXED_AT_BUILD">

           <C_Name>PcdWinNtFirmwareVolume</C_Name>

           <Token>0x00001009</Token>

@@ -224,14 +216,6 @@
           <MaxDatumSize>1</MaxDatumSize>

           <Value>0xAF</Value>

         </PcdData>

-        <PcdData ItemType="DYNAMIC">

-          <C_Name>PcdWinNtMemorySize</C_Name>

-          <Token>0x00001005</Token>

-          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>VOID*</DatumType>

-          <MaxDatumSize>10</MaxDatumSize>

-          <Value>L"64!64"</Value>

-        </PcdData>

         <PcdData ItemType="FIXED_AT_BUILD">

           <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>

           <Token>0x00001005</Token>

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

       </SkuInfo>

     </PcdBuildData>

-    <PcdBuildData ItemType="DYNAMIC_EX">

-      <C_Name>PcdTestDynamicBoolean</C_Name>

-      <Token>0x00011004</Token>

-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <DatumType>BOOLEAN</DatumType>

-      <MaxDatumSize>1</MaxDatumSize>

-      <SkuInfo>

-        <SkuId>0</SkuId>

-        <Value>FALSE</Value>

-      </SkuInfo>

-    </PcdBuildData>

     <PcdBuildData ItemType="DYNAMIC">

       <C_Name>PcdWinNtCpuSpeed</C_Name>

       <Token>0x00001008</Token>

diff --git a/EdkNt32Pkg/Sec/SecMain.msa b/EdkNt32Pkg/Sec/SecMain.msa
index 535d7351d3..705efcef7a 100644
--- 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>

   </Externs>

   <PcdCoded>

-    <PcdEntry PcdItemType="FIXED_AT_BUILD">

+    <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>This PCD defines the memory size of simulated machine. Simulator will allocate

-        the size of PcdWinNtMemorySizeForSecMain in windows platform.

-        The item type of this PCD can only be "FIXED_AT_BUILD".</HelpText>

+        the size of PcdWinNtMemorySizeForSecMain in windows platform.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="FIXED_AT_BUILD">

+    <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdWinNtFirmwareVolume</C_Name>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

-      <HelpText>This PCD defines the FD file windows path string. Simulator will load the FD file and execute.

-        The item type of this PCD can only be "FIXED_AT_BUILD".</HelpText>

+      <HelpText>This PCD defines the FD file windows path string. Simulator will load the FD file and execute.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="FIXED_AT_BUILD">

+    <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdWinNtBootMode</C_Name>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>This PCD defines the boot mode for simualtor. 

@@ -119,8 +117,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.-->
           0x10: Boot on S2 resume. 

           0x11: Boot on S3 resume.

           0x12: Boot on flash update.

-          0x20: Boot in reovery mode.

-        The item type of this PCD can only be "FIXED_AT_BUILD".</HelpText>

+          0x20: Boot in reovery mode.</HelpText>

     </PcdEntry>

   </PcdCoded>

 </ModuleSurfaceArea>
\ No newline at end of file
diff --git a/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa b/MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.msa
index a71f9ac8ff..97678b4774 100644
--- 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

                 of memory.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">

+    <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdDebugPrintErrorLevel</C_Name>

           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>The bitmask of flags that specify the kind of debug message

diff --git a/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa b/MdePkg/Library/BasePciExpressLib/BasePciExpressLib.msa
index 7996aeb86d..155a7276a5 100644
--- 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>

   </Externs>

   <PcdCoded>

-    <PcdEntry PcdItemType="FIXED_AT_BUILD">

+    <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdPciExpressBaseAddress</C_Name>

           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>The base address of PCI Express MMIO window.</HelpText>

diff --git a/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa b/MdePkg/Library/PeiDxeDebugLibReportStatusCode/PeiDxeDebugLibReportStatusCode.msa
index c80705b97d..9b9c59ccc7 100644
--- 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

                 of memory.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">

+    <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdDebugPrintErrorLevel</C_Name>

       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>The bitmask of flags that specify the kind of debug message

diff --git a/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa b/MdePkg/Library/UefiDebugLibConOut/UefiDebugLibConOut.msa
index b85d4d5b4e..4f4541d8d1 100644
--- 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

                 of memory.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">

+    <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdDebugPrintErrorLevel</C_Name>

           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>The bitmask of flags that specify the kind of debug message

diff --git a/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa b/MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.msa
index ac16e2cc5f..9d7408b9e7 100644
--- 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

                 of memory.</HelpText>

     </PcdEntry>

-    <PcdEntry PcdItemType="PATCHABLE_IN_MODULE">

+    <PcdEntry PcdItemType="DYNAMIC">

       <C_Name>PcdDebugPrintErrorLevel</C_Name>

           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <HelpText>The bitmask of flags that specify the kind of debug message

diff --git a/MdePkg/MdePkg.spd b/MdePkg/MdePkg.spd
index 89c1f2b2fc..3fbc1532ab 100644
--- 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>

       <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

       <DatumType>UINT32</DatumType>

-      <ValidUsage>PATCHABLE_IN_MODULE</ValidUsage>

+      <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>

       <DefaultValue>0x80000000</DefaultValue>

       <HelpText>The bitmask of flags that specify the kind of debug message

                 output when Debug Print is enabled.</HelpText>