ArmVirtPkg: ArmVirtQemuKernel: make ACPI support AARCH64 only

The reasoning of patch 8e2efec6b206:

  No ARM support for ACPI is planned under any OS we intend to run under
  ArmVirtQemu-ARM, so remove the drivers from the ARM build.

applies equally to ArmVirtQemuKernel, so apply the same change there.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

1 files changed, 10 insertions, 9 deletions

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 379ccaae6a..6bf894a570 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -340,15 +340,6 @@
   OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf

 

   #

-  # ACPI Support

-  #

-  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf

-  OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {

-    <LibraryClasses>

-      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf

-  }

-

-  #

   # PCI support

   #

   ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf

@@ -376,3 +367,13 @@
   MdeModulePkg/Bus/Pci/XhciDxe/XhciDxe.inf

   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf

   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf

+

+[Components.AARCH64]

+  #

+  # ACPI Support

+  #

+  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf

+  OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {

+    <LibraryClasses>

+      NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf

+  }