[edk2,v2,1/5] ArmVirtPkg: ArmVirtQemuKernel: make ACPI support AARCH64 only

Message ID 1468322342-30611-2-git-send-email-ard.biesheuvel@linaro.org
State Accepted
Commit 9940a8049297d7af5078bb616a17e5e7ac50f7f8
Headers show

Commit Message

Ard Biesheuvel July 12, 2016, 11:18 a.m.
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>

---
 ArmVirtPkg/ArmVirtQemuKernel.dsc | 19 ++++++++++---------
 ArmVirtPkg/ArmVirtQemuKernel.fdf |  2 ++
 2 files changed, 12 insertions(+), 9 deletions(-)

-- 
1.9.1

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

Comments

Laszlo Ersek July 12, 2016, 11:35 a.m. | #1
On 07/12/16 13:18, Ard Biesheuvel wrote:
> 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>

> ---

>  ArmVirtPkg/ArmVirtQemuKernel.dsc | 19 ++++++++++---------

>  ArmVirtPkg/ArmVirtQemuKernel.fdf |  2 ++

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

> 

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

> index 379ccaae6a81..6bf894a5702f 100644

> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc

> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc

> @@ -340,15 +340,6 @@ [Components.common]

>    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 @@ [Components.common]

>    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 1229e6bd43cc..772b0f6ed982 100644

> --- a/ArmVirtPkg/ArmVirtQemuKernel.fdf

> +++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf

> @@ -218,11 +218,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

> 


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

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

Patch

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 379ccaae6a81..6bf894a5702f 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -340,15 +340,6 @@  [Components.common]
   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 @@  [Components.common]
   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 1229e6bd43cc..772b0f6ed982 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.fdf
+++ b/ArmVirtPkg/ArmVirtQemuKernel.fdf
@@ -218,11 +218,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