On 1/12/24 09:25, Chao Li wrote: > Move the FdtSerialPortAddressLib to Ovmfpkg so that other ARCH can > easily use it. > > Build-tested only (with "ArmVirtQemu.dsc"). > > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4584 > > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> > Cc: Leif Lindholm <quic_llind...@quicinc.com> > Cc: Sami Mujawar <sami.muja...@arm.com> > Cc: Gerd Hoffmann <kra...@redhat.com> > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Laszlo Ersek <ler...@redhat.com> > Signed-off-by: Chao Li <lic...@loongson.cn> > --- > ArmVirtPkg/ArmVirt.dsc.inc | 2 +- > .../Include/Library/FdtSerialPortAddressLib.h | 0 > .../Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.c | 0 > .../FdtSerialPortAddressLib/FdtSerialPortAddressLib.inf | 2 +- > OvmfPkg/OvmfPkg.dec | 4 ++++ > 5 files changed, 6 insertions(+), 2 deletions(-) > rename {ArmVirtPkg => OvmfPkg}/Include/Library/FdtSerialPortAddressLib.h > (100%) > rename {ArmVirtPkg => > OvmfPkg}/Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.c (100%) > rename {ArmVirtPkg => > OvmfPkg}/Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.inf (90%) > > diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc > index 9b23ef97ec..2bc6a29eb1 100644 > --- a/ArmVirtPkg/ArmVirt.dsc.inc > +++ b/ArmVirtPkg/ArmVirt.dsc.inc > @@ -122,7 +122,7 @@ > # ARM PL011 UART Driver > PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf > > SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf > - > FdtSerialPortAddressLib|ArmVirtPkg/Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.inf > + > FdtSerialPortAddressLib|OvmfPkg/Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.inf > > > PeCoffExtraActionLib|ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf > > #PeCoffExtraActionLib|MdePkg/Library/BasePeCoffExtraActionLibNull/BasePeCoffExtraActionLibNull.inf > diff --git a/ArmVirtPkg/Include/Library/FdtSerialPortAddressLib.h > b/OvmfPkg/Include/Library/FdtSerialPortAddressLib.h > similarity index 100% > rename from ArmVirtPkg/Include/Library/FdtSerialPortAddressLib.h > rename to OvmfPkg/Include/Library/FdtSerialPortAddressLib.h > diff --git > a/ArmVirtPkg/Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.c > b/OvmfPkg/Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.c > similarity index 100% > rename from > ArmVirtPkg/Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.c > rename to OvmfPkg/Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.c > diff --git > a/ArmVirtPkg/Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.inf > b/OvmfPkg/Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.inf > similarity index 90% > rename from > ArmVirtPkg/Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.inf > rename to OvmfPkg/Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.inf > index ae6d0d374b..e27742e9fa 100644 > --- a/ArmVirtPkg/Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.inf > +++ b/OvmfPkg/Library/FdtSerialPortAddressLib/FdtSerialPortAddressLib.inf > @@ -18,9 +18,9 @@ > FdtSerialPortAddressLib.c > > [Packages] > - ArmVirtPkg/ArmVirtPkg.dec > EmbeddedPkg/EmbeddedPkg.dec > MdePkg/MdePkg.dec > + OvmfPkg/OvmfPkg.dec > > [LibraryClasses] > BaseLib > diff --git a/OvmfPkg/OvmfPkg.dec b/OvmfPkg/OvmfPkg.dec > index 7bc2bf1674..13e69e6648 100644 > --- a/OvmfPkg/OvmfPkg.dec > +++ b/OvmfPkg/OvmfPkg.dec > @@ -29,6 +29,10 @@ > ## @libraryclass Verify blobs read from the VMM > BlobVerifierLib|Include/Library/BlobVerifierLib.h > > + ## @libraryclass FdtSerialPortAddressLib > + # > + FdtSerialPortAddressLib|Include/Library/FdtSerialPortAddressLib.h > + > ## @libraryclass Loads and boots a Linux kernel image > # > LoadLinuxLib|Include/Library/LoadLinuxLib.h
IIUC, the library class is not removed from "ArmVirtPkg.dec"; please do that as well, in the same patch. Otherwise, the patch looks OK to me. Thanks Laszlo -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#113807): https://edk2.groups.io/g/devel/message/113807 Mute This Topic: https://groups.io/mt/103679474/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
