Edk2 commit [1] introduced the <OemMiscLib.h> library class header to ArmPkg; commit [2] introduced the first OemMiscLib instance to ArmPkg; and commit [3] introduced (retroactively) the library class itself to ArmPkg.
Alas, when all these edk2 commits were made, edk2-platforms already had a (Hisilicon-specific) library class called OemMiscLib -- and many of the Hisilicon modules would use both "HisiPkg.dec" and "ArmPkg.dec". Therefore the edk2 OemMiscLib brought about a library class conflict, breaking both edk2-platforms and edk2-non-osi content. In edk2-platforms, we're renaming the original OemMiscLib class to HisiOemMiscLib; in edk2-non-osi, update the lib class references in a number of INF files now. Keep those [LibraryClasses] sections sorted that were sorted to begin with. This patch is necessary for building the D03, D05, D06, HiKey, and HiKey960 platforms in edk2-platforms. [1] 2c7c64fc04a0 ("ArmPkg: Add Library/OemMiscLib.h", 2021-02-08) [2] 0e51d7e445e0 ("ArmPkg: Add Universal/Smbios/OemMiscLibNull", 2021-02-08) [3] d03f71dd8be6 ("ArmPkg: Add missing library headers to ArmPkg.dec", 2021-04-28) Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org> Cc: Leif Lindholm <quic_llind...@quicinc.com> Cc: Wenyi Xie <xiewen...@huawei.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=4564 Signed-off-by: Laszlo Ersek <ler...@redhat.com> --- Silicon/Hisilicon/Hi1610/Library/Hi1610Serdes/Hi1610SerdesLib.inf | 2 +- Silicon/Hisilicon/Hi1610/Library/PlatformSysCtrlLibHi1610/PlatformSysCtrlLibHi1610.inf | 2 +- Silicon/Hisilicon/Hi1616/Library/Hi1616Serdes/Hi1616SerdesLib.inf | 2 +- Silicon/Hisilicon/Hi1616/Library/PlatformSysCtrlLibHi1616/PlatformSysCtrlLibHi1616.inf | 2 +- Silicon/Hisilicon/Hi1620/Library/Hi1620Serdes/Hi1620SerdesLib.inf | 2 +- Silicon/Hisilicon/Hi1620/Library/PlatformSysCtrlLibHi1620/PlatformSysCtrlLibHi1620.inf | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Silicon/Hisilicon/Hi1610/Library/Hi1610Serdes/Hi1610SerdesLib.inf b/Silicon/Hisilicon/Hi1610/Library/Hi1610Serdes/Hi1610SerdesLib.inf index 10ff0db87dd0..a3b1d9d32594 100644 --- a/Silicon/Hisilicon/Hi1610/Library/Hi1610Serdes/Hi1610SerdesLib.inf +++ b/Silicon/Hisilicon/Hi1610/Library/Hi1610Serdes/Hi1610SerdesLib.inf @@ -38,7 +38,7 @@ [LibraryClasses] BaseMemoryLib TimerLib - OemMiscLib + HisiOemMiscLib [BuildOptions] diff --git a/Silicon/Hisilicon/Hi1610/Library/PlatformSysCtrlLibHi1610/PlatformSysCtrlLibHi1610.inf b/Silicon/Hisilicon/Hi1610/Library/PlatformSysCtrlLibHi1610/PlatformSysCtrlLibHi1610.inf index fbf16d62941c..28c3cbfb2d31 100644 --- a/Silicon/Hisilicon/Hi1610/Library/PlatformSysCtrlLibHi1610/PlatformSysCtrlLibHi1610.inf +++ b/Silicon/Hisilicon/Hi1610/Library/PlatformSysCtrlLibHi1610/PlatformSysCtrlLibHi1610.inf @@ -39,7 +39,7 @@ [Packages] [LibraryClasses] ArmLib OemAddressMapLib - OemMiscLib + HisiOemMiscLib IoLib [FixedPcd] diff --git a/Silicon/Hisilicon/Hi1616/Library/Hi1616Serdes/Hi1616SerdesLib.inf b/Silicon/Hisilicon/Hi1616/Library/Hi1616Serdes/Hi1616SerdesLib.inf index 67d4a2b4fb30..c5d825a6c158 100644 --- a/Silicon/Hisilicon/Hi1616/Library/Hi1616Serdes/Hi1616SerdesLib.inf +++ b/Silicon/Hisilicon/Hi1616/Library/Hi1616Serdes/Hi1616SerdesLib.inf @@ -38,7 +38,7 @@ [LibraryClasses] TimerLib IoLib - OemMiscLib + HisiOemMiscLib [BuildOptions] diff --git a/Silicon/Hisilicon/Hi1616/Library/PlatformSysCtrlLibHi1616/PlatformSysCtrlLibHi1616.inf b/Silicon/Hisilicon/Hi1616/Library/PlatformSysCtrlLibHi1616/PlatformSysCtrlLibHi1616.inf index 0343f5949b26..53659034983c 100644 --- a/Silicon/Hisilicon/Hi1616/Library/PlatformSysCtrlLibHi1616/PlatformSysCtrlLibHi1616.inf +++ b/Silicon/Hisilicon/Hi1616/Library/PlatformSysCtrlLibHi1616/PlatformSysCtrlLibHi1616.inf @@ -38,9 +38,9 @@ [Packages] [LibraryClasses] ArmLib + HisiOemMiscLib IoLib OemAddressMapLib - OemMiscLib [FixedPcd] gHisiTokenSpaceGuid.PcdAlgSmmuBaseAddress diff --git a/Silicon/Hisilicon/Hi1620/Library/Hi1620Serdes/Hi1620SerdesLib.inf b/Silicon/Hisilicon/Hi1620/Library/Hi1620Serdes/Hi1620SerdesLib.inf index 60de63ffca04..d78d887a793f 100644 --- a/Silicon/Hisilicon/Hi1620/Library/Hi1620Serdes/Hi1620SerdesLib.inf +++ b/Silicon/Hisilicon/Hi1620/Library/Hi1620Serdes/Hi1620SerdesLib.inf @@ -33,8 +33,8 @@ [LibraryClasses] BaseLib BaseMemoryLib DebugLib + HisiOemMiscLib IoLib - OemMiscLib PlatformSysCtrlLib TimerLib diff --git a/Silicon/Hisilicon/Hi1620/Library/PlatformSysCtrlLibHi1620/PlatformSysCtrlLibHi1620.inf b/Silicon/Hisilicon/Hi1620/Library/PlatformSysCtrlLibHi1620/PlatformSysCtrlLibHi1620.inf index 468fae9d2134..a6c6efa92edd 100644 --- a/Silicon/Hisilicon/Hi1620/Library/PlatformSysCtrlLibHi1620/PlatformSysCtrlLibHi1620.inf +++ b/Silicon/Hisilicon/Hi1620/Library/PlatformSysCtrlLibHi1620/PlatformSysCtrlLibHi1620.inf @@ -33,10 +33,10 @@ [Packages] [LibraryClasses] ArmLib + HisiOemMiscLib IoLib LpcLib OemAddressMapLib - OemMiscLib PcdLib [FixedPcd] -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#109560): https://edk2.groups.io/g/devel/message/109560 Mute This Topic: https://groups.io/mt/101914672/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/9847357/21656/1706620634/xyzzy [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-