Apply david's patch.

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

diff --git a/DuetPkg/CpuIoDxe/CpuIo.inf b/DuetPkg/CpuIoDxe/CpuIo.inf
index 9deda69ce0540d44909f74de5931fe9b79d535b1..9450ae1b0c10dcbf64d9f3a9a8b893dcccc5b267 100644 (file)
--- a/DuetPkg/CpuIoDxe/CpuIo.inf
+++ b/DuetPkg/CpuIoDxe/CpuIo.inf
@@ -47,10 +47,12 @@
   CpuIoAccess.h\r
 \r
 [Sources.IA32]\r
-  IA32\CpuIoAccess.asm\r
-\r
+  Ia32/CpuIoAccess.asm  | MSFT\r
+  Ia32/CpuIoAccessGNU.c | GCC\r
+  \r
 [Sources.X64]\r
-  X64\CpuIoAccess.asm\r
+  X64/CpuIoAccess.asm\r
 \r
 [Protocols]\r
-  gEfiCpuIoProtocolGuid
\ No newline at end of file
+  gEfiCpuIoProtocolGuid\r
+  
\ No newline at end of file

diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.c b/DuetPkg/DataHubGenDxe/DataHubGen.c
index 5d38505e13f6ec0162bc245f11833717d751bf7a..4ff92c4d1f1a55ed390a108123cf0a8079f0af7a 100644 (file)
--- a/DuetPkg/DataHubGenDxe/DataHubGen.c
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.c
@@ -338,7 +338,7 @@ DataHubGenEntrypoint (
   Status = gBS->LocateProtocol (\r
                   &gEfiDataHubProtocolGuid,\r
                   NULL,\r
-                  &gDataHub\r
+                  (VOID**)&gDataHub\r
                   );\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
@@ -354,7 +354,7 @@ DataHubGenEntrypoint (
   Status = gBS->LocateProtocol (\r
                   &gEfiHiiProtocolGuid,\r
                   NULL,\r
-                  &gHii\r
+                  (VOID**)&gHii\r
                   );\r
 #endif\r
   if (EFI_ERROR (Status)) {\r

diff --git a/DuetPkg/DataHubGenDxe/DataHubGen.h b/DuetPkg/DataHubGenDxe/DataHubGen.h
index 593b955eafa64f0cb6105796c9a7765ef850e56d..d45f212a7ad80fcb0b2eb5b3a238eff9c4e22b10 100644 (file)
--- a/DuetPkg/DataHubGenDxe/DataHubGen.h
+++ b/DuetPkg/DataHubGenDxe/DataHubGen.h
@@ -60,7 +60,7 @@ Abstract:
 \r
 SMBIOS_STRUCTURE_POINTER\r
 GetSmbiosTableFromType (\r
-  IN VOID                  *Smbios,\r
+  IN SMBIOS_TABLE_ENTRY_POINT  *Smbios,\r
   IN UINT8                 Type,\r
   IN UINTN                 Index\r
   );\r

diff --git a/DuetPkg/DxeIpl/Debug.h b/DuetPkg/DxeIpl/Debug.h
index 1bd42179fc8faee63b359e055b8390f901fd0615..6f8e2413c8ac0c492254422bc0181bc0a52f9664 100644 (file)
--- a/DuetPkg/DxeIpl/Debug.h
+++ b/DuetPkg/DxeIpl/Debug.h
@@ -38,7 +38,7 @@ PrintValue64 (
 \r
 VOID \r
 PrintString (\r
-  UINT8 *String\r
+  CHAR8 *String\r
   );\r
 \r
 VOID \r

diff --git a/DuetPkg/DxeIpl/DxeIpl.h b/DuetPkg/DxeIpl/DxeIpl.h
index 5606a18f049bcbbc47757fd3771753f60af3c240..8fe11488c7463052c66368765768cae6e0ac26df 100644 (file)
--- a/DuetPkg/DxeIpl/DxeIpl.h
+++ b/DuetPkg/DxeIpl/DxeIpl.h
@@ -32,4 +32,5 @@
 #include <VariableFormat.h>\r
 #include <CpuIA32.h>\r
 \r
-#endif // _DUET_DXEIPL_H_
\ No newline at end of file
+#endif // _DUET_DXEIPL_H_\r
+\r

diff --git a/DuetPkg/DxeIpl/DxeIpl.inf b/DuetPkg/DxeIpl/DxeIpl.inf
index bea8730a2e0c7c4285cfd5bdc6fe5f0aece0656a..3bdded832b75642b92366065c8c0d7c752903b6f 100644 (file)
--- a/DuetPkg/DxeIpl/DxeIpl.inf
+++ b/DuetPkg/DxeIpl/DxeIpl.inf
@@ -55,16 +55,16 @@
   Debug.h\r
   \r
 [Sources.x64]\r
-  X64\CpuIoAccess.asm\r
-  X64\EnterDxeCore.asm\r
-  X64\Paging.c\r
-  X64\VirtualMemory.h\r
+  X64/CpuIoAccess.asm\r
+  X64/EnterDxeCore.asm\r
+  X64/Paging.c\r
+  X64/VirtualMemory.h\r
 \r
 [Sources.Ia32]\r
-  Ia32\CpuIoAccess.asm\r
-  Ia32\EnterDxeCore.asm\r
-  Ia32\Paging.c\r
-  Ia32\VirtualMemory.h\r
+  Ia32/CpuIoAccess.asm\r
+  Ia32/EnterDxeCore.asm\r
+  Ia32/Paging.c\r
+  Ia32/VirtualMemory.h\r
 \r
 #[BuildOptions.common]\r
   #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\r
@@ -72,3 +72,4 @@
   #MSFT:*_*_IA32_PP_FLAGS = /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
   #MSFT:*_*_IA32_ASM_FLAGS = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
   #MSFT:*_*_IA32_ASMLINK_FLAGS       = /link /nologo /tiny  \r
+  #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\r

diff --git a/DuetPkg/DxeIpl/HobGeneration.c b/DuetPkg/DxeIpl/HobGeneration.c
index bf2fa1a5669b9a8dc2a03527f29786375019facf..624d6763a20092bb532aaed5dc3701981192cc8d 100644 (file)
--- a/DuetPkg/DxeIpl/HobGeneration.c
+++ b/DuetPkg/DxeIpl/HobGeneration.c
@@ -547,7 +547,7 @@ Return:
     //\r
     // Process region above 4GB\r
     //\r
-    if (EfiMemoryDescriptor[Index].PhysicalStart >= 0x100000000) {\r
+    if (EfiMemoryDescriptor[Index].PhysicalStart >= 0x100000000LL) {\r
       if (EfiMemoryDescriptor[Index].Type == EfiConventionalMemory) {\r
         if (gHob->MemoryAbove4GB.PhysicalStart == 0) {\r
           gHob->MemoryAbove4GB.PhysicalStart  = EfiMemoryDescriptor[Index].PhysicalStart;\r

diff --git a/DuetPkg/DxeIpl/LegacyTable.c b/DuetPkg/DxeIpl/LegacyTable.c
index f6f066ed98a7508658169fdde528a5ee083faaab..1175d560d88405aaa2bea1dc9f758be11356033c 100644 (file)
--- a/DuetPkg/DxeIpl/LegacyTable.c
+++ b/DuetPkg/DxeIpl/LegacyTable.c
@@ -21,7 +21,7 @@ Revision History:
 #include "DxeIpl.h"\r
 #include "HobGeneration.h"\r
 \r
-#define ACPI_RSD_PTR      0x2052545020445352\r
+#define ACPI_RSD_PTR      0x2052545020445352LL\r
 #define MPS_PTR           EFI_SIGNATURE_32('_','M','P','_')\r
 #define SMBIOS_PTR        EFI_SIGNATURE_32('_','S','M','_')\r
 \r

diff --git a/DuetPkg/DxeIpl/SerialStatusCode.c b/DuetPkg/DxeIpl/SerialStatusCode.c
index 02cc4d47cdd0e6b3942483306c378a7a30503124..1892a33b6c01de51f4ee12c5147ad410c5456324 100644 (file)
--- a/DuetPkg/DxeIpl/SerialStatusCode.c
+++ b/DuetPkg/DxeIpl/SerialStatusCode.c
@@ -656,7 +656,7 @@ Returns:
 \r
 VOID\r
 DebugSerialPrint (\r
-  IN UINT8    *OutputString\r
+  IN CHAR8    *OutputString\r
   )\r
 /*++\r
 \r

diff --git a/DuetPkg/DxeIpl/SerialStatusCode.h b/DuetPkg/DxeIpl/SerialStatusCode.h
index 3a1b7a9e2b54303ff2e73eb06cc3654e85bde137..f46aa140c7546374df5a5e30c60dbb41072296ef 100644 (file)
--- a/DuetPkg/DxeIpl/SerialStatusCode.h
+++ b/DuetPkg/DxeIpl/SerialStatusCode.h
@@ -67,7 +67,7 @@ extern UINT8   gBreakSet;
 \r
 VOID\r
 DebugSerialPrint (\r
-  IN UINT8    *OutputString\r
+  IN CHAR8    *OutputString\r
   );\r
 \r
 VOID\r

diff --git a/DuetPkg/KbcResetDxe/Reset.inf b/DuetPkg/KbcResetDxe/Reset.inf
index b491691962b7d7007489466713bd2abd7fc37602..f03daacdaabf70cdf6fd60c6b95f1b54678e931c 100644 (file)
--- a/DuetPkg/KbcResetDxe/Reset.inf
+++ b/DuetPkg/KbcResetDxe/Reset.inf
@@ -42,13 +42,13 @@
   Reset.h\r
 \r
 [Sources.ipf]\r
-  Ipf\IpfReset.c\r
+  Ipf/IpfReset.c\r
 \r
 [Sources.ia32]\r
-  Ia32\Ia32Reset.c\r
+  Ia32/Ia32Reset.c\r
 \r
 [Sources.x64]\r
-  x64\x64Reset.c\r
+  x64/x64Reset.c\r
 \r
 [Protocols]\r
   gEfiResetArchProtocolGuid\r