Apply david's patch.

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

11 files changed, 28 insertions, 24 deletions

diff --git a/DuetPkg/CpuIoDxe/CpuIo.inf b/DuetPkg/CpuIoDxe/CpuIo.inf
index 9deda69ce0..9450ae1b0c 100644
--- a/DuetPkg/CpuIoDxe/CpuIo.inf
+++ b/DuetPkg/CpuIoDxe/CpuIo.inf
@@ -47,10 +47,12 @@
   CpuIoAccess.h

 

 [Sources.IA32]

-  IA32\CpuIoAccess.asm

-

+  Ia32/CpuIoAccess.asm  | MSFT

+  Ia32/CpuIoAccessGNU.c | GCC

+  

 [Sources.X64]

-  X64\CpuIoAccess.asm

+  X64/CpuIoAccess.asm

 

 [Protocols]

-  gEfiCpuIoProtocolGuid
\ No newline at end of file
+  gEfiCpuIoProtocolGuid

+  
\ No newline at end of file
diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.c b/DuetPkg/DataHubGenDxe/DataHubGen.c
index 5d38505e13..4ff92c4d1f 100644
--- a/DuetPkg/DataHubGenDxe/DataHubGen.c
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.c
@@ -338,7 +338,7 @@ DataHubGenEntrypoint (
   Status = gBS->LocateProtocol (

                   &gEfiDataHubProtocolGuid,

                   NULL,

-                  &gDataHub

+                  (VOID**)&gDataHub

                   );

   if (EFI_ERROR (Status)) {

     return Status;

@@ -354,7 +354,7 @@ DataHubGenEntrypoint (
   Status = gBS->LocateProtocol (

                   &gEfiHiiProtocolGuid,

                   NULL,

-                  &gHii

+                  (VOID**)&gHii

                   );

 #endif

   if (EFI_ERROR (Status)) {

diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.h b/DuetPkg/DataHubGenDxe/DataHubGen.h
index 593b955eaf..d45f212a7a 100644
--- a/DuetPkg/DataHubGenDxe/DataHubGen.h
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.h
@@ -60,7 +60,7 @@ Abstract:
 

 SMBIOS_STRUCTURE_POINTER

 GetSmbiosTableFromType (

-  IN VOID                  *Smbios,

+  IN SMBIOS_TABLE_ENTRY_POINT  *Smbios,

   IN UINT8                 Type,

   IN UINTN                 Index

   );

diff --git a/DuetPkg/DxeIpl/Debug.h b/DuetPkg/DxeIpl/Debug.h
index 1bd42179fc..6f8e2413c8 100644
--- a/DuetPkg/DxeIpl/Debug.h
+++ b/DuetPkg/DxeIpl/Debug.h
@@ -38,7 +38,7 @@ PrintValue64 (
 

 VOID 

 PrintString (

-  UINT8 *String

+  CHAR8 *String

   );

 

 VOID 

diff --git a/DuetPkg/DxeIpl/DxeIpl.h b/DuetPkg/DxeIpl/DxeIpl.h
index 5606a18f04..8fe11488c7 100644
--- a/DuetPkg/DxeIpl/DxeIpl.h
+++ b/DuetPkg/DxeIpl/DxeIpl.h
@@ -32,4 +32,5 @@
 #include <VariableFormat.h>

 #include <CpuIA32.h>

 

-#endif // _DUET_DXEIPL_H_
\ No newline at end of file
+#endif // _DUET_DXEIPL_H_

+

diff --git a/DuetPkg/DxeIpl/DxeIpl.inf b/DuetPkg/DxeIpl/DxeIpl.inf
index bea8730a2e..3bdded832b 100644
--- a/DuetPkg/DxeIpl/DxeIpl.inf
+++ b/DuetPkg/DxeIpl/DxeIpl.inf
@@ -55,16 +55,16 @@
   Debug.h

   

 [Sources.x64]

-  X64\CpuIoAccess.asm

-  X64\EnterDxeCore.asm

-  X64\Paging.c

-  X64\VirtualMemory.h

+  X64/CpuIoAccess.asm

+  X64/EnterDxeCore.asm

+  X64/Paging.c

+  X64/VirtualMemory.h

 

 [Sources.Ia32]

-  Ia32\CpuIoAccess.asm

-  Ia32\EnterDxeCore.asm

-  Ia32\Paging.c

-  Ia32\VirtualMemory.h

+  Ia32/CpuIoAccess.asm

+  Ia32/EnterDxeCore.asm

+  Ia32/Paging.c

+  Ia32/VirtualMemory.h

 

 #[BuildOptions.common]

   #MSFT:*_*_IA32_DLINK_FLAGS = /out:"$(BIN_DIR)\SecMain.exe" /base:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"$(VCINSTALLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib

@@ -72,3 +72,4 @@
   #MSFT:*_*_IA32_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h

   #MSFT:*_*_IA32_ASM_FLAGS = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi

   #MSFT:*_*_IA32_ASMLINK_FLAGS       = /link /nologo /tiny  

+  #GCC:*_UNIXGCC_IA32_CC_FLAGS                  = -O2 -falign-functions -falign-jumps -falign-loops -freorder-blocks -freorder-blocks-and-partition -falign-labels -fshort-wchar -fno-strict-aliasing -Wall  -Wno-missing-braces -c -include AutoGen.h

diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index bf2fa1a566..624d6763a2 100644
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -547,7 +547,7 @@ Return:
     //

     // Process region above 4GB

     //

-    if (EfiMemoryDescriptor[Index].PhysicalStart >= 0x100000000) {

+    if (EfiMemoryDescriptor[Index].PhysicalStart >= 0x100000000LL) {

       if (EfiMemoryDescriptor[Index].Type == EfiConventionalMemory) {

         if (gHob->MemoryAbove4GB.PhysicalStart == 0) {

           gHob->MemoryAbove4GB.PhysicalStart  = EfiMemoryDescriptor[Index].PhysicalStart;

diff --git a/DuetPkg/DxeIpl/LegacyTable.c b/DuetPkg/DxeIpl/LegacyTable.c
index f6f066ed98..1175d560d8 100644
--- a/DuetPkg/DxeIpl/LegacyTable.c
+++ b/DuetPkg/DxeIpl/LegacyTable.c
@@ -21,7 +21,7 @@ Revision History:
 #include "DxeIpl.h"

 #include "HobGeneration.h"

 

-#define ACPI_RSD_PTR      0x2052545020445352

+#define ACPI_RSD_PTR      0x2052545020445352LL

 #define MPS_PTR           EFI_SIGNATURE_32('_','M','P','_')

 #define SMBIOS_PTR        EFI_SIGNATURE_32('_','S','M','_')

 

diff --git a/DuetPkg/DxeIpl/SerialStatusCode.c b/DuetPkg/DxeIpl/SerialStatusCode.c
index 02cc4d47cd..1892a33b6c 100644
--- a/DuetPkg/DxeIpl/SerialStatusCode.c
+++ b/DuetPkg/DxeIpl/SerialStatusCode.c
@@ -656,7 +656,7 @@ Returns:
 

 VOID

 DebugSerialPrint (

-  IN UINT8    *OutputString

+  IN CHAR8    *OutputString

   )

 /*++

 

diff --git a/DuetPkg/DxeIpl/SerialStatusCode.h b/DuetPkg/DxeIpl/SerialStatusCode.h
index 3a1b7a9e2b..f46aa140c7 100644
--- a/DuetPkg/DxeIpl/SerialStatusCode.h
+++ b/DuetPkg/DxeIpl/SerialStatusCode.h
@@ -67,7 +67,7 @@ extern UINT8   gBreakSet;
 

 VOID

 DebugSerialPrint (

-  IN UINT8    *OutputString

+  IN CHAR8    *OutputString

   );

 

 VOID

diff --git a/DuetPkg/KbcResetDxe/Reset.inf b/DuetPkg/KbcResetDxe/Reset.inf
index b491691962..f03daacdaa 100644
--- a/DuetPkg/KbcResetDxe/Reset.inf
+++ b/DuetPkg/KbcResetDxe/Reset.inf
@@ -42,13 +42,13 @@
   Reset.h

 

 [Sources.ipf]

-  Ipf\IpfReset.c

+  Ipf/IpfReset.c

 

 [Sources.ia32]

-  Ia32\Ia32Reset.c

+  Ia32/Ia32Reset.c

 

 [Sources.x64]

-  x64\x64Reset.c

+  x64/x64Reset.c

 

 [Protocols]

   gEfiResetArchProtocolGuid