ArmVirtPkg: install EdkiiPlatformHasDeviceTree proto in the 32-bit builds

Include XenPlatformHasAcpiDtDxe and PlatformHasAcpiDtDxe in the 32-bit
builds too.

Please see https://bugzilla.tianocore.org/show_bug.cgi?id=524
why it is needed. With this patch my arm uefi VM boots.

Fixes: 3a2c1548fe2df4b0b067671e2025da6372063218
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Nerijus Baliūnas <nerijus@users.sourceforge.net>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
[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]
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index ae96606cdd0da753c4de58d2ff8cb3bd734604f5..10de57a4149e9f9e747e98d62d6e9be1bd07d788 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -370,11 +370,11 @@
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
 \r
-[Components.AARCH64]\r
   #\r
   # ACPI Support\r
   #\r
   ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf\r
+[Components.AARCH64]\r
   MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
   OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {\r
     <LibraryClasses>\r

diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
index b4381132c86463339a3819d5141f6c377059b4c1..ba2e7157cf2c762cee007a472b17d0d01bda8eee 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
+++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
@@ -140,11 +140,11 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf\r
   INF OvmfPkg/SmbiosPlatformDxe/SmbiosPlatformDxe.inf\r
 \r
-!if $(ARCH) == AARCH64\r
   #\r
   # ACPI Support\r
   #\r
   INF ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf\r
+!if $(ARCH) == AARCH64\r
   INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
   INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
   INF OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf\r

diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index 14c6ba7d2236c874c13bbe5dc1236b53c6c9d2cf..93ccb6df37e1fcb8ce249654baff5568cc83733f 100644 (file)
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -361,11 +361,11 @@
   MdeModulePkg/Bus/Usb/UsbBusDxe/UsbBusDxe.inf\r
   MdeModulePkg/Bus/Usb/UsbKbDxe/UsbKbDxe.inf\r
 \r
-[Components.AARCH64]\r
   #\r
   # ACPI Support\r
   #\r
   ArmVirtPkg/PlatformHasAcpiDtDxe/PlatformHasAcpiDtDxe.inf\r
+[Components.AARCH64]\r
   MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf\r
   OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpiPlatformDxe.inf {\r
     <LibraryClasses>\r

diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index 99865a8bab989da7bb38a6b34b004e8259c278cf..f832b3fb64f44b19a62f6891443afaec13b4ab70 100644 (file)
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -212,7 +212,7 @@
   #\r
   # ACPI support\r
   #\r
-!if $(ARCH) == AARCH64\r
   ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf\r
+!if $(ARCH) == AARCH64\r
   ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf\r
 !endif\r

diff --git a/ArmVirtPkg/ArmVirtXen.fdf b/ArmVirtPkg/ArmVirtXen.fdf
index aaae9755cd539730ce1df2f9139297118dc9eacb..b591818f0b422e1677a834cac7a101ec76b90cf1 100644 (file)
--- a/ArmVirtPkg/ArmVirtXen.fdf
+++ b/ArmVirtPkg/ArmVirtXen.fdf
@@ -183,8 +183,8 @@ READ_LOCK_STATUS   = TRUE
   #\r
   # ACPI support\r
   #\r
-!if $(ARCH) == AARCH64\r
   INF ArmVirtPkg/XenPlatformHasAcpiDtDxe/XenPlatformHasAcpiDtDxe.inf\r
+!if $(ARCH) == AARCH64\r
   INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf\r
   INF ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf\r
 \r