sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ArmVirtPkg/FdtClientDxe: make DT table installation !ACPI dependent

Browse Source 
Instead of having a build time switch to prevent the FDT configuration
table from being installed, make this behavior dependent on whether we
are passing ACPI tables to the OS. This is done by looking for the
ACPI 2.0 configuration table, and only installing the FDT one if the
ACPI one cannot be found.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Ard Biesheuvel
2017-03-09 16:59:34 +01:00
parent 18f6d4df9e
commit 78c41ff519
4 changed files with 13 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ArmVirtPkg/FdtClientDxe/FdtClientDxe.c
View File

@@ -17,9 +17,11 @@
#include <Library/DebugLib.h>
#include <Library/UefiDriverEntryPoint.h>
#include <Library/UefiBootServicesTableLib.h>
#include <Library/UefiLib.h>
#include <Library/HobLib.h>
#include <libfdt.h>
#include <Guid/Acpi.h>
#include <Guid/EventGroup.h>
#include <Guid/Fdt.h>
#include <Guid/FdtHob.h>
@@ -316,12 +318,16 @@ OnReadyToBoot (
)
{
EFI_STATUS Status;
VOID *Table;
if (!FeaturePcdGet (PcdPureAcpiBoot)) {
//
// Only install the FDT as a configuration table if we want to leave it up
// to the OS to decide whether it prefers ACPI over DT.
//
//
// Only install the FDT as a configuration table if we are not exposing
// ACPI 2.0 (or later) tables. Note that the legacy ACPI table GUID has
// no meaning on ARM since we need at least ACPI 5.0 support, and the
// 64-bit ACPI 2.0 table GUID is mandatory in that case.
//
Status = EfiGetSystemConfigurationTable (&gEfiAcpi20TableGuid, &Table);
if (EFI_ERROR (Status) || Table == NULL) {
Status = gBS->InstallConfigurationTable (&gFdtTableGuid, mDeviceTreeBase);
ASSERT_EFI_ERROR (Status);
}