mirror of https://github.com/acidanthera/audk.git
Apply david's patch.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5091 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
1166d06825
commit
f40bbc08c8
|
@ -47,10 +47,12 @@
|
||||||
CpuIoAccess.h
|
CpuIoAccess.h
|
||||||
|
|
||||||
[Sources.IA32]
|
[Sources.IA32]
|
||||||
IA32\CpuIoAccess.asm
|
Ia32/CpuIoAccess.asm | MSFT
|
||||||
|
Ia32/CpuIoAccessGNU.c | GCC
|
||||||
|
|
||||||
[Sources.X64]
|
[Sources.X64]
|
||||||
X64\CpuIoAccess.asm
|
X64/CpuIoAccess.asm
|
||||||
|
|
||||||
[Protocols]
|
[Protocols]
|
||||||
gEfiCpuIoProtocolGuid
|
gEfiCpuIoProtocolGuid
|
||||||
|
|
|
@ -338,7 +338,7 @@ DataHubGenEntrypoint (
|
||||||
Status = gBS->LocateProtocol (
|
Status = gBS->LocateProtocol (
|
||||||
&gEfiDataHubProtocolGuid,
|
&gEfiDataHubProtocolGuid,
|
||||||
NULL,
|
NULL,
|
||||||
&gDataHub
|
(VOID**)&gDataHub
|
||||||
);
|
);
|
||||||
if (EFI_ERROR (Status)) {
|
if (EFI_ERROR (Status)) {
|
||||||
return Status;
|
return Status;
|
||||||
|
@ -354,7 +354,7 @@ DataHubGenEntrypoint (
|
||||||
Status = gBS->LocateProtocol (
|
Status = gBS->LocateProtocol (
|
||||||
&gEfiHiiProtocolGuid,
|
&gEfiHiiProtocolGuid,
|
||||||
NULL,
|
NULL,
|
||||||
&gHii
|
(VOID**)&gHii
|
||||||
);
|
);
|
||||||
#endif
|
#endif
|
||||||
if (EFI_ERROR (Status)) {
|
if (EFI_ERROR (Status)) {
|
||||||
|
|
|
@ -60,7 +60,7 @@ Abstract:
|
||||||
|
|
||||||
SMBIOS_STRUCTURE_POINTER
|
SMBIOS_STRUCTURE_POINTER
|
||||||
GetSmbiosTableFromType (
|
GetSmbiosTableFromType (
|
||||||
IN VOID *Smbios,
|
IN SMBIOS_TABLE_ENTRY_POINT *Smbios,
|
||||||
IN UINT8 Type,
|
IN UINT8 Type,
|
||||||
IN UINTN Index
|
IN UINTN Index
|
||||||
);
|
);
|
||||||
|
|
|
@ -38,7 +38,7 @@ PrintValue64 (
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
PrintString (
|
PrintString (
|
||||||
UINT8 *String
|
CHAR8 *String
|
||||||
);
|
);
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
|
|
@ -33,3 +33,4 @@
|
||||||
#include <CpuIA32.h>
|
#include <CpuIA32.h>
|
||||||
|
|
||||||
#endif // _DUET_DXEIPL_H_
|
#endif // _DUET_DXEIPL_H_
|
||||||
|
|
||||||
|
|
|
@ -55,16 +55,16 @@
|
||||||
Debug.h
|
Debug.h
|
||||||
|
|
||||||
[Sources.x64]
|
[Sources.x64]
|
||||||
X64\CpuIoAccess.asm
|
X64/CpuIoAccess.asm
|
||||||
X64\EnterDxeCore.asm
|
X64/EnterDxeCore.asm
|
||||||
X64\Paging.c
|
X64/Paging.c
|
||||||
X64\VirtualMemory.h
|
X64/VirtualMemory.h
|
||||||
|
|
||||||
[Sources.Ia32]
|
[Sources.Ia32]
|
||||||
Ia32\CpuIoAccess.asm
|
Ia32/CpuIoAccess.asm
|
||||||
Ia32\EnterDxeCore.asm
|
Ia32/EnterDxeCore.asm
|
||||||
Ia32\Paging.c
|
Ia32/Paging.c
|
||||||
Ia32\VirtualMemory.h
|
Ia32/VirtualMemory.h
|
||||||
|
|
||||||
#[BuildOptions.common]
|
#[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
|
#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_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_ASM_FLAGS = /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi
|
||||||
#MSFT:*_*_IA32_ASMLINK_FLAGS = /link /nologo /tiny
|
#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
|
||||||
|
|
|
@ -547,7 +547,7 @@ Return:
|
||||||
//
|
//
|
||||||
// Process region above 4GB
|
// Process region above 4GB
|
||||||
//
|
//
|
||||||
if (EfiMemoryDescriptor[Index].PhysicalStart >= 0x100000000) {
|
if (EfiMemoryDescriptor[Index].PhysicalStart >= 0x100000000LL) {
|
||||||
if (EfiMemoryDescriptor[Index].Type == EfiConventionalMemory) {
|
if (EfiMemoryDescriptor[Index].Type == EfiConventionalMemory) {
|
||||||
if (gHob->MemoryAbove4GB.PhysicalStart == 0) {
|
if (gHob->MemoryAbove4GB.PhysicalStart == 0) {
|
||||||
gHob->MemoryAbove4GB.PhysicalStart = EfiMemoryDescriptor[Index].PhysicalStart;
|
gHob->MemoryAbove4GB.PhysicalStart = EfiMemoryDescriptor[Index].PhysicalStart;
|
||||||
|
|
|
@ -21,7 +21,7 @@ Revision History:
|
||||||
#include "DxeIpl.h"
|
#include "DxeIpl.h"
|
||||||
#include "HobGeneration.h"
|
#include "HobGeneration.h"
|
||||||
|
|
||||||
#define ACPI_RSD_PTR 0x2052545020445352
|
#define ACPI_RSD_PTR 0x2052545020445352LL
|
||||||
#define MPS_PTR EFI_SIGNATURE_32('_','M','P','_')
|
#define MPS_PTR EFI_SIGNATURE_32('_','M','P','_')
|
||||||
#define SMBIOS_PTR EFI_SIGNATURE_32('_','S','M','_')
|
#define SMBIOS_PTR EFI_SIGNATURE_32('_','S','M','_')
|
||||||
|
|
||||||
|
|
|
@ -656,7 +656,7 @@ Returns:
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
DebugSerialPrint (
|
DebugSerialPrint (
|
||||||
IN UINT8 *OutputString
|
IN CHAR8 *OutputString
|
||||||
)
|
)
|
||||||
/*++
|
/*++
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ extern UINT8 gBreakSet;
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
DebugSerialPrint (
|
DebugSerialPrint (
|
||||||
IN UINT8 *OutputString
|
IN CHAR8 *OutputString
|
||||||
);
|
);
|
||||||
|
|
||||||
VOID
|
VOID
|
||||||
|
|
|
@ -42,13 +42,13 @@
|
||||||
Reset.h
|
Reset.h
|
||||||
|
|
||||||
[Sources.ipf]
|
[Sources.ipf]
|
||||||
Ipf\IpfReset.c
|
Ipf/IpfReset.c
|
||||||
|
|
||||||
[Sources.ia32]
|
[Sources.ia32]
|
||||||
Ia32\Ia32Reset.c
|
Ia32/Ia32Reset.c
|
||||||
|
|
||||||
[Sources.x64]
|
[Sources.x64]
|
||||||
x64\x64Reset.c
|
x64/x64Reset.c
|
||||||
|
|
||||||
[Protocols]
|
[Protocols]
|
||||||
gEfiResetArchProtocolGuid
|
gEfiResetArchProtocolGuid
|
||||||
|
|
Loading…
Reference in New Issue