From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from bluegene.sat.lt (bluegene.sat.lt [88.119.145.12]) by ml01.01.org (Postfix) with SMTP id EA52F21A134B9 for ; Tue, 2 May 2017 15:38:43 -0700 (PDT) Received: (qmail 21719 invoked by uid 500); 2 May 2017 22:38:42 -0000 X-Qmail-Scanner-Diagnostics: from data-214-110.cgates.lt by bluegene.sat.lt (envelope-from , uid 101) with qmail-scanner-2.11st (clamdscan: 0.99.2/23348. esets: 4.0.81 spamassassin: 3.4.1. perlscan: 2.11st. Clear:RC:1(5.20.214.110):. Processed in 3.934515 secs); 02 May 2017 22:38:42 -0000 Received: from data-214-110.cgates.lt (HELO nerijus.sat.lt) (5.20.214.110) by bluegene.sat.lt with SMTP; 2 May 2017 22:38:38 -0000 Received: (qmail 26587 invoked from network); 2 May 2017 22:38:15 -0000 Received: from unknown (HELO localhost) (127.0.0.1) by 127.0.0.1 with SMTP; 2 May 2017 22:38:15 -0000 Date: Wed, 3 May 2017 01:38:15 +0300 From: Nerijus =?UTF-8?Q?Bali=C5=ABnas?= To: edk2-devel@lists.01.org Message-ID: MIME-Version: 1.0 X-Mailer: Mahogany 0.68.0 'Cynthia', compiled for Linux 4.10.8-200.fc25.x86_64 x86_64 Subject: [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: Tue, 02 May 2017 22:38:44 -0000 Content-Type: TEXT/PLAIN; CHARSET=UTF-8 Content-Transfer-Encoding: 8BIT Content-Disposition: INLINE 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