Remove some unnecessary #if/#ifdef from some header files.

[mirror_edk2.git] / EdkUnixPkg / EdkUnixPkg.spd

diff --git a/EdkUnixPkg/EdkUnixPkg.spd b/EdkUnixPkg/EdkUnixPkg.spd
index 982bb07f15150dbea2f1a09dc8ccaf89c550f78f..c4360e89f2e9255d91da34e3eeb054d3bd1cc679 100644 (file)
--- a/EdkUnixPkg/EdkUnixPkg.spd
+++ b/EdkUnixPkg/EdkUnixPkg.spd
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
+<?xml version="1.0" encoding="UTF-8"?>\r
 <!--\r
-Copyright (c) 2006, Intel Corporation\r
+Copyright (c) 2006 - 2007, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -30,10 +30,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <RePackage>false</RePackage>\r
   </PackageDefinitions>\r
   <LibraryClassDeclarations>\r
-    <LibraryClass Name="EdkGenericBdsLib">\r
-      <IncludeHeader>Include/Library/EdkGenericBdsLib.h</IncludeHeader>\r
-      <HelpText/>\r
-    </LibraryClass>\r
     <LibraryClass Name="UnixLib">\r
       <IncludeHeader>Include/Library/UnixLib.h</IncludeHeader>\r
       <HelpText/>\r
@@ -44,28 +40,24 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
       <IncludeHeader>Include/Common/UnixInclude.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r
-    <IndustryStdHeader Name="EdkGenericBdsLib">\r
-      <IncludeHeader>Include/library/EdkGenericBdsLib.h</IncludeHeader>\r
-      <HelpText/>\r
-    </IndustryStdHeader>\r
     <IndustryStdHeader Name="UnixLib">\r
-      <IncludeHeader>Include/library/UnixLib.h</IncludeHeader>\r
+      <IncludeHeader>Include/Library/UnixLib.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r
-    <IndustryStdHeader Name="NtAutoscan">\r
-      <IncludeHeader>Include/Ppi/NtAutoscan.h</IncludeHeader>\r
+    <IndustryStdHeader Name="UnixAutoScan">\r
+      <IncludeHeader>Include/Ppi/UnixAutoScan.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r
-    <IndustryStdHeader Name="NtFwh">\r
-      <IncludeHeader>Include/Ppi/NtFwh.h</IncludeHeader>\r
+    <IndustryStdHeader Name="UnixFwh">\r
+      <IncludeHeader>Include/Ppi/UnixFwh.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r
-    <IndustryStdHeader Name="NtPeiLoadFile">\r
-      <IncludeHeader>Include/Ppi/NtPeiLoadFile.h</IncludeHeader>\r
+    <IndustryStdHeader Name="UnixPeiLoadFile">\r
+      <IncludeHeader>Include/Ppi/UnixPeiLoadFile.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r
-    <IndustryStdHeader Name="NtThunk">\r
-      <IncludeHeader>Include/Ppi/NtThunk.h</IncludeHeader>\r
+    <IndustryStdHeader Name="UnixThunk">\r
+      <IncludeHeader>Include/Ppi/UnixThunk.h</IncludeHeader>\r
       <HelpText/>\r
     </IndustryStdHeader>\r
     <IndustryStdHeader Name="UnixIo">\r
@@ -108,12 +100,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>Dxe/UnixThunk/Cpu/Cpu.msa</Filename>\r
     <Filename>Dxe/UnixThunk/UnixThunk/UnixThunk.msa</Filename>\r
     <Filename>Library/DxeUnixLib/DxeUnixLib.msa</Filename>\r
-    <Filename>Library/UnixTimerLibNull/UnixTimerLib.msa</Filename>\r
-    <Filename>Library/EdkGenericBdsLib/EdkGenericBdsLib.msa</Filename>\r
     <Filename>Library/EdkUnixPeiPeCoffGetEntryPointLib/EdkUnixPeiPeCoffGetEntryPointLib.msa</Filename>\r
     <Filename>Library/UnixPeCoffLoaderLib/UnixPeCoffLoaderLib.msa</Filename>\r
-    <Filename>Library/UnixOemHookStatusCodeLib/UnixOemHookStatusCodeLib.msa</Filename>\r
-    <Filename>Logo/Logo.msa</Filename>\r
+    <Filename>Library/PeiUnixOemHookStatusCodeLib/PeiUnixOemHookStatusCodeLib.msa</Filename>\r
+    <Filename>Library/DxeUnixOemHookStatusCodeLib/DxeUnixOemHookStatusCodeLib.msa</Filename>\r
     <Filename>Pei/AutoScan/UnixAutoScan.msa</Filename>\r
     <Filename>Pei/BootMode/BootMode.msa</Filename>\r
     <Filename>Pei/FirmwareVolume/UnixFwh.msa</Filename>\r
@@ -130,14 +120,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <IncludePkgHeader ModuleType="DXE_SMM_DRIVER">Include/UnixDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="DXE_SAL_DRIVER">Include/UnixDxe.h</IncludePkgHeader>\r
     <IncludePkgHeader ModuleType="UEFI_DRIVER">Include/UnixDxe.h</IncludePkgHeader>\r
-    <IncludePkgHeader ModuleType="USER_DEFINED">Include/UnixPeim.h</IncludePkgHeader>\r
   </PackageHeaders>\r
   <GuidDeclarations>\r
     <Entry Name="EdkUnixPkgTokenSpace">\r
       <C_Name>gEfiEdkUnixPkgTokenSpaceGuid</C_Name>\r
       <GuidValue>f2b6838c-8985-11db-9d1c-0040d02b1835</GuidValue>\r
       <HelpText>All PCD define in EdkUnixPkg is in this token space scope</HelpText>\r
-    </Entry>  \r
+    </Entry>\r
     <Entry Name="UnixVirtualDisks">\r
       <C_Name>gEfiUnixVirtualDisksGuid</C_Name>\r
       <GuidValue>f2ba331a-8985-11db-a406-0040d02b1835</GuidValue>\r
@@ -337,15 +326,6 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
         such as "My EFI Console".\r
         The item type of this PCD can only be "DYNAMIC".</HelpText>\r
     </PcdEntry>\r
-    <PcdEntry>\r
-      <C_Name>PcdUnixStatusCodeLibUseForPei</C_Name>\r
-      <Token>0x0000100b</Token>\r
-      <TokenSpaceGuidCName>gEfiEdkUnixPkgTokenSpaceGuid</TokenSpaceGuidCName>\r
-      <DatumType>BOOLEAN</DatumType>\r
-      <ValidUsage>FEATURE_FLAG</ValidUsage>\r
-      <DefaultValue>FALSE</DefaultValue>\r
-      <HelpText>Select which type of driver the library links against.</HelpText>\r
-    </PcdEntry>\r
     <PcdEntry>\r
       <C_Name>PcdUnixMemorySizeForSecMain</C_Name>\r
       <Token>0x0000100c</Token>\r