[edk2] ArmVirtPkg: ArmVirtQemu: make ACPI support AARCH64 only

Message ID 1456159214-1301-1-git-send-email-ard.biesheuvel@linaro.org
State Accepted
Commit 8e2efec6b206adc27f8cdfb7a18d94f736dc97e7
Headers show

Commit Message

Ard Biesheuvel Feb. 22, 2016, 4:40 p.m.
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.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

---
 ArmVirtPkg/ArmVirtQemu.dsc | 13 +++++++------
 ArmVirtPkg/ArmVirtQemu.fdf |  2 ++
 2 files changed, 9 insertions(+), 6 deletions(-)

-- 
2.5.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Laszlo Ersek Feb. 22, 2016, 4:54 p.m. | #1
On 02/22/16 17:40, Ard Biesheuvel wrote:
> 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.

> 

> Contributed-under: TianoCore Contribution Agreement 1.0

> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

> ---

>  ArmVirtPkg/ArmVirtQemu.dsc | 13 +++++++------

>  ArmVirtPkg/ArmVirtQemu.fdf |  2 ++

>  2 files changed, 9 insertions(+), 6 deletions(-)

> 

> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc

> index 032f72cb9e17..146db202c60e 100644

> --- a/ArmVirtPkg/ArmVirtQemu.dsc

> +++ b/ArmVirtPkg/ArmVirtQemu.dsc

> @@ -347,12 +347,6 @@ [Components.common]

>    OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf

>  

>    #

> -  # ACPI Support

> -  #

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

> -  OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf

> -

> -  #

>    # PCI support

>    #

>    ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf

> @@ -377,6 +371,13 @@ [Components.common]

>    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

> +

>  [Components.ARM]

>    #

>    # The ARM/Linux kernel has no built in EFI boot stub (yet), so we still need

> diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf

> index b57b56c645dc..ef456539cc62 100644

> --- a/ArmVirtPkg/ArmVirtQemu.fdf

> +++ b/ArmVirtPkg/ArmVirtQemu.fdf

> @@ -202,11 +202,13 @@ [FV.FvMain]

>    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


Yes, according to the FDF spec, "The [FD], [FV], [Capsule] and
[OptionRom] sections cannot specify architectural modifiers" -- and it
is shorter this way too.

Reviewed-by: Laszlo Ersek <lersek@redhat.com>


>  

>    #

>    # PCI support

> 


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index 032f72cb9e17..146db202c60e 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -347,12 +347,6 @@  [Components.common]
   OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf
 
   #
-  # ACPI Support
-  #
-  MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
-  OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf
-
-  #
   # PCI support
   #
   ArmVirtPkg/PciHostBridgeDxe/PciHostBridgeDxe.inf
@@ -377,6 +371,13 @@  [Components.common]
   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
+
 [Components.ARM]
   #
   # The ARM/Linux kernel has no built in EFI boot stub (yet), so we still need
diff --git a/ArmVirtPkg/ArmVirtQemu.fdf b/ArmVirtPkg/ArmVirtQemu.fdf
index b57b56c645dc..ef456539cc62 100644
--- a/ArmVirtPkg/ArmVirtQemu.fdf
+++ b/ArmVirtPkg/ArmVirtQemu.fdf
@@ -202,11 +202,13 @@  [FV.FvMain]
   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