X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkNt32Pkg%2FEdkNt32Pkg.spd;h=4c7837a14d9e77de65852ff84d25c5f3897b28df;hp=3e46583ce2ad1a79f44d9cadf18aa7b9f4ee34c0;hb=4faa50287ee70f2140ab81efbacfb0bb0ac891b8;hpb=b0a3b7453d50387f74480269ad445dbe5cf97b6d

diff --git a/EdkNt32Pkg/EdkNt32Pkg.spd b/EdkNt32Pkg/EdkNt32Pkg.spd
index 3e46583ce2..4c7837a14d 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>
@@ -127,7 +127,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 +154,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>
@@ -232,10 +236,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
       <DatumType>VOID*</DatumType>
       <ValidUsage>DYNAMIC</ValidUsage>
-      <DefaultValue>L"FW;40960;512"</DefaultValue>
+      <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>
@@ -244,9 +247,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <DatumType>VOID*</DatumType>
       <ValidUsage>DYNAMIC</ValidUsage>
       <DefaultValue>L"FW;40960;512"</DefaultValue>
-      <HelpText>This PCD defines the file attribute which will be simulated as 
-        a harddisk in simulator.
-        The item type if this PCD can only be "DYNAMIC".</HelpText>
+      <HelpText>This PCD defines the devices which use a file to emulate a hard disk or 
+        removable media device.The item type of this PCD can only be "DYNAMIC".</HelpText>
     </PcdEntry>
     <PcdEntry>
       <C_Name>PcdWinNtSerialPort</C_Name>
@@ -273,8 +275,8 @@ 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>
-      <DefaultValue>L".!C:\\D\\work\\Remodel\\mdk\\EdkShellBinPkg\\bin\\ia32\\Apps"</DefaultValue>
+      <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.
         The item type of this PCD can only be "DYNAMIC".</HelpText>
@@ -284,28 +286,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 +311,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 +328,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>
-      <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>
+      <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.</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 +362,25 @@ 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>
+    <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>