2) Fix incorrect judgment for ACPI table in legacy region.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5177
6f19259b-4bc3-4df7-8a09-
765794883524
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseHardSerial|TRUE\r
\r
[Components.common]\r
gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdStatusCodeUseHardSerial|TRUE\r
\r
[Components.common]\r
- DuetPkg/DxeIpl/DxeIpl.inf\r
+ DuetPkg/DxeIpl/DxeIpl.inf {\r
+ <LibraryClasses>\r
+ DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf\r
+ }\r
\r
MdeModulePkg/Core/Dxe/DxeMain.inf\r
MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
\r
MdeModulePkg/Core/Dxe/DxeMain.inf\r
MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf\r
VOID *MemoryDescriptor;\r
VOID *NvStorageBase;\r
CHAR8 PrintBuffer[256];\r
VOID *MemoryDescriptor;\r
VOID *NvStorageBase;\r
CHAR8 PrintBuffer[256];\r
PrintString("Enter DxeIpl ...\n");\r
/*\r
ClearScreen();\r
PrintString("Enter DxeIpl ...\n");\r
/*\r
ClearScreen();\r
PrintString("\n\n\n\n\n\n\n\n\n\n");\r
PrintString(" WELCOME TO EFI WORLD!\n");\r
\r
PrintString("\n\n\n\n\n\n\n\n\n\n");\r
PrintString(" WELCOME TO EFI WORLD!\n");\r
\r
EnterDxeMain (StackTop, Handoff->DxeCoreEntryPoint, gHob, PageTableBase);\r
\r
//\r
EnterDxeMain (StackTop, Handoff->DxeCoreEntryPoint, gHob, PageTableBase);\r
\r
//\r
+EFI_STATUS\r
+EFIAPI\r
+_ModuleEntryPoint (\r
+ IN EFILDRHANDOFF *Handoff\r
+ )\r
+{\r
+ DxeInit(Handoff);\r
+ return EFI_SUCCESS;\r
+}\r
VERSION_STRING = 1.0\r
EDK_RELEASE_VERSION = 0x00020000\r
EFI_SPECIFICATION_VERSION = 0x00020000\r
VERSION_STRING = 1.0\r
EDK_RELEASE_VERSION = 0x00020000\r
EFI_SPECIFICATION_VERSION = 0x00020000\r
- ENTRY_POINT = DxeInit\r
\r
[Packages]\r
MdePkg/MdePkg.dec\r
\r
[Packages]\r
MdePkg/MdePkg.dec\r
BaseMemoryLib\r
PrintLib\r
ReportStatusCodeLib\r
BaseMemoryLib\r
PrintLib\r
ReportStatusCodeLib\r
\r
[Sources.common]\r
DxeIpl.h\r
\r
[Sources.common]\r
DxeIpl.h\r
\r
#include "DxeIpl.h"\r
#include "HobGeneration.h"\r
\r
#include "DxeIpl.h"\r
#include "HobGeneration.h"\r
\r
#define ACPI_RSD_PTR 0x2052545020445352LL\r
#define MPS_PTR EFI_SIGNATURE_32('_','M','P','_')\r
\r
#define ACPI_RSD_PTR 0x2052545020445352LL\r
#define MPS_PTR EFI_SIGNATURE_32('_','M','P','_')\r
//\r
// Check ACPI2.0 table\r
//\r
//\r
// Check ACPI2.0 table\r
//\r
- if (Hob->Acpi20.Table > 0) {\r
+ if ((int)Hob->Acpi20.Table != -1) {\r
Rsdp = (RSDP_TABLE *)(UINTN)Hob->Acpi20.Table;\r
Rsdt = (RSDT_TABLE *)(UINTN)Rsdp->RsdtAddress;\r
Xsdt = NULL;\r
Rsdp = (RSDP_TABLE *)(UINTN)Hob->Acpi20.Table;\r
Rsdt = (RSDT_TABLE *)(UINTN)Rsdp->RsdtAddress;\r
Xsdt = NULL;\r
//\r
// Check ACPI1.0 table\r
//\r
//\r
// Check ACPI1.0 table\r
//\r
- if ((AcpiTable == NULL) && (Hob->Acpi.Table > 0)) {\r
+ if ((AcpiTable == NULL) && ((int)Hob->Acpi.Table != -1)) {\r
Rsdp = (RSDP_TABLE *)(UINTN)Hob->Acpi.Table;\r
Rsdt = (RSDT_TABLE *)(UINTN)Rsdp->RsdtAddress;\r
//\r
Rsdp = (RSDP_TABLE *)(UINTN)Hob->Acpi.Table;\r
Rsdt = (RSDT_TABLE *)(UINTN)Rsdp->RsdtAddress;\r
//\r
IN HOB_TEMPLATE *Hob\r
)\r
{\r
IN HOB_TEMPLATE *Hob\r
)\r
{\r
+ CHAR8 PrintBuffer[256];\r
+\r
Hob->Acpi.Table = (EFI_PHYSICAL_ADDRESS)(UINTN)FindAcpiRsdPtr ();\r
Hob->Acpi.Table = (EFI_PHYSICAL_ADDRESS)(UINTN)FindAcpiRsdPtr ();\r
+ AsciiSPrint (PrintBuffer, 256, "\nAcpiTable=0x%x ", (UINT32)(UINTN)Hob->Acpi.Table);\r
+ PrintString (PrintBuffer);\r
Hob->Acpi20.Table = (EFI_PHYSICAL_ADDRESS)(UINTN)FindAcpiRsdPtr ();\r
Hob->Smbios.Table = (EFI_PHYSICAL_ADDRESS)(UINTN)FindSMBIOSPtr ();\r
Hob->Acpi20.Table = (EFI_PHYSICAL_ADDRESS)(UINTN)FindAcpiRsdPtr ();\r
Hob->Smbios.Table = (EFI_PHYSICAL_ADDRESS)(UINTN)FindSMBIOSPtr ();\r
+ AsciiSPrint (PrintBuffer, 256, "SMBIOS Table=0x%x ", (UINT32)(UINTN)Hob->Smbios.Table);\r
+ PrintString (PrintBuffer);\r
Hob->Mps.Table = (EFI_PHYSICAL_ADDRESS)(UINTN)FindMPSPtr ();\r
Hob->Mps.Table = (EFI_PHYSICAL_ADDRESS)(UINTN)FindMPSPtr ();\r
+ AsciiSPrint (PrintBuffer, 256, "MPS Table=0x%x\n", (UINT32)(UINTN)Hob->Mps.Table);\r
+ PrintString (PrintBuffer);\r
\r
PrepareMcfgTable (Hob);\r
\r
\r
PrepareMcfgTable (Hob);\r
\r