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 4B0D221A13487 for ; Wed, 3 May 2017 08:02:28 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A820A80042; Wed, 3 May 2017 15:02:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A820A80042 Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx03.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=lersek@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A820A80042 Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-118.phx2.redhat.com [10.3.116.118]) by smtp.corp.redhat.com (Postfix) with ESMTP id D06E15DD63; Wed, 3 May 2017 15:02:26 +0000 (UTC) To: =?UTF-8?Q?Nerijus_Bali=c5=abnas?= References: Cc: edk2-devel@lists.01.org From: Laszlo Ersek Message-ID: Date: Wed, 3 May 2017 17:02:25 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Wed, 03 May 2017 15:02:27 +0000 (UTC) Subject: Re: [PATCH] ArmVirtPkg: include XenPlatformHasAcpiDtDxe and PlatformHasAcpiDtDxe in the 32-bit builds too X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 May 2017 15:02:28 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit On 05/03/17 00:38, Nerijus Baliūnas wrote: > Please see https://bugzilla.tianocore.org/show_bug.cgi?id=524 > why it is needed. With this patch my arm uefi VM boots. > > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Nerijus Baliūnas > --- > > diff -ur edk2.git.orig/ArmVirtPkg/ArmVirtQemu.dsc edk2.git/ArmVirtPkg/ArmVirtQemu.dsc > --- edk2.git.orig/ArmVirtPkg/ArmVirtQemu.dsc 2017-05-02 06:11:47.000000000 +0300 > +++ edk2.git/ArmVirtPkg/ArmVirtQemu.dsc 2017-05-03 00:39:24.086107267 +0300 > @@ -214,6 +214,10 @@ > ################################################################################ > [Components.common] > # > + # ACPI Support > + # > + ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf > + # > # PEI Phase modules > # > ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf > @@ -374,7 +378,6 @@ > # > # ACPI Support > # > - ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf > MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf > OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf { > > diff -ur edk2.git.orig/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc edk2.git/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > --- edk2.git.orig/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc 2017-05-02 06:11:47.000000000 +0300 > +++ edk2.git/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc 2017-05-03 00:42:19.040551110 +0300 > @@ -140,11 +140,11 @@ > INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf > > -!if $(ARCH) == AARCH64 > # > # ACPI Support > # > INF ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf > +!if $(ARCH) == AARCH64 > INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf > INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf > INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf > diff -ur edk2.git.orig/ArmVirtPkg/ArmVirtQemuKernel.dsc edk2.git/ArmVirtPkg/ArmVirtQemuKernel.dsc > --- edk2.git.orig/ArmVirtPkg/ArmVirtQemuKernel.dsc 2017-05-02 06:11:47.000000000 +0300 > +++ edk2.git/ArmVirtPkg/ArmVirtQemuKernel.dsc 2017-05-03 00:43:53.645330894 +0300 > @@ -212,6 +212,10 @@ > ################################################################################ > [Components.common] > # > + # ACPI Support > + # > + ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf > + # > # PEI Phase modules > # > ArmVirtPkg/PrePi/ArmVirtPrePiUniCoreRelocatable.inf { > @@ -365,7 +369,6 @@ > # > # ACPI Support > # > - ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf > MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf > OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf { > > diff -ur edk2.git.orig/ArmVirtPkg/ArmVirtXen.dsc edk2.git/ArmVirtPkg/ArmVirtXen.dsc > --- edk2.git.orig/ArmVirtPkg/ArmVirtXen.dsc 2017-05-02 06:11:47.000000000 +0300 > +++ edk2.git/ArmVirtPkg/ArmVirtXen.dsc 2017-05-03 00:44:30.208632093 +0300 > @@ -212,7 +212,7 @@ > # > # ACPI support > # > -!if $(ARCH) == AARCH64 > ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf > +!if $(ARCH) == AARCH64 > ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf > !endif > diff -ur edk2.git.orig/ArmVirtPkg/ArmVirtXen.fdf edk2.git/ArmVirtPkg/ArmVirtXen.fdf > --- edk2.git.orig/ArmVirtPkg/ArmVirtXen.fdf 2017-05-02 06:11:47.000000000 +0300 > +++ edk2.git/ArmVirtPkg/ArmVirtXen.fdf 2017-05-03 00:45:02.681899518 +0300 > @@ -183,8 +183,8 @@ > # > # ACPI support > # > -!if $(ARCH) == AARCH64 > INF ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf > +!if $(ARCH) == AARCH64 > INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf > INF ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf > > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel > Fixes: 3a2c1548fe2df4b0b067671e2025da6372063218 Reviewed-by: Laszlo Ersek [lersek@redhat.com: move long subj to commit msg body, add short subj] [lersek@redhat.com: add Fixes reference] [lersek@redhat.com: keep ACPI DXE modules grouped in QEMU DSCs] Pushed as commit 01430be55190. Thank you very much for the bug report and for the quick fix! Laszlo