git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2109
6f19259b-4bc3-4df7-8a09-
765794883524
#ifndef _PEI_MAIN_H_\r
#define _PEI_MAIN_H_\r
\r
#ifndef _PEI_MAIN_H_\r
#define _PEI_MAIN_H_\r
\r
-#ifdef EFI64\r
-#include "SalApi.h"\r
-#endif\r
+//#ifdef EFI64\r
+//#include "SalApi.h"\r
+//#endif\r
\r
//\r
//Build private HOB to PEI core to transfer old NEM-range data to new NEM-range\r
\r
//\r
//Build private HOB to PEI core to transfer old NEM-range data to new NEM-range\r
#include <Common/FlashMap.h>\r
// BUGBUG: We must include this lib here due to ordering issues\r
//\r
#include <Common/FlashMap.h>\r
// BUGBUG: We must include this lib here due to ordering issues\r
//\r
-#include <Ipf/SalApi.h>\r
+//#include <Ipf/SalApi.h>\r
#include <Library/PeCoffLib.h>\r
\r
\r
#include <Library/PeCoffLib.h>\r
\r
\r
#include <Guid/StatusCode.h>\r
#include <Guid/PciOptionRomTable.h>\r
#include <Guid/PciHotplugDevice.h>\r
#include <Guid/StatusCode.h>\r
#include <Guid/PciOptionRomTable.h>\r
#include <Guid/PciHotplugDevice.h>\r
+#if defined(MDE_CPU_IPF)\r
#include <Guid/ExtendedSalGuid.h>\r
#include <Guid/ExtendedSalGuid.h>\r
#include <Guid/PeiPeCoffLoader.h>\r
#include <Guid/CapsuleVendor.h>\r
#include <Guid/CompatibleMemoryTested.h>\r
#include <Guid/PeiPeCoffLoader.h>\r
#include <Guid/CapsuleVendor.h>\r
#include <Guid/CompatibleMemoryTested.h>\r
#include <Protocol/DebugAssert.h>\r
#include <Protocol/usbatapi.h>\r
#include <Protocol/PciHotPlugRequest.h>\r
#include <Protocol/DebugAssert.h>\r
#include <Protocol/usbatapi.h>\r
#include <Protocol/PciHotPlugRequest.h>\r
+#if defined(MDE_CPU_IPF)\r
#include <Protocol/ExtendedSalBootService.h>\r
#include <Protocol/ExtendedSalBootService.h>\r
#include <Protocol/IsaAcpi.h>\r
\r
#if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000))\r
#include <Protocol/IsaAcpi.h>\r
\r
#if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000))\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>UefiBootServicesTableLib</Keyword>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>UefiBootServicesTableLib</Keyword>\r
</LibraryClass>\r
- <LibraryClass Usage="ALWAYS_CONSUMED">\r
+ <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">\r
<Keyword>EdkDxeSalLib</Keyword>\r
</LibraryClass>\r
</LibraryClassDefinitions>\r
<Keyword>EdkDxeSalLib</Keyword>\r
</LibraryClass>\r
</LibraryClassDefinitions>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>UefiBootServicesTableLib</Keyword>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>UefiBootServicesTableLib</Keyword>\r
</LibraryClass>\r
- <LibraryClass Usage="ALWAYS_CONSUMED">\r
+ <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">\r
<Keyword>EdkDxeSalLib</Keyword>\r
</LibraryClass>\r
</LibraryClassDefinitions>\r
<Keyword>EdkDxeSalLib</Keyword>\r
</LibraryClass>\r
</LibraryClassDefinitions>\r
#include <RuntimeLibInternal.h>\r
\r
//\r
#include <RuntimeLibInternal.h>\r
\r
//\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>UefiDriverEntryPoint</Keyword>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>UefiDriverEntryPoint</Keyword>\r
</LibraryClass>\r
- <LibraryClass Usage="ALWAYS_CONSUMED">\r
+ <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">\r
<Keyword>EdkDxeSalLib</Keyword>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>EdkDxeSalLib</Keyword>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>BaseMemoryLib</Keyword>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>BaseMemoryLib</Keyword>\r
</LibraryClass>\r
- <LibraryClass Usage="ALWAYS_CONSUMED">\r
+ <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">\r
<Keyword>EdkDxeSalLib</Keyword>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>EdkDxeSalLib</Keyword>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>OemHookStatusCodeLib</Keyword>\r
</LibraryClass>\r
<LibraryClass Usage="ALWAYS_CONSUMED">\r
<Keyword>OemHookStatusCodeLib</Keyword>\r
</LibraryClass>\r
- <LibraryClass Usage="ALWAYS_CONSUMED">\r
+ <LibraryClass Usage="ALWAYS_CONSUMED" SupArchList="IPF">\r
<Keyword>EdkDxeSalLib</Keyword>\r
</LibraryClass>\r
</LibraryClassDefinitions>\r
<Keyword>EdkDxeSalLib</Keyword>\r
</LibraryClass>\r
</LibraryClassDefinitions>\r