X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=EdkModulePkg%2FEdkModulePkg.spd;h=82959ad937c19c79f81f9768ff1a9c28648f6708;hp=5b473f7b59288dd01c420ae8d974727385a2a0ee;hb=e64872fa8b577189395edb6624b9e178989fd3e5;hpb=d9bccce90dcc48c0717c15fde2edfcc6f47906ff

diff --git a/EdkModulePkg/EdkModulePkg.spd b/EdkModulePkg/EdkModulePkg.spd
index 5b473f7b59..82959ad937 100644
--- a/EdkModulePkg/EdkModulePkg.spd
+++ b/EdkModulePkg/EdkModulePkg.spd
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <PackageSurfaceArea xmlns="http://www.TianoCore.org/2006/Edk2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <SpdHeader>
     <PackageName>EdkModulePkg</PackageName>
@@ -44,10 +44,6 @@
       <IncludeHeader>Include/Library/EdkPeCoffLoaderLib.h</IncludeHeader>
       <HelpText/>
     </LibraryClass>
-    <LibraryClass Name="EdkPeCoffLoaderX64Lib">
-      <IncludeHeader>Include/Library/EdkPeCoffLoaderX64Lib.h</IncludeHeader>
-      <HelpText/>
-    </LibraryClass>
     <LibraryClass Name="EdkScsiLib">
       <IncludeHeader>Include/Library/EdkScsiLib.h</IncludeHeader>
       <HelpText/>
@@ -210,10 +206,6 @@
       <IncludeHeader>Include/Library/EdkPeCoffLoaderLib.h</IncludeHeader>
       <HelpText/>
     </IndustryStdHeader>
-    <IndustryStdHeader Name="EdkPeCoffLoaderX64Lib">
-      <IncludeHeader>Include/Library/EdkPeCoffLoaderX64Lib.h</IncludeHeader>
-      <HelpText/>
-    </IndustryStdHeader>
     <IndustryStdHeader Name="EdkScsiLib">
       <IncludeHeader>Include/Library/EdkScsiLib.h</IncludeHeader>
       <HelpText/>
@@ -379,7 +371,6 @@
     <Filename>Bus/Usb/UsbMouse/Dxe/UsbMouse.msa</Filename>
     <Filename>Core/Dxe/DxeMain.msa</Filename>
     <Filename>Core/DxeIplPeim/DxeIpl.msa</Filename>
-    <Filename>Core/DxeIplX64Peim/DxeIplX64.msa</Filename>
     <Filename>Core/Pei/PeiMain.msa</Filename>
     <Filename>Library/BaseCustomDecompressLibNull/BaseCustomDecompressLibNull.msa</Filename>
     <Filename>Library/BaseUefiTianoDecompressLib/BaseUefiTianoDecompressLib.msa</Filename>
@@ -387,18 +378,19 @@
     <Filename>Library/DxeCorePerformanceLib/DxeCorePerformanceLib.msa</Filename>
     <Filename>Library/DxeCoreTianoDecompressLibFromHob/DxeCoreTianoDecompressLibFromHob.msa</Filename>
     <Filename>Library/DxeCoreUefiDecompressLibFromHob/DxeCoreUefiDecompressLibFromHob.msa</Filename>
+    <Filename>Library/DxeDebugLibSerialPort/DxeDebugLibSerialPort.msa</Filename>
     <Filename>Library/EdkDxeDebugLibReportStatusCode/EdkDxeDebugLibReportStatusCode.msa</Filename>
     <Filename>Library/EdkDxePeCoffLoaderFromHobLib/EdkDxePeCoffLoaderFromHobLib.msa</Filename>
     <Filename>Library/DxePerformanceLib/DxePerformanceLib.msa</Filename>
     <Filename>Library/EdkDxePrintLib/EdkDxePrintLib.msa</Filename>
     <Filename>Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa</Filename>
     <Filename>Library/EdkDxeSalLib/EdkDxeSalLib.msa</Filename>
+    <Filename>Library/EdkDxeRuntimeSalLib/EdkDxeRuntimeSalLib.msa</Filename>
     <Filename>Library/EdkFvbServiceLib/EdkFvbServiceLib.msa</Filename>
     <Filename>Library/EdkGraphicsLib/EdkGraphicsLib.msa</Filename>
     <Filename>Library/EdkIfrSupportLib/EdkIfrSupportLib.msa</Filename>
     <Filename>Library/EdkNullCustomizedDecompressLib/EdkNullCustomizedDecompressLib.msa</Filename>
     <Filename>Library/EdkPeCoffLoaderLib/EdkPeCoffLoaderLib.msa</Filename>
-    <Filename>Library/EdkPeCoffLoaderX64Lib/EdkPeCoffLoaderX64Lib.msa</Filename>
     <Filename>Library/PeiPerformanceLib/PeiPerformanceLib.msa</Filename>
     <Filename>Library/EdkScsiLib/EdkScsiLib.msa</Filename>
     <Filename>Library/EdkUefiDebugLibConOut/EdkUefiDebugLibConOut.msa</Filename>
@@ -435,7 +427,9 @@
     <Filename>Universal/UserInterface/SetupBrowser/Dxe/SetupBrowser.msa</Filename>
     <Filename>Universal/Variable/Pei/Variable.msa</Filename>
     <Filename>Universal/EmuVariable/RuntimeDxe/EmuVariable.msa</Filename>
+    <Filename>Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa</Filename>
     <Filename>Universal/Variable/RuntimeDxe/Variable.msa</Filename>
+    <Filename>Universal/Variable/RuntimeDxe/VariableIpf.msa</Filename>
     <Filename>Universal/Capsule/RuntimeDxe/CapsuleRuntime.msa</Filename>
     <Filename>Universal/WatchdogTimer/Dxe/WatchDogTimer.msa</Filename>
     <Filename>Universal/StatusCode/Pei/PeiStatusCode.msa</Filename>
@@ -452,7 +446,6 @@
     <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/EdkDxe.h</IncludePkgHeader>
     <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/EdkDxe.h</IncludePkgHeader>
     <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/EdkDxe.h</IncludePkgHeader>
-    <IncludePkgHeader ModuleType="USER_DEFINED">Include/EdkPeim.h</IncludePkgHeader>
   </PackageHeaders>
   <GuidDeclarations>
     <Entry Name="GenericPlatformTokenSpace">
@@ -646,6 +639,11 @@
       <GuidValue>060CC026-4C0D-4DDA-8F41-595FEF00A502</GuidValue>
       <HelpText/>
     </Entry>
+    <Entry Name="GenericPlatformVariable" GuidTypeList="EFI_VARIABLE">
+      <C_Name>gEfiGenericPlatformVariableGuid</C_Name>
+      <GuidValue>59d1c24f-50f1-401a-b101-f33e0daed443</GuidValue>
+      <HelpText>The variable space Guid to pair with a Unicode string name to tag an EFI variable</HelpText>
+    </Entry>
   </GuidDeclarations>
   <ProtocolDeclarations>
     <Entry Name="Capsule">
@@ -1248,5 +1246,32 @@
       <DefaultValue>FALSE</DefaultValue>
       <HelpText>Whether VGA decoding is enabled on this platform so we should avoid those aliased resources</HelpText>
     </PcdEntry>
+    <PcdEntry SupArchList="IA32">
+      <C_Name>PcdDxeIplSwitchToLongMode</C_Name>
+      <Token>0x0001003b</Token>
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
+      <DatumType>BOOLEAN</DatumType>
+      <ValidUsage>FEATURE_FLAG</ValidUsage>
+      <DefaultValue>TRUE</DefaultValue>
+      <HelpText>If this feature is enabled, then the DXE IPL will load a 64-bit DxeCore.</HelpText>
+    </PcdEntry>
+    <PcdEntry>
+      <C_Name>PcdDxeIplBuildShareCodeHobs</C_Name>
+      <Token>0x0001003c</Token>
+      <TokenSpaceGuidCName>gEfiEdkModulePkgTokenSpaceGuid</TokenSpaceGuidCName>
+      <DatumType>BOOLEAN</DatumType>
+      <ValidUsage>FEATURE_FLAG</ValidUsage>
+      <DefaultValue>FALSE</DefaultValue>
+      <HelpText>If this feature is enabled, DXE IPL will build a series of HOBs to share code with DXE Core.</HelpText>
+    </PcdEntry>
+    <PcdEntry>
+      <C_Name>PcdPciBusHotplugDeviceSupport</C_Name>
+      <Token>0x0001003d</Token>
+      <TokenSpaceGuidCName>gEfiGenericPlatformTokenSpaceGuid</TokenSpaceGuidCName>
+      <DatumType>BOOLEAN</DatumType>
+      <ValidUsage>FEATURE_FLAG</ValidUsage>
+      <DefaultValue>TRUE</DefaultValue>
+      <HelpText>If TRUE, the PCI bus driver will support hot plug device. If not hot plug device is supported, this feature flag can be set to FALSE to save size.</HelpText>
+    </PcdEntry>
   </PcdDeclarations>
 </PackageSurfaceArea>
\ No newline at end of file