diff options
| author | Vikas C Sajjan <vikas.cha.sajjan@hpe.com> | 2016-08-19 12:25:54 +0530 |
|---|---|---|
| committer | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2016-08-22 09:04:43 +0200 |
| commit | fde03c8065ea6f695d13407ff4fc32c79c04522d (patch) | |
| tree | 844181a4ddab9c7edf6f93afe996a1f69e26b142 | |
| parent | 35dc964bf1eab3f0725389811d2316b1331d6cee (diff) | |
| download | edk2-fde03c8065ea6f695d13407ff4fc32c79c04522d.tar.gz edk2-fde03c8065ea6f695d13407ff4fc32c79c04522d.tar.bz2 edk2-fde03c8065ea6f695d13407ff4fc32c79c04522d.zip | |
ArmVirtPkg: Move inclusion of AcpiTableDxe.inf to ArmVirt.dsc.inc
Since ArmVirt.dsc.inc is included in all the ArmVirt dsc files,
move inclusion of AcpiTableDxe.inf to ArmVirt.dsc.inc.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Vikas C Sajjan <vikas.cha.sajjan@hpe.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
| -rw-r--r-- | ArmVirtPkg/ArmVirt.dsc.inc | 6 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemu.dsc | 1 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 | ||||
| -rw-r--r-- | ArmVirtPkg/ArmVirtXen.dsc | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index ed18428f47..dcf5e50c7b 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -405,3 +405,9 @@ gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE
gEfiMdePkgTokenSpaceGuid.PcdUefiLibMaxPrintBufferSize|8000
}
+
+[Components.AARCH64]
+ #
+ # ACPI Support
+ #
+ MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 9f88786df8..fa7dad52cb 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -396,7 +396,6 @@ #
# ACPI Support
#
- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {
<LibraryClasses>
NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 6c536d9bbd..fb7b1c3444 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -382,7 +382,6 @@ #
# ACPI Support
#
- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {
<LibraryClasses>
NULL|ArmVirtPkg/Library/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index 4ebead5ba6..191b615785 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -232,6 +232,5 @@ # ACPI support
#
!if $(ARCH) == AARCH64
- MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
!endif
|