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 <[email protected]> > --- > > 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 { > <LibraryClasses> > 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 { > <LibraryClasses> > 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 > [email protected] > https://lists.01.org/mailman/listinfo/edk2-devel >
Fixes: 3a2c1548fe2df4b0b067671e2025da6372063218 Reviewed-by: Laszlo Ersek <[email protected]> [[email protected]: move long subj to commit msg body, add short subj] [[email protected]: add Fixes reference] [[email protected]: 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 _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
