clean up msa files in EdkModulePkg, removed unnecessary library definitions and PCDs.

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

1 files changed, 146 insertions, 188 deletions

diff --git a/EdkModulePkg/EdkModulePkg.fpd b/EdkModulePkg/EdkModulePkg.fpd
index f3356420fd..c4ef7723ce 100644
--- a/EdkModulePkg/EdkModulePkg.fpd
+++ b/EdkModulePkg/EdkModulePkg.fpd
@@ -1490,8 +1490,9 @@
         <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

         <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <!--Pkg: MdePkg Mod: BaseLib Path: MdePkg\Library\BaseLib\BaseLib.msa-->

+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -1519,6 +1520,14 @@
           <Value>0x80000000</Value>

         </PcdData>

         <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>

+          <Token>0x00000007</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT8</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>0x06</Value>

+        </PcdData>

+        <PcdData ItemType="FIXED_AT_BUILD">

           <C_Name>PcdMaximumUnicodeStringLength</C_Name>

           <Token>0x00000001</Token>

           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

@@ -1550,14 +1559,6 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>10000000</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdReportStatusCodePropertyMask</C_Name>

-          <Token>0x00000007</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT8</DatumType>

-          <MaxDatumSize>1</MaxDatumSize>

-          <Value>0x06</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -7669,8 +7670,9 @@
         <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

         <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <!--Pkg: MdePkg Mod: BaseLib Path: MdePkg\Library\BaseLib\BaseLib.msa-->

+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -7698,6 +7700,14 @@
           <Value>0x80000000</Value>

         </PcdData>

         <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdReportStatusCodePropertyMask</C_Name>

+          <Token>0x00000007</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT8</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>0x06</Value>

+        </PcdData>

+        <PcdData ItemType="FIXED_AT_BUILD">

           <C_Name>PcdMaximumUnicodeStringLength</C_Name>

           <Token>0x00000001</Token>

           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

@@ -7729,14 +7739,6 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>10000000</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdReportStatusCodePropertyMask</C_Name>

-          <Token>0x00000007</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT8</DatumType>

-          <MaxDatumSize>1</MaxDatumSize>

-          <Value>0x06</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -11872,14 +11874,6 @@
           <MaxDatumSize>1</MaxDatumSize>

           <Value>0</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdFSBClock</C_Name>

-          <Token>0x0000000c</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>200000000</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -20217,9 +20211,11 @@
         <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

-        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <!--Pkg: MdePkg Mod: BaseLib Path: MdePkg\Library\BaseLib\BaseLib.msa-->

+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

+        <!--Pkg: MdePkg Mod: DxeMemoryAllocationLib Path: MdePkg\Library\DxeMemoryAllocationLib\DxeMemoryAllocationLib.msa-->

+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -20254,6 +20250,30 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>0x80000000</Value>

         </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdComponentNameDisable</C_Name>

+          <Token>0x0000000d</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdDriverDiagnosticsDisable</C_Name>

+          <Token>0x0000000e</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

+        <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

+          <Token>0x101</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT32</DatumType>

+          <MaxDatumSize>4</MaxDatumSize>

+          <Value>320</Value>

+        </PcdData>

         <PcdData ItemType="FIXED_AT_BUILD">

           <C_Name>PcdMaximumUnicodeStringLength</C_Name>

           <Token>0x00000001</Token>

@@ -20286,30 +20306,6 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>10000000</Value>

         </PcdData>

-        <PcdData ItemType="FEATURE_FLAG">

-          <C_Name>PcdComponentNameDisable</C_Name>

-          <Token>0x0000000d</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>BOOLEAN</DatumType>

-          <MaxDatumSize>1</MaxDatumSize>

-          <Value>FALSE</Value>

-        </PcdData>

-        <PcdData ItemType="FEATURE_FLAG">

-          <C_Name>PcdDriverDiagnosticsDisable</C_Name>

-          <Token>0x0000000e</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>BOOLEAN</DatumType>

-          <MaxDatumSize>1</MaxDatumSize>

-          <Value>FALSE</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

-          <Token>0x101</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>320</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -20327,9 +20323,11 @@
         <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

-        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <!--Pkg: MdePkg Mod: DxeMemoryAllocationLib Path: MdePkg\Library\DxeMemoryAllocationLib\DxeMemoryAllocationLib.msa-->

+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

+        <!--Pkg: MdePkg Mod: BaseLib Path: MdePkg\Library\BaseLib\BaseLib.msa-->

+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -20364,6 +20362,30 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>0x80000000</Value>

         </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdComponentNameDisable</C_Name>

+          <Token>0x0000000d</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdDriverDiagnosticsDisable</C_Name>

+          <Token>0x0000000e</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

+        <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

+          <Token>0x101</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT32</DatumType>

+          <MaxDatumSize>4</MaxDatumSize>

+          <Value>320</Value>

+        </PcdData>

         <PcdData ItemType="FIXED_AT_BUILD">

           <C_Name>PcdMaximumUnicodeStringLength</C_Name>

           <Token>0x00000001</Token>

@@ -20396,30 +20418,6 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>10000000</Value>

         </PcdData>

-        <PcdData ItemType="FEATURE_FLAG">

-          <C_Name>PcdComponentNameDisable</C_Name>

-          <Token>0x0000000d</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>BOOLEAN</DatumType>

-          <MaxDatumSize>1</MaxDatumSize>

-          <Value>FALSE</Value>

-        </PcdData>

-        <PcdData ItemType="FEATURE_FLAG">

-          <C_Name>PcdDriverDiagnosticsDisable</C_Name>

-          <Token>0x0000000e</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>BOOLEAN</DatumType>

-          <MaxDatumSize>1</MaxDatumSize>

-          <Value>FALSE</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

-          <Token>0x101</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>320</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -20437,9 +20435,11 @@
         <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

-        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <!--Pkg: MdePkg Mod: BaseLib Path: MdePkg\Library\BaseLib\BaseLib.msa-->

+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

+        <!--Pkg: MdePkg Mod: DxeMemoryAllocationLib Path: MdePkg\Library\DxeMemoryAllocationLib\DxeMemoryAllocationLib.msa-->

+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -20474,6 +20474,30 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>0x80000000</Value>

         </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdComponentNameDisable</C_Name>

+          <Token>0x0000000d</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdDriverDiagnosticsDisable</C_Name>

+          <Token>0x0000000e</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

+        <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

+          <Token>0x101</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT32</DatumType>

+          <MaxDatumSize>4</MaxDatumSize>

+          <Value>320</Value>

+        </PcdData>

         <PcdData ItemType="FIXED_AT_BUILD">

           <C_Name>PcdMaximumUnicodeStringLength</C_Name>

           <Token>0x00000001</Token>

@@ -20506,30 +20530,6 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>10000000</Value>

         </PcdData>

-        <PcdData ItemType="FEATURE_FLAG">

-          <C_Name>PcdComponentNameDisable</C_Name>

-          <Token>0x0000000d</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>BOOLEAN</DatumType>

-          <MaxDatumSize>1</MaxDatumSize>

-          <Value>FALSE</Value>

-        </PcdData>

-        <PcdData ItemType="FEATURE_FLAG">

-          <C_Name>PcdDriverDiagnosticsDisable</C_Name>

-          <Token>0x0000000e</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>BOOLEAN</DatumType>

-          <MaxDatumSize>1</MaxDatumSize>

-          <Value>FALSE</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

-          <Token>0x101</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>320</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -20547,9 +20547,11 @@
         <Instance ModuleGuid="3ddc3b12-99ea-4364-b315-6310a2050be5" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="bda39d3a-451b-4350-8266-81ab10fa0523" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="50bcb105-6634-441d-b403-659110a03ad2" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

-        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="91c1677a-e57f-4191-8b8e-eb7711a716e0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <!--Pkg: MdePkg Mod: BaseLib Path: MdePkg\Library\BaseLib\BaseLib.msa-->

+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

+        <!--Pkg: MdePkg Mod: DxeMemoryAllocationLib Path: MdePkg\Library\DxeMemoryAllocationLib\DxeMemoryAllocationLib.msa-->

+        <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -20584,6 +20586,30 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>0x80000000</Value>

         </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdComponentNameDisable</C_Name>

+          <Token>0x0000000d</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

+        <PcdData ItemType="FEATURE_FLAG">

+          <C_Name>PcdDriverDiagnosticsDisable</C_Name>

+          <Token>0x0000000e</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>BOOLEAN</DatumType>

+          <MaxDatumSize>1</MaxDatumSize>

+          <Value>FALSE</Value>

+        </PcdData>

+        <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

+          <Token>0x101</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT32</DatumType>

+          <MaxDatumSize>4</MaxDatumSize>

+          <Value>320</Value>

+        </PcdData>

         <PcdData ItemType="FIXED_AT_BUILD">

           <C_Name>PcdMaximumUnicodeStringLength</C_Name>

           <Token>0x00000001</Token>

@@ -20616,30 +20642,6 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>10000000</Value>

         </PcdData>

-        <PcdData ItemType="FEATURE_FLAG">

-          <C_Name>PcdComponentNameDisable</C_Name>

-          <Token>0x0000000d</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>BOOLEAN</DatumType>

-          <MaxDatumSize>1</MaxDatumSize>

-          <Value>FALSE</Value>

-        </PcdData>

-        <PcdData ItemType="FEATURE_FLAG">

-          <C_Name>PcdDriverDiagnosticsDisable</C_Name>

-          <Token>0x0000000e</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>BOOLEAN</DatumType>

-          <MaxDatumSize>1</MaxDatumSize>

-          <Value>FALSE</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

-          <Token>0x101</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>320</Value>

-        </PcdData>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>NULL</FvBinding>

@@ -20731,30 +20733,6 @@
           <Value>10000000</Value>

         </PcdData>

         <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdDebugPropertyMask</C_Name>

-          <Token>0x00000005</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT8</DatumType>

-          <MaxDatumSize>1</MaxDatumSize>

-          <Value>0x0f</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdDebugClearMemoryValue</C_Name>

-          <Token>0x00000008</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT8</DatumType>

-          <MaxDatumSize>1</MaxDatumSize>

-          <Value>0xAF</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdDebugPrintErrorLevel</C_Name>

-          <Token>0x00000006</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0x80000000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

           <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

           <Token>0x101</Token>

           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

@@ -20769,8 +20747,6 @@
       <Libraries>

         <!--Pkg: MdePkg Mod: UefiDriverEntryPoint Path: MdePkg\Library\UefiDriverEntryPoint\UefiDriverEntryPoint.msa-->

         <Instance ModuleGuid="331deb15-454b-48d8-9b74-70d01f3f3556" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

-        <!--Pkg: MdePkg Mod: BaseLib Path: MdePkg\Library\BaseLib\BaseLib.msa-->

-        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

         <!--Pkg: EdkModulePkg Mod: EdkUefiRuntimeLib Path: EdkModulePkg\Library\EdkUefiRuntimeLib\EdkUefiRuntimeLib.msa-->

         <Instance ModuleGuid="b1ee6c28-54aa-4d17-b705-3e28ccb27b2e" ModuleVersion="1.0" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" PackageVersion="0.3"/>

         <!--Pkg: MdePkg Mod: BaseMemoryLib Path: MdePkg\Library\BaseMemoryLib\BaseMemoryLib.msa-->

@@ -20791,9 +20767,19 @@
         <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

         <!--Pkg: MdePkg Mod: DxeMemoryAllocationLib Path: MdePkg\Library\DxeMemoryAllocationLib\DxeMemoryAllocationLib.msa-->

         <Instance ModuleGuid="4674739d-3195-4fb2-8094-ac1d22d00194" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

+        <!--Pkg: MdePkg Mod: BaseLib Path: MdePkg\Library\BaseLib\BaseLib.msa-->

+        <Instance ModuleGuid="27d67720-ea68-48ae-93da-a3a074c90e30" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

+          <Token>0x101</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT32</DatumType>

+          <MaxDatumSize>4</MaxDatumSize>

+          <Value>320</Value>

+        </PcdData>

+        <PcdData ItemType="FIXED_AT_BUILD">

           <C_Name>PcdMaximumUnicodeStringLength</C_Name>

           <Token>0x00000001</Token>

           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

@@ -20825,40 +20811,12 @@
           <MaxDatumSize>4</MaxDatumSize>

           <Value>10000000</Value>

         </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdDebugPropertyMask</C_Name>

-          <Token>0x00000005</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT8</DatumType>

-          <MaxDatumSize>1</MaxDatumSize>

-          <Value>0x0f</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdDebugClearMemoryValue</C_Name>

-          <Token>0x00000008</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT8</DatumType>

-          <MaxDatumSize>1</MaxDatumSize>

-          <Value>0xAF</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdDebugPrintErrorLevel</C_Name>

-          <Token>0x00000006</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>0x80000000</Value>

-        </PcdData>

-        <PcdData ItemType="FIXED_AT_BUILD">

-          <C_Name>PcdUefiLibMaxPrintBufferSize</C_Name>

-          <Token>0x101</Token>

-          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

-          <DatumType>UINT32</DatumType>

-          <MaxDatumSize>4</MaxDatumSize>

-          <Value>320</Value>

-        </PcdData>

       </PcdBuildDefinition>

     </ModuleSA>

+    <!--Mod: CapsuleRuntime Type: DXE_RUNTIME_DRIVER Path: EdkModulePkg\Universal\Capsule\RuntimeDxe\CapsuleRuntime.msa-->

+    <!--Mod: CapsuleRuntime Type: DXE_RUNTIME_DRIVER Path: EdkModulePkg\Universal\Capsule\RuntimeDxe\CapsuleRuntime.msa-->

+    <!--Mod: CapsuleRuntime Type: DXE_RUNTIME_DRIVER Path: EdkModulePkg\Universal\Capsule\RuntimeDxe\CapsuleRuntime.msa-->

+    <!--Mod: CapsuleRuntime Type: DXE_RUNTIME_DRIVER Path: EdkModulePkg\Universal\Capsule\RuntimeDxe\CapsuleRuntime.msa-->

   </FrameworkModules>

   <DynamicPcdBuildDefinitions>

     <PcdBuildData ItemType="DYNAMIC">