From b359fb9115b2bf1b8809d0258cd5bc69846efc84 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel Date: Thu, 31 Mar 2016 13:15:05 +0200 Subject: [PATCH] ArmVirtPkg/ArmVirtQemu: gate FDT config table install with build option This introduces the .DSC define 'PURE_ACPI_BOOT_ENABLE', defaulting to FALSE, which controls the value of the feature PCD 'PcdPureAcpiBoot'. This allows an ArmVirtQemu image to be built that restricts the OS to booting in ACPI mode. This feature is only added to ArmVirtQemu, and not to ArmVirtQemuKernel, the reason being that the latter is mostly intended for development work, where the burden of adding 'acpi=force' if you need it is much more tolerable than when trying to boot an installer on a production KVM guest instance. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Laszlo Ersek --- ArmVirtPkg/ArmVirtQemu.dsc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index fafad7751e..e626df768f 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -34,6 +34,7 @@ # -D FLAG=VALUE # DEFINE SECURE_BOOT_ENABLE = FALSE + DEFINE PURE_ACPI_BOOT_ENABLE = FALSE !include ArmVirtPkg/ArmVirt.dsc.inc @@ -99,6 +100,10 @@ # Activate KVM workaround for now. gArmVirtTokenSpaceGuid.PcdKludgeMapPciMmioAsCached|TRUE +!if $(PURE_ACPI_BOOT_ENABLE) == TRUE + gArmVirtTokenSpaceGuid.PcdPureAcpiBoot|TRUE +!endif + [PcdsFixedAtBuild.common] gArmPlatformTokenSpaceGuid.PcdCoreCount|1 !if $(ARCH) == AARCH64 -- 2.39.2