From nobody Sat May 18 14:10:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+109560+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109560+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1697101844; cv=none; d=zohomail.com; s=zohoarc; b=AzabxqDD9Tzrnmz0FRiNiLP9B+KIVCxRbAZEoyV+jc/v9iRfMnVvEm1UzW/x1sZpuTqEuQPNB7WSkktLPyOaTfIamxy08XJPBJCGShEvaSk1GA9smSLAwCyJEZ1b8aH3CNTE/46rhJ+9iIZfNZQ86PiTHNEQ6Fs7YjQSOMBqL9g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697101844; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=7t1IeyRRmSISuFtlwPhwXiDtwogG842outmE+mXmXk4=; b=TSiKfgViImaIUwCRTGqvy+LGiAfM9LuZzVGbBMVxvhnLLwgBP2sxJ/QfR6hyYsLLZq4t07sSN0kSihQvkXSBKgb1yGzWdbdK5e8E5+O3JnoFOloiFRPp508KyhMYkDn/wEoyzv1QjkqMpyPMkmwQk5r7yfr0KvZOrGfiO1hpacE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+109560+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1697101844253480.85328108757267; Thu, 12 Oct 2023 02:10:44 -0700 (PDT) Return-Path: DKIM-Signature: a=rsa-sha256; bh=7t1IeyRRmSISuFtlwPhwXiDtwogG842outmE+mXmXk4=; c=relaxed/simple; d=groups.io; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding:Content-Type; s=20140610; t=1697101843; v=1; b=cmXtnfY+WJ4U9QXrruJU1eXpF+TCG7WwfbWKkOrSIcNap4F6MaAAw7MdUAMFnBjdkpEHkquz YZudmetTA/qPGJ6Lqrh5O9BIZ5dL/GYgg3dcoy2aOkc8ph+5cAppA6cKRuAu30Jl/UjjnHWrwc1 2fn9dMSgYhhZby2osAbLP47A= X-Received: by 127.0.0.2 with SMTP id kCItYY1788612xP7VDpk4BEN; Thu, 12 Oct 2023 02:10:43 -0700 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.7208.1697101843241290404 for ; Thu, 12 Oct 2023 02:10:43 -0700 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-400-XYOcKaXuN0On_9biPn8EfA-1; Thu, 12 Oct 2023 05:10:38 -0400 X-MC-Unique: XYOcKaXuN0On_9biPn8EfA-1 X-Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 114C138145A6; Thu, 12 Oct 2023 09:10:38 +0000 (UTC) X-Received: from lacos-laptop-9.usersys.redhat.com (unknown [10.39.192.186]) by smtp.corp.redhat.com (Postfix) with ESMTP id 325EF2026D4B; Thu, 12 Oct 2023 09:10:37 +0000 (UTC) From: "Laszlo Ersek" To: edk2-devel-groups-io Cc: Ard Biesheuvel , Leif Lindholm , Wenyi Xie Subject: [edk2-devel] [edk2-non-osi PATCH 1/1] Hisilicon: rename OemMiscLib class dependencies to HisiOemMiscLib Date: Thu, 12 Oct 2023 11:10:35 +0200 Message-Id: <20231012091035.108712-2-lersek@redhat.com> In-Reply-To: <20231012091035.108712-1-lersek@redhat.com> References: <687bbaf5-3c2b-6d27-44a5-d19541ce97bd@redhat.com> <20231012091035.108712-1-lersek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: hoO6zd5PqyfQBNICs4vGBVTBx1787277AA= Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1697101845653100004 Content-Type: text/plain; charset="utf-8"; x-default="true" Edk2 commit [1] introduced the 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 Cc: Leif Lindholm Cc: Wenyi Xie Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4564 Signed-off-by: Laszlo Ersek --- Silicon/Hisilicon/Hi1610/Library/Hi1610Serdes/Hi1610SerdesLib.inf = | 2 +- Silicon/Hisilicon/Hi1610/Library/PlatformSysCtrlLibHi1610/PlatformSysCtrlL= ibHi1610.inf | 2 +- Silicon/Hisilicon/Hi1616/Library/Hi1616Serdes/Hi1616SerdesLib.inf = | 2 +- Silicon/Hisilicon/Hi1616/Library/PlatformSysCtrlLibHi1616/PlatformSysCtrlL= ibHi1616.inf | 2 +- Silicon/Hisilicon/Hi1620/Library/Hi1620Serdes/Hi1620SerdesLib.inf = | 2 +- Silicon/Hisilicon/Hi1620/Library/PlatformSysCtrlLibHi1620/PlatformSysCtrlL= ibHi1620.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 =20 - OemMiscLib + HisiOemMiscLib =20 [BuildOptions] =20 diff --git a/Silicon/Hisilicon/Hi1610/Library/PlatformSysCtrlLibHi1610/Plat= formSysCtrlLibHi1610.inf b/Silicon/Hisilicon/Hi1610/Library/PlatformSysCtrl= LibHi1610/PlatformSysCtrlLibHi1610.inf index fbf16d62941c..28c3cbfb2d31 100644 --- a/Silicon/Hisilicon/Hi1610/Library/PlatformSysCtrlLibHi1610/PlatformSys= CtrlLibHi1610.inf +++ b/Silicon/Hisilicon/Hi1610/Library/PlatformSysCtrlLibHi1610/PlatformSys= CtrlLibHi1610.inf @@ -39,7 +39,7 @@ [Packages] [LibraryClasses] ArmLib OemAddressMapLib - OemMiscLib + HisiOemMiscLib IoLib =20 [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 =20 - OemMiscLib + HisiOemMiscLib =20 [BuildOptions] =20 diff --git a/Silicon/Hisilicon/Hi1616/Library/PlatformSysCtrlLibHi1616/Plat= formSysCtrlLibHi1616.inf b/Silicon/Hisilicon/Hi1616/Library/PlatformSysCtrl= LibHi1616/PlatformSysCtrlLibHi1616.inf index 0343f5949b26..53659034983c 100644 --- a/Silicon/Hisilicon/Hi1616/Library/PlatformSysCtrlLibHi1616/PlatformSys= CtrlLibHi1616.inf +++ b/Silicon/Hisilicon/Hi1616/Library/PlatformSysCtrlLibHi1616/PlatformSys= CtrlLibHi1616.inf @@ -38,9 +38,9 @@ [Packages] =20 [LibraryClasses] ArmLib + HisiOemMiscLib IoLib OemAddressMapLib - OemMiscLib =20 [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 =20 diff --git a/Silicon/Hisilicon/Hi1620/Library/PlatformSysCtrlLibHi1620/Plat= formSysCtrlLibHi1620.inf b/Silicon/Hisilicon/Hi1620/Library/PlatformSysCtrl= LibHi1620/PlatformSysCtrlLibHi1620.inf index 468fae9d2134..a6c6efa92edd 100644 --- a/Silicon/Hisilicon/Hi1620/Library/PlatformSysCtrlLibHi1620/PlatformSys= CtrlLibHi1620.inf +++ b/Silicon/Hisilicon/Hi1620/Library/PlatformSysCtrlLibHi1620/PlatformSys= CtrlLibHi1620.inf @@ -33,10 +33,10 @@ [Packages] =20 [LibraryClasses] ArmLib + HisiOemMiscLib IoLib LpcLib OemAddressMapLib - OemMiscLib PcdLib =20 [FixedPcd] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- 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/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/3901457/1787277/102458076= /xyzzy [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-