On 08/18/16 07:17, Vikas C Sajjan wrote:
> 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 <[email protected]>
> ---
> ArmVirtPkg/ArmVirt.dsc.inc | 6 ++++++
> ArmVirtPkg/ArmVirtQemu.dsc | 1 -
> ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 -
> ArmVirtPkg/ArmVirtXen.dsc | 1 -
> 4 files changed, 6 insertions(+), 3 deletions(-)
>
> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
> index ed18428..9e215c2 100644
> --- a/ArmVirtPkg/ArmVirt.dsc.inc
> +++ b/ArmVirtPkg/ArmVirt.dsc.inc
> @@ -382,6 +382,12 @@
> MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf
> MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf
>
> +[Components.AARCH64]
> + #
> + # ACPI Support
> + #
> + MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
> +
> #
> # UEFI application (Shell Embedded Boot Loader)
> #
I don't think this is right; this way, Shell.inf gets restricted to
[Components.AARCH64] as well, and I think it will break the ARM build. I
think [Components.AARCH64] (with AcpiTableDxe.inf) should be added at
the very end of the file.
Thanks
Laszlo
> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> index 9f88786..fa7dad5 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 6c536d9..fb7b1c3 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 4ebead5..191b615 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
>
_______________________________________________
edk2-devel mailing list
[email protected]
https://lists.01.org/mailman/listinfo/edk2-devel
