Only include SAL related definitions if the CPU Arch is IPF
authormdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 18 Dec 2006 20:03:44 +0000 (20:03 +0000)
committermdkinney <mdkinney@6f19259b-4bc3-4df7-8a09-765794883524>
Mon, 18 Dec 2006 20:03:44 +0000 (20:03 +0000)
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2109 6f19259b-4bc3-4df7-8a09-765794883524

EdkModulePkg/Core/Pei/PeiMain.h
EdkModulePkg/Include/EdkDxe.h
EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa
EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa

index dc71858..8f7c8e9 100644 (file)
@@ -24,9 +24,9 @@ Revision History
 #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
index 1b295d8..185d842 100644 (file)
@@ -30,7 +30,7 @@ Abstract:
 #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
@@ -52,7 +52,9 @@ Abstract:
 #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
+#endif\r
 #include <Guid/PeiPeCoffLoader.h>\r
 #include <Guid/CapsuleVendor.h>\r
 #include <Guid/CompatibleMemoryTested.h>\r
@@ -81,7 +83,9 @@ Abstract:
 #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
+#endif\r
 #include <Protocol/IsaAcpi.h>\r
 \r
 #if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000))\r
index 8a1f290..1b424a1 100644 (file)
@@ -49,7 +49,7 @@
     <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
index 32aa525..48cbc65 100644 (file)
@@ -40,7 +40,7 @@
     <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
index 35598f2..ba00daf 100644 (file)
@@ -15,7 +15,7 @@ Module Name:
 \r
 --*/\r
 \r
-#include <SalApi.h>\r
+//#include <SalApi.h>\r
 #include <RuntimeLibInternal.h>\r
 \r
 //\r
index 61f5ccf..df6496d 100644 (file)
@@ -40,7 +40,7 @@
     <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
index 619c098..44dfacc 100644 (file)
@@ -40,7 +40,7 @@
     <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
index f4fbd06..5935bdd 100644 (file)
@@ -68,7 +68,7 @@
     <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