Migrate GOP driver from R8.6 for NT32. Add a new PCD "PcdWinNtGop". Setting NT32 platform using GOP driver instead of UGA driver.

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

1 files changed, 173 insertions, 47 deletions

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index f038ccaa22..f4a6563191 100644
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -6618,6 +6618,14 @@
           <Value>L"UGA Window 1!UGA Window 2"</Value>

         </PcdData>

         <PcdData ItemType="DYNAMIC">

+          <C_Name>PcdWinNtGop</C_Name>

+          <Token>0x0000100d</Token>

+          <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>VOID*</DatumType>

+          <MaxDatumSize>50</MaxDatumSize>

+          <Value>L"GOP Window 1!GOP Window 2"</Value>

+        </PcdData>

+        <PcdData ItemType="DYNAMIC">

           <C_Name>PcdWinNtSerialPort</C_Name>

           <Token>0x00001002</Token>

           <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

@@ -7124,17 +7132,18 @@
         <FfsFormatKey>BS_DRIVER</FfsFormatKey>

       </ModuleSaBuildOptions>

     </ModuleSA>

-    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="AB248E8D-ABE1-11d4-BD0D-0080C73C8881">

+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="4A9B9DB8-EC62-4A92-818F-8AA0246D246E">

       <Libraries>

         <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

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

         <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <Instance ModuleGuid="1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

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

-        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="b57a1df6-ffdb-4247-a3df-3a562176751a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <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="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

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

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -7170,6 +7179,14 @@
           <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>

+        <PcdData ItemType="FIXED_AT_BUILD">

           <C_Name>PcdDebugPropertyMask</C_Name>

           <Token>0x00000005</Token>

           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

@@ -7193,40 +7210,34 @@
           <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>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>FV_RECOVERY</FvBinding>

         <FfsFormatKey>BS_DRIVER</FfsFormatKey>

       </ModuleSaBuildOptions>

     </ModuleSA>

-    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="4A9B9DB8-EC62-4A92-818F-8AA0246D246E">

+    <ModuleSA SupArchList="IA32" PackageGuid="d4266a1b-1d38-4116-93ae-60dc3e2012a6" ModuleGuid="c57ad6b7-0515-40a8-9d21-551652854e37">

+      <ModuleSaBuildOptions>

+        <FvBinding>FV_RECOVERY</FvBinding>

+        <FfsFormatKey>APPLICATION</FfsFormatKey>

+      </ModuleSaBuildOptions>

+    </ModuleSA>

+    <ModuleSA SupArchList="IA32" PackageGuid="0fd7197b-9bde-44fe-a7e4-d2177a9922e5" ModuleGuid="961578FE-B6B7-44c3-AF35-6BC705CD2B1F">

+      <ModuleSaBuildOptions>

+        <FvBinding>FV_RECOVERY</FvBinding>

+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>

+      </ModuleSaBuildOptions>

+    </ModuleSA>

+    <ModuleSA SupArchList="IA32" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" ModuleGuid="6987936E-ED34-44db-AE97-1FA5E4ED2116">

       <Libraries>

         <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

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

-        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="1e2c4c2e-67e6-4e57-b3ae-cf5a5af72c2c" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

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

-        <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="4674739d-3195-4fb2-8094-ac1d22d00194" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

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

+        <Instance ModuleGuid="b57a1df6-ffdb-4247-a3df-3a562176751a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -7262,14 +7273,6 @@
           <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>

-        <PcdData ItemType="FIXED_AT_BUILD">

           <C_Name>PcdDebugPropertyMask</C_Name>

           <Token>0x00000005</Token>

           <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

@@ -7296,31 +7299,127 @@
       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>FV_RECOVERY</FvBinding>

-        <FfsFormatKey>BS_DRIVER</FfsFormatKey>

-      </ModuleSaBuildOptions>

-    </ModuleSA>

-    <ModuleSA SupArchList="IA32" PackageGuid="d4266a1b-1d38-4116-93ae-60dc3e2012a6" ModuleGuid="c57ad6b7-0515-40a8-9d21-551652854e37">

-      <ModuleSaBuildOptions>

-        <FvBinding>FV_RECOVERY</FvBinding>

         <FfsFormatKey>APPLICATION</FfsFormatKey>

       </ModuleSaBuildOptions>

     </ModuleSA>

-    <ModuleSA SupArchList="IA32" PackageGuid="0fd7197b-9bde-44fe-a7e4-d2177a9922e5" ModuleGuid="961578FE-B6B7-44c3-AF35-6BC705CD2B1F">

+    <!--Mod: WinNtGop Type: DXE_DRIVER Path: EdkNt32Pkg\Dxe\WinNtThunk\Bus\Gop\WinNtGop.msa-->

+    <ModuleSA ModuleGuid="29b3c4c6-e5aa-49e4-8ce0-2772f782ddc2" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" SupArchList="IA32">

+      <Libraries>

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

+        <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" 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: 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: BaseDebugLibNull Path: MdePkg\Library\BaseDebugLibNull\BaseDebugLibNull.msa-->

+        <Instance ModuleGuid="9ba1d976-0624-41a3-8650-28165e8d9ae8" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

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

+        <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

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

+        <Instance ModuleGuid="fd44e603-002a-4b29-9f5f-529e815b6165" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

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

+        <Instance ModuleGuid="40096a3a-5c2a-4fbc-aef7-5475dd7ab334" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

+        <!--Pkg: EdkNt32Pkg Mod: Nt32TimerLib Path: EdkNt32Pkg\Library\Nt32TimerLibNull\Nt32TimerLib.msa-->

+        <Instance ModuleGuid="3813bb9b-808b-4dcb-b9a3-ea47bd9324c0" ModuleVersion="1.0" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" PackageVersion="0.3"/>

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

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

+        <!--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: UefiDriverModelLib Path: MdePkg\Library\UefiDriverModelLib\UefiDriverModelLib.msa-->

+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

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

+        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" ModuleVersion="1.0" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec" PackageVersion="0.3"/>

+      </Libraries>

+      <PcdBuildDefinition>

+        <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdMaximumUnicodeStringLength</C_Name>

+          <Token>0x00000001</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT32</DatumType>

+          <MaxDatumSize>4</MaxDatumSize>

+          <Value>1000000</Value>

+        </PcdData>

+        <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdMaximumAsciiStringLength</C_Name>

+          <Token>0x00000002</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT32</DatumType>

+          <MaxDatumSize>4</MaxDatumSize>

+          <Value>1000000</Value>

+        </PcdData>

+        <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdMaximumLinkedListLength</C_Name>

+          <Token>0x00000003</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT32</DatumType>

+          <MaxDatumSize>4</MaxDatumSize>

+          <Value>1000000</Value>

+        </PcdData>

+        <PcdData ItemType="FIXED_AT_BUILD">

+          <C_Name>PcdSpinLockTimeout</C_Name>

+          <Token>0x00000004</Token>

+          <TokenSpaceGuidCName>gEfiMdePkgTokenSpaceGuid</TokenSpaceGuidCName>

+          <DatumType>UINT32</DatumType>

+          <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="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>

+      </PcdBuildDefinition>

       <ModuleSaBuildOptions>

         <FvBinding>FV_RECOVERY</FvBinding>

         <FfsFormatKey>BS_DRIVER</FfsFormatKey>

       </ModuleSaBuildOptions>

     </ModuleSA>

-    <ModuleSA SupArchList="IA32" PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d" ModuleGuid="6987936E-ED34-44db-AE97-1FA5E4ED2116">

+    <ModuleSA SupArchList="IA32" PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3" ModuleGuid="AB248E8D-ABE1-11d4-BD0D-0080C73C8881">

       <Libraries>

         <Instance ModuleGuid="ff5c7a2c-ab7a-4366-8616-11c6e53247b6" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

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

-        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="3a004ba5-efe0-4a61-9f1a-267a46ae5ba9" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

+        <Instance ModuleGuid="f1bbe03d-2f28-4dee-bec7-d98d7a30c36a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

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

+        <Instance ModuleGuid="52af22ae-9901-4484-8cdc-622dd5838b09" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="b57a1df6-ffdb-4247-a3df-3a562176751a" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

         <Instance ModuleGuid="a86fbfca-0183-4eeb-aa8a-762e3b7da1f3" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

-        <Instance ModuleGuid="19cbbb97-ff61-45ff-8c3f-dfa66dd118c8" PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

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

       </Libraries>

       <PcdBuildDefinition>

         <PcdData ItemType="FIXED_AT_BUILD">

@@ -7379,10 +7478,26 @@
           <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>

       </PcdBuildDefinition>

       <ModuleSaBuildOptions>

-        <FvBinding>FV_RECOVERY</FvBinding>

-        <FfsFormatKey>APPLICATION</FfsFormatKey>

+        <FvBinding>NULL</FvBinding>

+        <FfsFormatKey>BS_DRIVER</FfsFormatKey>

       </ModuleSaBuildOptions>

     </ModuleSA>

   </FrameworkModules>

@@ -7476,6 +7591,17 @@
       </SkuInfo>

     </PcdBuildData>

     <PcdBuildData ItemType="DYNAMIC">

+      <C_Name>PcdWinNtGop</C_Name>

+      <Token>0x0000100d</Token>

+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>

+      <DatumType>VOID*</DatumType>

+      <MaxDatumSize>50</MaxDatumSize>

+      <SkuInfo>

+        <SkuId>0</SkuId>

+        <Value>L"GOP Window 1!GOP Window 2"</Value>

+      </SkuInfo>

+    </PcdBuildData>

+    <PcdBuildData ItemType="DYNAMIC">

       <C_Name>PcdWinNtSerialPort</C_Name>

       <Token>0x00001002</Token>

       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>