Fix build issue in linux environment.

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

diff --git a/DuetPkg/BootSector/BootSector.inf b/DuetPkg/BootSector/BootSector.inf
index 166dc01e3a122649a6de5d59ab62d228aa80fc7d..156ed5d0a1c8f25433e679cea71a77148ce81692 100644 (file)
--- a/DuetPkg/BootSector/BootSector.inf
+++ b/DuetPkg/BootSector/BootSector.inf
@@ -7,18 +7,19 @@
   EDK_RELEASE_VERSION            = 0x00020000\r
   EFI_SPECIFICATION_VERSION      = 0x00020000\r
   CUSTOM_MAKEFILE                = Makefile\r
+  \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
   DuetPkg/DuetPkg.dec\r
 \r
 [Sources]\r
-  bootsect.asm\r
-  bs16.asm\r
-  bs32.asm\r
-  Gpt.asm\r
-  Mbr.asm\r
-  Start.asm\r
-  Start16.asm\r
-  Start32.asm\r
-  Efi32.asm\r
+  bootsect.asm | INTEL\r
+  bs16.asm | INTEL\r
+  bs32.asm | INTEL\r
+  Gpt.asm | INTEL\r
+  Mbr.asm | INTEL\r
+  start.asm | INTEL\r
+  start16.asm | INTEL\r
+  start32.asm | INTEL\r
+  efi32.asm | INTEL\r
 \r

diff --git a/DuetPkg/CpuDxe/Cpu.inf b/DuetPkg/CpuDxe/Cpu.inf
index 82c11b86fe9334cfb8124da01164428c65b39d1b..4cea2edcb9fbe9185004a29e5e6b84b1eb3ccf6e 100644 (file)
--- a/DuetPkg/CpuDxe/Cpu.inf
+++ b/DuetPkg/CpuDxe/Cpu.inf
@@ -38,10 +38,10 @@
   UefiBootServicesTableLib\r
 \r
 [Sources.IA32]\r
-  IA32/CpuInterrupt.asm\r
+  Ia32/CpuInterrupt.asm | INTEL\r
 \r
 [Sources.X64]\r
-  X64/CpuInterrupt.asm\r
+  X64/CpuInterrupt.asm | INTEL\r
 \r
 [Sources.common]\r
   Cpu.c\r

diff --git a/DuetPkg/CpuIoDxe/CpuIoAccess.h b/DuetPkg/CpuIoDxe/CpuIoAccess.h
index 3983ec8f7315dc95603b11170c2ed08e44ba6cef..ec596b645f59b3c7219fbc7ae27ab22ab4956621 100644 (file)
--- a/DuetPkg/CpuIoDxe/CpuIoAccess.h
+++ b/DuetPkg/CpuIoDxe/CpuIoAccess.h
@@ -22,10 +22,8 @@ Abstract:
 #define _CPU_IO_ACCESS_H\r
 \r
 \r
-#define IA32API __cdecl\r
-\r
 UINT8\r
-IA32API\r
+EFIAPI\r
 CpuIoRead8 (\r
   IN  UINT16  Port\r
   )\r
@@ -55,7 +53,7 @@ Returns:
    Return read 8 bit value                                                \r
 --*/\r
 UINT16\r
-IA32API\r
+EFIAPI\r
 CpuIoRead16 (\r
   IN  UINT16  Port\r
   )\r
@@ -85,7 +83,7 @@ Returns:
    Return read 16 bit value                                                \r
 --*/\r
 UINT32\r
-IA32API\r
+EFIAPI\r
 CpuIoRead32 (\r
   IN  UINT16  Port\r
   )\r
@@ -115,7 +113,7 @@ Returns:
    Return read 32 bit value                                                \r
 --*/\r
 VOID\r
-IA32API\r
+EFIAPI\r
 CpuIoWrite8 (\r
   IN  UINT16  Port,\r
   IN  UINT32  Data\r
@@ -148,7 +146,7 @@ Returns:
    None                                                \r
 --*/\r
 VOID\r
-IA32API\r
+EFIAPI\r
 CpuIoWrite16 (\r
   IN  UINT16  Port,\r
   IN  UINT32  Data\r
@@ -181,7 +179,7 @@ Returns:
    None                                                \r
 --*/\r
 VOID\r
-IA32API\r
+EFIAPI\r
 CpuIoWrite32 (\r
   IN  UINT16  Port,\r
   IN  UINT32  Data\r

diff --git a/DuetPkg/CpuIoDxe/Ia32/CpuIoAccessGNU.c b/DuetPkg/CpuIoDxe/Ia32/CpuIoAccessGNU.c
index 6c7b198d769fc7537b7957ce6c5240fb41107c08..592eb0fdfb50d76843e8ddbbdc08df1fe4bb9212 100644 (file)
--- a/DuetPkg/CpuIoDxe/Ia32/CpuIoAccessGNU.c
+++ b/DuetPkg/CpuIoDxe/Ia32/CpuIoAccessGNU.c
@@ -45,7 +45,7 @@
 #include "CpuIoAccess.h"\r
 \r
 UINT8\r
-IA32API\r
+EFIAPI\r
 CpuIoRead8 (\r
   IN  UINT16  Port\r
   )\r
@@ -59,7 +59,7 @@ CpuIoRead8 (
 }\r
 \r
 UINT16\r
-IA32API\r
+EFIAPI\r
 CpuIoRead16 (\r
   IN  UINT16  Port\r
   )\r
@@ -73,7 +73,7 @@ CpuIoRead16 (
 }\r
 \r
 UINT32\r
-IA32API\r
+EFIAPI\r
 CpuIoRead32 (\r
   IN  UINT16  Port\r
   )\r
@@ -87,7 +87,7 @@ CpuIoRead32 (
 }\r
 \r
 VOID\r
-IA32API\r
+EFIAPI\r
 CpuIoWrite8 (\r
   IN  UINT16  Port,\r
   IN  UINT32  Data\r
@@ -101,7 +101,7 @@ CpuIoWrite8 (
 }\r
 \r
 VOID\r
-IA32API\r
+EFIAPI\r
 CpuIoWrite16 (\r
   IN  UINT16  Port,\r
   IN  UINT32  Data\r
@@ -115,7 +115,7 @@ CpuIoWrite16 (
 }\r
 \r
 VOID\r
-IA32API\r
+EFIAPI\r
 CpuIoWrite32 (\r
   IN  UINT16  Port,\r
   IN  UINT32  Data\r

diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.h b/DuetPkg/DataHubGenDxe/DataHubGen.h
index 4d1eb61b35a4100553bc474a6a344100ece0f851..a9f52276d36e3953aff5aa09dbb22b5df2e2f142 100644 (file)
--- a/DuetPkg/DataHubGenDxe/DataHubGen.h
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.h
@@ -21,14 +21,14 @@ Abstract:
 #define _DATA_HUB_GEN_H_\r
 \r
 #include <FrameworkDxe.h>\r
-#include <IndustryStandard/Smbios.h>\r
+#include <IndustryStandard/SmBios.h>\r
 \r
 #include <Guid/HobList.h>\r
-#include <Guid/Smbios.h>\r
+#include <Guid/SmBios.h>\r
 #include <Guid/DataHubProducer.h>\r
 #include <Guid/DataHubRecords.h>\r
 \r
-#include <Protocol/Datahub.h>\r
+#include <Protocol/DataHub.h>\r
 #include <Protocol/FrameworkHii.h>\r
 #include <Protocol/HiiDatabase.h>\r
 \r

diff --git a/DuetPkg/DxeIpl/DxeIpl.h b/DuetPkg/DxeIpl/DxeIpl.h
index b849246891b48a5696c55d5f6078f65c583c3acb..4c93071dfe89665a529b1215544bb955c76eed27 100644 (file)
--- a/DuetPkg/DxeIpl/DxeIpl.h
+++ b/DuetPkg/DxeIpl/DxeIpl.h
@@ -14,7 +14,7 @@
 #include <Guid/PeiPeCoffLoader.h>\r
 #include <Guid/MemoryAllocationHob.h>\r
 #include <Guid/Acpi.h>\r
-#include <Guid/Smbios.h>\r
+#include <Guid/SmBios.h>\r
 #include <Guid/Mps.h>\r
 #include <Guid/FlashMapHob.h>\r
 #include <Guid/SystemNvDataGuid.h>\r

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
index c927d13eec7a056c7fb702dedbab2c58e9549222..bf806e3615d4a694de28987f2d39220a624eeeac 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.c
@@ -73,7 +73,7 @@ Returns:
         // According to UEFI Spec, we should make sure Smbios table, \r
         // ACPI table and Mps tables kept in memory of specified type\r
         //\r
-        ConvertSystemTable(TableGuidArray[Index], &Table);\r
+        ConvertSystemTable(TableGuidArray[Index], (VOID**)&Table);\r
         gBS->InstallConfigurationTable (TableGuidArray[Index], (VOID *)Table);\r
       }\r
     }\r
@@ -83,7 +83,7 @@ Returns:
 }\r
 \r
 #define EFI_LDR_MEMORY_DESCRIPTOR_GUID \\r
-  { 0x7701d7e5, 0x7d1d, 0x4432, 0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60 }\r
+  { 0x7701d7e5, 0x7d1d, 0x4432, {0xa4, 0x68, 0x67, 0x3d, 0xab, 0x8a, 0xde, 0x60 }}\r
 \r
 EFI_GUID gEfiLdrMemoryDescriptorGuid = EFI_LDR_MEMORY_DESCRIPTOR_GUID;\r
 \r
@@ -177,7 +177,7 @@ UpdateMemoryMap (
     if (MemoryDescHob.MemDesc[Index].PhysicalStart < 0x100000) {\r
       continue;\r
     }\r
-    if (MemoryDescHob.MemDesc[Index].PhysicalStart >= 0x100000000) {\r
+    if (MemoryDescHob.MemDesc[Index].PhysicalStart >= 0x100000000ULL) {\r
       continue;\r
     }\r
     if ((MemoryDescHob.MemDesc[Index].Type == EfiReservedMemoryType) ||\r
@@ -557,7 +557,7 @@ Returns:
   Status = gBS->HandleProtocol (\r
                   DeviceHandle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  &DevicePath\r
+                  (VOID*)&DevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -655,7 +655,7 @@ GetGopDevicePath (
     // Add all the child handles as possible Console Device\r
     //\r
     for (Index = 0; Index < GopHandleCount; Index++) {\r
-      Status = gBS->HandleProtocol (GopHandleBuffer[Index], &gEfiDevicePathProtocolGuid, &TempDevicePath);\r
+      Status = gBS->HandleProtocol (GopHandleBuffer[Index], &gEfiDevicePathProtocolGuid, (VOID*)&TempDevicePath);\r
       if (EFI_ERROR (Status)) {\r
         continue;\r
       }\r
@@ -717,7 +717,7 @@ Returns:
   Status = gBS->HandleProtocol (\r
                   DeviceHandle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  &DevicePath\r
+                  (VOID*)&DevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -760,7 +760,7 @@ Returns:
   Status = gBS->HandleProtocol (\r
                   DeviceHandle,\r
                   &gEfiDevicePathProtocolGuid,\r
-                  &DevicePath\r
+                  (VOID*)&DevicePath\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -821,7 +821,7 @@ Returns:
   }\r
 \r
   for (Index = 0; Index < HandleCount; Index++) {\r
-    Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiPciIoProtocolGuid, &PciIo);\r
+    Status = gBS->HandleProtocol (HandleBuffer[Index], &gEfiPciIoProtocolGuid, (VOID*)&PciIo);\r
     if (EFI_ERROR (Status)) {\r
       continue;\r
     }\r

diff --git a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
index ce2a0ba2b80ab6354d5d7cbe6351cececd772d74..9d1a3a25d5c8cd214608b318172d74665dd88c1d 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
+++ b/DuetPkg/Library/DuetBdsLib/BdsPlatform.h
@@ -27,7 +27,7 @@ Abstract:
 \r
 #include <IndustryStandard/Pci.h>\r
 #include <IndustryStandard/Acpi.h>\r
-#include <IndustryStandard/Smbios.h>\r
+#include <IndustryStandard/SmBios.h>\r
 #include <IndustryStandard/LegacyBiosMpTable.h>\r
 \r
 #include <Library/DebugLib.h>\r
@@ -48,7 +48,7 @@ Abstract:
 \r
 #include <Guid/Bmp.h>\r
 #include <Guid/Acpi.h>\r
-#include <Guid/Smbios.h>\r
+#include <Guid/SmBios.h>\r
 #include <Guid/Mps.h>\r
 #include <Guid/HobList.h>\r
 #include <Guid/PciExpressBaseAddress.h>\r

diff --git a/DuetPkg/Library/DuetBdsLib/PlatformBds.inf b/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
index 12d507b5d69d87c28cfe0a6520620234b98c4a09..d92211797e19a01cad56a0e6fc39f2760d119ec4 100644 (file)
--- a/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
+++ b/DuetPkg/Library/DuetBdsLib/PlatformBds.inf
@@ -38,7 +38,6 @@
 [Packages]\r
   MdePkg/MdePkg.dec\r
   MdeModulePkg/MdeModulePkg.dec\r
-  Nt32Pkg/Nt32Pkg.dec\r
   DuetPkg/DuetPkg.dec\r
 \r
 [LibraryClasses]\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
index edc479ba9a6855d25736a3fedfca1ac71907454d..568f3ffb6bfb0599056bd378756a58f750897065 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciBus.h
@@ -204,7 +204,7 @@ extern GLOBAL_REMOVE_IF_UNREFERENCED EFI_COMPONENT_NAME2_PROTOCOL  gPciBusCompon
 extern EFI_DRIVER_BINDING_PROTOCOL  gPciBusDriverBinding;\r
 \r
 extern BOOLEAN                     gFullEnumeration;\r
-static UINT64                      gAllOne = 0xFFFFFFFFFFFFFFFF;\r
+static UINT64                      gAllOne = 0xFFFFFFFFFFFFFFFFULL;\r
 static UINT64                      gAllZero   = 0;\r
 \r
 #include "PciIo.h"\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c b/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c
index 8614ee212e21e52ada3cad07ccba89d0c0836200..1654952d0317b5bde2222e13b0ea83293c287b46 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciCommand.c
@@ -21,7 +21,7 @@ Revision History
 \r
 --*/\r
 \r
-#include "Pcibus.h"\r
+#include "PciBus.h"\r
 \r
 \r
 EFI_STATUS \r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciDeviceSupport.c b/DuetPkg/PciBusNoEnumerationDxe/PciDeviceSupport.c
index 822f41afa7437c2de657a23f9156e343f1c89708..a33ce38af7d78680b0909f79baef936551b70166 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciDeviceSupport.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciDeviceSupport.c
@@ -21,7 +21,7 @@ Revision History
 \r
 --*/\r
 \r
-#include "Pcibus.h"\r
+#include "PciBus.h"\r
 \r
 //\r
 // This device structure is serviced as a header.\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.c b/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.c
index 888f37931adc2d5efcd62351f280ab83c2842f96..3556d240ffd30f3df47e4b5260d807f187ce90b7 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciDriverOverride.c
@@ -21,7 +21,7 @@ Revision History
 \r
 --*/\r
 \r
-#include "pcibus.h"\r
+#include "PciBus.h"\r
 \r
 EFI_STATUS\r
 EFIAPI\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.c b/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.c
index b7af4ed96f77d6cad93c9e117ce716f212a1cfdc..f24a83ea99a4b884ddd1b8ccf94323de298cfa05 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.c
@@ -21,7 +21,7 @@ Revision History
 \r
 --*/\r
 \r
-#include "Pcibus.h"\r
+#include "PciBus.h"\r
 \r
 EFI_STATUS\r
 PciEnumerator (\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.h b/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.h
index 23d40839afba3456693a764784d176e13c6a16f5..3146e67b2046062348ae8653eedcceebb29a00d6 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.h
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciEnumerator.h
@@ -44,4 +44,4 @@ Returns:
 \r
 --*/\r
 ;\r
-#endif
\ No newline at end of file
+#endif\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c b/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c
index 01d991df89d7dcdbc04d73de9a8f16358745d1a6..0b6658d61c0d4cd3275c4a2581b524a5c8326e2c 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciEnumeratorSupport.c
@@ -21,7 +21,7 @@ Revision History
 \r
 --*/\r
 \r
-#include "Pcibus.h"\r
+#include "PciBus.h"\r
 \r
 EFI_STATUS \r
 InitializePPB (\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
index e5485dcedc46edd1998946e6b7cf8abe11aa2eb6..1a0937fe7e2949a417bad8957e2ab191c3ef567f 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciIo.c
@@ -21,7 +21,7 @@ Revision History
 \r
 --*/\r
 \r
-#include "Pcibus.h"\r
+#include "PciBus.h"\r
 \r
 //\r
 // PCI I/O Support Function Prototypes\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciIo.h b/DuetPkg/PciBusNoEnumerationDxe/PciIo.h
index 08064fae3ebdf6310b5214364c25c84ccbc867b0..559e74f90aa6d01c33a3de0f6372a5c2fd0610f0 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciIo.h
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciIo.h
@@ -45,4 +45,4 @@ Returns:
 --*/\r
 ;\r
 \r
-#endif
\ No newline at end of file
+#endif\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.h b/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.h
index a82c4ce200186cf386969cbd4abf768a7c5d647d..2a650d20c19131c4d474d80db78e63f00a226142 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.h
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciOptionRomSupport.h
@@ -89,4 +89,4 @@ Returns:
 --*/\r
 ;\r
 \r
-#endif
\ No newline at end of file
+#endif\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.c b/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.c
index 5c2386c4bf17a85f98ec22889bc27fe15f6ce3bb..20bd4a7428e4b30901b3650e083be14ec19a8763 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.c
@@ -21,9 +21,10 @@ Revision History
 \r
 --*/\r
 \r
-#include "Pcibus.h"\r
+#include "PciBus.h"\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 ResetPowerManagementFeature (\r
   IN PCI_IO_DEVICE *PciIoDevice\r
   )\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.h b/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.h
index 3b16fe852494993b2c8d6aeda6fc7cc021645e05..acbdccc6ef7da3a3105d6aab66fb87df935afa56 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.h
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciPowerManagement.h
@@ -45,4 +45,4 @@ Returns:
 --*/\r
 ;\r
 \r
-#endif
\ No newline at end of file
+#endif\r

diff --git a/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c b/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
index ce72176d249a9016dae32b4dd7a285c71ea0a121..15426ecd926eef037ad88769b02b4191361efad2 100644 (file)
--- a/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
+++ b/DuetPkg/PciBusNoEnumerationDxe/PciRomTable.c
@@ -21,7 +21,7 @@ Revision History
 \r
 --*/\r
 \r
-#include "pcibus.h"\r
+#include "PciBus.h"\r
 \r
 typedef struct {\r
   EFI_HANDLE  ImageHandle;\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
index 0cbf0472546577df6ed66bb0f3c896c1fa014ac5..d697390fa9531b3fd39874a19abbf264057c40fa 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/Ia32/PcatIo.c
@@ -479,7 +479,7 @@ CheckForRom (
             Status = gBS->AllocatePool(\r
                             EfiBootServicesData,\r
                             ((UINT32)mPciOptionRomTable.PciOptionRomCount + 1) * sizeof(EFI_PCI_OPTION_ROM_DESCRIPTOR),\r
-                            &TempPciOptionRomDescriptors\r
+                            (VOID*)&TempPciOptionRomDescriptors\r
                             );\r
             if (mPciOptionRomTable.PciOptionRomCount > 0) {\r
               CopyMem(\r

diff --git a/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf b/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
index fa0596db13d98730849afe6c247db1e3b1356236..56bf10f62424c31d7c26ec438b93f4676bf1206a 100644 (file)
--- a/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
+++ b/DuetPkg/PciRootBridgeNoEnumerationDxe/PciRootBridgeNoEnumeration.inf
@@ -52,13 +52,13 @@
   DeviceIo.c\r
 \r
 [Sources.ia32]\r
-  ia32\PcatIo.c\r
+  Ia32/PcatIo.c\r
   \r
 [Sources.x64]\r
-  x64\PcatIo.c\r
+  x64/PcatIo.c\r
 \r
 [Sources.ipf]\r
-  Ipf\PcatIo.c\r
+  Ipf/PcatIo.c\r
 \r
 [Protocols]\r
   gEfiPciRootBridgeIoProtocolGuid\r