Only include SAL related definitions if the CPU Arch is IPF

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@2109 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkModulePkg/Core/Pei/PeiMain.h b/EdkModulePkg/Core/Pei/PeiMain.h
index dc7185899bbc7be7f3ad755b535614d4068270b9..8f7c8e993b9c1b47144e42715b411855d9d8d6df 100644 (file)
--- a/EdkModulePkg/Core/Pei/PeiMain.h
+++ b/EdkModulePkg/Core/Pei/PeiMain.h
@@ -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

diff --git a/EdkModulePkg/Include/EdkDxe.h b/EdkModulePkg/Include/EdkDxe.h
index 1b295d830b9235bedcac5b154f121bd0c7973a9b..185d8424e18885a9c61a6d396fa27a34a37f6929 100644 (file)
--- a/EdkModulePkg/Include/EdkDxe.h
+++ b/EdkModulePkg/Include/EdkDxe.h
@@ -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

diff --git a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
index 8a1f2901b4f3e2cc8e748eafb2c4f4fe26ca0ff7..1b424a11ad08529d39a6d9a5448ebcad1b589520 100644 (file)
--- a/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
+++ b/EdkModulePkg/Library/EdkFvbServiceLib/EdkFvbServiceLib.msa
@@ -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

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
index 32aa525bc8a3a6c95f46adf62212ed37d9eaedea..48cbc6504f1fb66fcb3ea5f431c2dbc6c821e3f3 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/EdkUefiRuntimeLib.msa
@@ -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

diff --git a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
index 35598f295872f7dc2ff4fbd5ec34bbbcdec8120b..ba00daf0ff97b409a62bfff97bda6b2998266f37 100644 (file)
--- a/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
+++ b/EdkModulePkg/Library/EdkUefiRuntimeLib/Ipf/RuntimeLib.c
@@ -15,7 +15,7 @@ Module Name:
 \r
 --*/\r
 \r
-#include <SalApi.h>\r
+//#include <SalApi.h>\r
 #include <RuntimeLibInternal.h>\r
 \r
 //\r

diff --git a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa
index 61f5ccff7f18ba7b6c385c507126fd94d4fbf125..df6496d0ad0f5713067a5588d71d592d572444fb 100644 (file)
--- a/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa
+++ b/EdkModulePkg/Universal/EmuVariable/RuntimeDxe/EmuVariableIpf.msa
@@ -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

diff --git a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
index 619c0980df891bb81652e9776f765b70d54c9dbb..44dfacc5dabd62b954819d25f279612f24c3dbe6 100644 (file)
--- a/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
+++ b/EdkModulePkg/Universal/Runtime/RuntimeDxe/Runtime.msa
@@ -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

diff --git a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
index f4fbd06588f20d85a321436dd9a9ed9f3a41b7b4..5935bdd8f55687cf34519c056a5bcba741733499 100644 (file)
--- a/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
+++ b/EdkModulePkg/Universal/StatusCode/Dxe/DxeStatusCode.msa
@@ -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