Reviewed-By: Daniel Schaefer <daniel.schae...@hpe.com> On 9/28/21 16:31, Abner Chang wrote: > Relocate VirtioFdtDxe to OvmfPkg/Fdt, this driver is leverage by > both ARM and RISC-V archs. > > Signed-off-by: Abner Chang <abner.ch...@hpe.com> > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> > Cc: Leif Lindholm <l...@nuviainc.com> > Cc: Sami Mujawar <sami.muja...@arm.com> > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Jordan Justen <jordan.l.jus...@intel.com> > Cc: Gerd Hoffmann <kra...@redhat.com> > Cc: Daniel Schaefer <daniel.schae...@hpe.com> > Cc: Sunil V L <suni...@ventanamicro.com> > --- > ArmVirtPkg/ArmVirtCloudHv.dsc | 2 +- > ArmVirtPkg/ArmVirtKvmTool.dsc | 2 +- > ArmVirtPkg/ArmVirtQemu.dsc | 2 +- > ArmVirtPkg/ArmVirtQemuKernel.dsc | 2 +- > ArmVirtPkg/ArmVirtCloudHv.fdf | 2 +- > ArmVirtPkg/ArmVirtKvmTool.fdf | 2 +- > ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 2 +- > {ArmVirtPkg => OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.inf | 1 - > {ArmVirtPkg => OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.c | 0 > 9 files changed, 7 insertions(+), 8 deletions(-) > rename {ArmVirtPkg => OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.inf (93%) > rename {ArmVirtPkg => OvmfPkg/Fdt}/VirtioFdtDxe/VirtioFdtDxe.c (100%) > > diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc > index 0f26c10aab..9ad124522f 100644 > --- a/ArmVirtPkg/ArmVirtCloudHv.dsc > +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc > @@ -292,7 +292,7 @@ > # > # Platform Driver > # > - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc > index 0c5da4427e..9d23072d8f 100644 > --- a/ArmVirtPkg/ArmVirtKvmTool.dsc > +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc > @@ -291,7 +291,7 @@ > # Platform Driver > # > ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf > - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc > index 4624b6ec36..6d41c8ac55 100644 > --- a/ArmVirtPkg/ArmVirtQemu.dsc > +++ b/ArmVirtPkg/ArmVirtQemu.dsc > @@ -403,7 +403,7 @@ > # > # Platform Driver > # > - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc > b/ArmVirtPkg/ArmVirtQemuKernel.dsc > index 426e0ff1fd..19544ea898 100644 > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc > @@ -339,7 +339,7 @@ > # > # Platform Driver > # > - ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > + OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > OvmfPkg/VirtioBlkDxe/VirtioBlk.inf > diff --git a/ArmVirtPkg/ArmVirtCloudHv.fdf b/ArmVirtPkg/ArmVirtCloudHv.fdf > index 7ecf5ca88d..81c539590a 100644 > --- a/ArmVirtPkg/ArmVirtCloudHv.fdf > +++ b/ArmVirtPkg/ArmVirtCloudHv.fdf > @@ -105,7 +105,7 @@ READ_LOCK_STATUS = TRUE > > INF MdeModulePkg/Core/Dxe/DxeMain.inf > INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > - INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > + INF OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > > diff --git a/ArmVirtPkg/ArmVirtKvmTool.fdf b/ArmVirtPkg/ArmVirtKvmTool.fdf > index 0535d36b7d..14a5fce43a 100644 > --- a/ArmVirtPkg/ArmVirtKvmTool.fdf > +++ b/ArmVirtPkg/ArmVirtKvmTool.fdf > @@ -119,7 +119,7 @@ READ_LOCK_STATUS = TRUE > > INF MdeModulePkg/Core/Dxe/DxeMain.inf > INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > - INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > + INF OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > INF ArmVirtPkg/KvmtoolPlatformDxe/KvmtoolPlatformDxe.inf > INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > index 279b905edd..f6a538df72 100644 > --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > @@ -40,7 +40,7 @@ READ_LOCK_STATUS = TRUE > > INF MdeModulePkg/Core/Dxe/DxeMain.inf > INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf > - INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > + INF OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > INF EmbeddedPkg/Drivers/FdtClientDxe/FdtClientDxe.inf > INF OvmfPkg/Fdt/HighMemDxe/HighMemDxe.inf > > diff --git a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > similarity index 93% > rename from ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > rename to OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > index 9d5ae7b12f..dece5c806b 100644 > --- a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf > +++ b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.inf > @@ -20,7 +20,6 @@ > VirtioFdtDxe.c > > [Packages] > - ArmVirtPkg/ArmVirtPkg.dec > EmbeddedPkg/EmbeddedPkg.dec > MdePkg/MdePkg.dec > OvmfPkg/OvmfPkg.dec > diff --git a/ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.c > b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c > similarity index 100% > rename from ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.c > rename to OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c >
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#81241): https://edk2.groups.io/g/devel/message/81241 Mute This Topic: https://groups.io/mt/85920591/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-