diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-07-12 13:08:11 +0200 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-07-12 15:19:42 +0200 |
| commit | 9940a8049297d7af5078bb616a17e5e7ac50f7f8 (patch) | |
| tree | edfa68134a7a286f5209aac03ebafc6d0343111e /ArmVirtPkg | |
| parent | cb9f629e882251b7456176ee555f1b6b0c097d20 (diff) | |
| download | edk2-platforms-9940a8049297d7af5078bb616a17e5e7ac50f7f8.tar.xz | |
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>
Diffstat (limited to 'ArmVirtPkg')
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemuKernel.dsc | 19 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemuKernel.fdf | 2 |
2 files changed, 12 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
+ }
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.fdf b/ArmVirtPkg/ArmVirtQemuKernel.fdf index 1229e6bd43..772b0f6ed9 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.fdf +++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf @@ -218,11 +218,13 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf
INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
+!if $(ARCH) == AARCH64
#
# ACPI Support
#
INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
+!endif
#
# PCI support
|