From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 993601A1E02 for ; Thu, 18 Aug 2016 19:01:54 -0700 (PDT) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2ACEFC049D59; Fri, 19 Aug 2016 02:01:54 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-17.phx2.redhat.com [10.3.116.17]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7J21pab029381; Thu, 18 Aug 2016 22:01:52 -0400 To: Vikas C Sajjan , edk2-devel@ml01.01.org, ard.biesheuvel@linaro.org, leif.lindholm@linaro.org References: <1471497459-4476-1-git-send-email-vikas.cha.sajjan@hpe.com> <1471497459-4476-2-git-send-email-vikas.cha.sajjan@hpe.com> Cc: dong.wei@hpe.com From: Laszlo Ersek Message-ID: <15faadeb-18f2-56ec-82f2-8d32a7363541@redhat.com> Date: Fri, 19 Aug 2016 04:01:50 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <1471497459-4476-2-git-send-email-vikas.cha.sajjan@hpe.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Fri, 19 Aug 2016 02:01:54 +0000 (UTC) Subject: Re: [PATCH 1/2] ArmVirtPkg: Move inclusion of AcpiTableDxe.inf to ArmVirt.dsc.inc X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Aug 2016 02:01:54 -0000 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit 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 > --- > 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 { > > 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 { > > 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 >