tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArmVirtPkg/FdtClientDxe: make DT table installation !ACPI dependent 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ArmVirtPkg/ArmVirtPkg.dec
View File

@ -58,13 +58,3 @@
# EFI_VT_100_GUID.
#
gArmVirtTokenSpaceGuid.PcdTerminalTypeGuidBuffer|{0x65, 0x60, 0xA6, 0xDF, 0x19, 0xB4, 0xD3, 0x11, 0x9A, 0x2D, 0x00, 0x90, 0x27, 0x3F, 0xC1, 0x4D}|VOID*|0x00000007
[PcdsFeatureFlag]
#
# Pure ACPI boot
#
# Inhibit installation of the FDT as a configuration table if this feature
# PCD is TRUE. Otherwise, the OS is presented with both a DT and an ACPI
# description of the platform, and it is up to the OS to choose.
#
gArmVirtTokenSpaceGuid.PcdPureAcpiBoot|FALSE|BOOLEAN|0x0000000a

5
ArmVirtPkg/ArmVirtQemu.dsc
View File

@ -34,7 +34,6 @@
# -D FLAG=VALUE
#
DEFINE SECURE_BOOT_ENABLE = FALSE
DEFINE PURE_ACPI_BOOT_ENABLE = FALSE
!include ArmVirtPkg/ArmVirt.dsc.inc
@ -94,10 +93,6 @@
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutGopSupport|TRUE
gEfiMdeModulePkgTokenSpaceGuid.PcdConOutUgaSupport|FALSE
!if $(PURE_ACPI_BOOT_ENABLE) == TRUE
gArmVirtTokenSpaceGuid.PcdPureAcpiBoot|TRUE
!endif
[PcdsFixedAtBuild.common]
gArmPlatformTokenSpaceGuid.PcdCoreCount|1
!if $(ARCH) == AARCH64

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);
}

5
ArmVirtPkg/FdtClientDxe/FdtClientDxe.inf
View File

@ -37,17 +37,16 @@
HobLib
UefiBootServicesTableLib
UefiDriverEntryPoint
UefiLib
[Protocols]
gFdtClientProtocolGuid ## PRODUCES
[Guids]
gEfiAcpi20TableGuid
gEfiEventReadyToBootGuid
gFdtHobGuid
gFdtTableGuid
[FeaturePcd]
gArmVirtTokenSpaceGuid.PcdPureAcpiBoot
[Depex]
TRUE