X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkNt32Pkg%2FEdkNt32Pkg.spd;h=2044857192d427b68c967b868d3861c903f7b419;hp=d0998fe906e48d01318f841927965419639d7a40;hb=22d9199fe5bc0cc9b868b3e33c90a215ce8da3fd;hpb=8cf2c0a7d7d92885619ab9668b04f923b3199300

diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index d0998fe906..2044857192 100644
--- a/EdkNt32Pkg/EdkNt32Pkg.spd
+++ b/EdkNt32Pkg/EdkNt32Pkg.spd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Copyright (c) 2006, Intel Corporation
 All rights reserved. This program and the accompanying materials
@@ -45,11 +45,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <HelpText/>
     </IndustryStdHeader>
     <IndustryStdHeader Name="EdkGenericBdsLib">
-      <IncludeHeader>Include/library/EdkGenericBdsLib.h</IncludeHeader>
+      <IncludeHeader>Include/Library/EdkGenericBdsLib.h</IncludeHeader>
       <HelpText/>
     </IndustryStdHeader>
     <IndustryStdHeader Name="WinNtLib">
-      <IncludeHeader>Include/library/WinNtLib.h</IncludeHeader>
+      <IncludeHeader>Include/Library/WinNtLib.h</IncludeHeader>
       <HelpText/>
     </IndustryStdHeader>
     <IndustryStdHeader Name="NtAutoscan">
@@ -90,7 +90,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     </IndustryStdHeader>
   </IndustryStdIncludes>
   <MsaFiles>
-    <Filename>Dxe/ConPlatform/ConPlatform.msa</Filename>
     <Filename>Dxe/Nt32Platform/MiscSubclass/MiscSubclassDriver.msa</Filename>
     <Filename>Dxe/PlatformBds/PlatformBds.msa</Filename>
     <Filename>Dxe/WinNtThunk/Bus/BlockIo/WinNtBlockIo.msa</Filename>
@@ -98,6 +97,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>Dxe/WinNtThunk/Bus/SerialIo/WinNtSerialIo.msa</Filename>
     <Filename>Dxe/WinNtThunk/Bus/SimpleFileSystem/WinNtSimpleFileSystem.msa</Filename>
     <Filename>Dxe/WinNtThunk/Bus/Uga/WinNtUga.msa</Filename>
+    <Filename>Dxe/WinNtThunk/Bus/Gop/WinNtGop.msa</Filename>
     <Filename>Dxe/WinNtThunk/Bus/WinNtBusDriver/WinNtBusDriver.msa</Filename>
     <Filename>Dxe/WinNtThunk/Chipset/Metronome/Metronome.msa</Filename>
     <Filename>Dxe/WinNtThunk/Chipset/RealTimeClock/RealTimeClock.msa</Filename>
@@ -109,7 +109,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>Library/EdkGenericBdsLib/EdkGenericBdsLib.msa</Filename>
     <Filename>Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa</Filename>
     <Filename>Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa</Filename>
-    <Filename>Library/Nt32OemHookStatusCodeLib/Nt32OemHookStatusCodeLib.msa</Filename>
+    <Filename>Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.msa</Filename>
+    <Filename>Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.msa</Filename>
     <Filename>Logo/Logo.msa</Filename>
     <Filename>Pei/Autoscan/WinNtAutoScan.msa</Filename>
     <Filename>Pei/BootMode/BootMode.msa</Filename>
@@ -127,7 +128,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>
     <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>
     <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/WinNtDxe.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="USER_DEFINED">Include/WinNtPeim.h</IncludePkgHeader>
   </PackageHeaders>
   <GuidDeclarations>
     <Entry Name="EdkNt32PkgTokenSpace">
@@ -155,6 +155,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <GuidValue>0C95A93D-A006-11D4-BCFA-0080C73C8881</GuidValue>
       <HelpText/>
     </Entry>
+    <Entry Name="WinNtGop">
+      <C_Name>gEfiWinNtGopGuid</C_Name>
+      <GuidValue>4e11e955-ccca-11d4-bd0d-0080c73c8881</GuidValue>
+      <HelpText/>
+    </Entry>
     <Entry Name="WinNtUga">
       <C_Name>gEfiWinNtUgaGuid</C_Name>
       <GuidValue>AB248E99-ABE1-11D4-BD0D-0080C73C8881</GuidValue>
@@ -335,7 +340,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <ValidUsage>FIXED_AT_BUILD PATCHABLE_IN_MODULE</ValidUsage>
-      <DefaultValue>L"..\\..\\Fv\\Fv_Recovery.fd"</DefaultValue>
+      <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.</HelpText>
     </PcdEntry>
     <PcdEntry>
@@ -349,15 +354,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         such as "My EFI Console".
         The item type of this PCD can only be "DYNAMIC".</HelpText>
     </PcdEntry>
-    <PcdEntry>
-      <C_Name>PcdNt32StatusCodeLibUseForPei</C_Name>
-      <Token>0x0000100b</Token>
-      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
-      <DatumType>BOOLEAN</DatumType>
-      <ValidUsage>FEATURE_FLAG</ValidUsage>
-      <DefaultValue>FALSE</DefaultValue>
-      <HelpText>Select which type of driver the library links against.</HelpText>
-    </PcdEntry>
     <PcdEntry>
       <C_Name>PcdWinNtMemorySizeForSecMain</C_Name>
       <Token>0x0000100c</Token>
@@ -368,5 +364,15 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <HelpText>This PCD defines the memory size of simulated machine. Simulator will allocate
         the size of PcdWinNtMemorySizeForSecMain in windows platform.</HelpText>
     </PcdEntry>
+    <PcdEntry>
+      <C_Name>PcdWinNtGop</C_Name>
+      <Token>0x0000100d</Token>
+      <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
+      <DatumType>VOID*</DatumType>
+      <ValidUsage>DYNAMIC</ValidUsage>
+      <DefaultValue>L"UGA Window 1!UGA Window 2"</DefaultValue>
+      <HelpText>This PCD declares the resolutions for the GOP windows.
+        The item type of this PCD can only be "DYNAMIC".</HelpText>
+    </PcdEntry>
   </PcdDeclarations>
 </PackageSurfaceArea>