Only include SAL related definitions if the CPU Arch is IPF

[mirror_edk2.git] / EdkModulePkg / Include / EdkDxe.h

diff --git a/EdkModulePkg/Include/EdkDxe.h b/EdkModulePkg/Include/EdkDxe.h
index 775c52e84c40e33d5546afe1ea1e071739f12f04..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,10 +52,13 @@ 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
+#include <Guid/MemoryStatusCodeRecord.h>\r
 \r
 #include <Ppi/StatusCodeMemory.h>\r
 \r
@@ -67,7 +70,6 @@ Abstract:
 #include <Protocol/GenericMemoryTest.h>\r
 #include <Protocol/DiskInfo.h>\r
 #include <Protocol/FvbExtension.h>\r
-#include <Protocol/SecurityPolicy.h>\r
 #include <Protocol/FaultTolerantWriteLite.h>\r
 #include <Protocol/ConsoleControl.h>\r
 #include <Protocol/OEMBadging.h>\r
@@ -76,20 +78,26 @@ Abstract:
 #include <Protocol/AcpiS3Save.h>\r
 #include <Protocol/Performance.h>\r
 #include <Protocol/PxeDhcp4.h>\r
-#include <Protocol/PxeDhcp4Callback.h>\r
+#include <Protocol/PxeDhcp4CallBack.h>\r
 #include <Protocol/UgaIo.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
+#endif\r
 #include <Protocol/IsaAcpi.h>\r
 \r
 #if ((EDK_RELEASE_VERSION != 0) && (EFI_SPECIFICATION_VERSION < 0x00020000))\r
 //\r
-// Tiano8.5 Module use ScsiPassThru protocol together with the original ScsiIo protocol \r
+// Old EDK modules use Module use ScsiPassThru protocol together with the original ScsiIo protocol \r
 // In UEFI2.0, Module use ScsiPassThruExt Protocol with new UEFI2.0 ScsiIo protocol\r
 //\r
 #include <Protocol/ScsiIo.h>\r
 #endif\r
 \r
+#if (EFI_SPECIFICATION_VERSION >= 0x00020000)\r
+#include <Protocol/Capsule.h>\r
+#endif\r
+\r
 #endif\r