From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail05.groups.io (mail05.groups.io [45.79.224.7]) by spool.mail.gandi.net (Postfix) with ESMTPS id 51955740039 for ; Wed, 19 Jun 2024 22:06:53 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=3SAdzmagvSfrCIVZY8qF5KxWhcWJUbZzwpobBl+avlA=; 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:Resent-Date:Resent-From:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Transfer-Encoding; s=20240206; t=1718834813; v=1; b=vcFG2Evr5l7oZOYM/OnfDH0kdwYAurQhQbhQOk6fNqXkV+bB/Md7xqn2tiY2ySycggrMxJGJ CfUWy8bDzbzuSj+10jcH+m2MMdwgTZTqx+XTkaWWsQ2WqaY415OEbdLpgMHc4zdokyFlcVJF3Qy 4B5LrwD80qUfQom2fJDIz5Ux2+qeMPBX0vQQQprGadqbajx56uKSbtzJA54s1NTe9m5aWhYCA/v zLwc9giGyVN1fD3cDUhNwAyTdxpP1gmmYYEvjxJWUGVjtCHEMS8zBpZGA58EyXqKixSqt43Ghb0 pyUR8TkUh/HwdcH85GzNXItH4Poq/Y8ffO26y8Pr9z9KA== X-Received: by 127.0.0.2 with SMTP id FnPmYY7687511xcGa97sK2TB; Wed, 19 Jun 2024 15:06:51 -0700 X-Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.33984.1718834811154306104 for ; Wed, 19 Jun 2024 15:06:51 -0700 X-Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 94347DA7; Wed, 19 Jun 2024 15:07:15 -0700 (PDT) X-Received: from e126645.home (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 384543F64C; Wed, 19 Jun 2024 15:06:48 -0700 (PDT) From: "PierreGondois" To: devel@edk2.groups.io Cc: Pierre Gondois , AbdulLateef Attar , Girish Mahadevan , Jeff Brasen , Jeshua Smith , Leif Lindholm , Meenakshi Aggarwal , Sami Mujawar , Sunil V L , Yeo Reum Yun Subject: [edk2-devel] [staging/dynamictables-reorg PATCH 02/15] DynamicTablesPkg: Acpi: Prepare common libraries to support other archs Date: Thu, 20 Jun 2024 00:06:16 +0200 Message-Id: <20240619220629.1994362-3-pierre.gondois@arm.com> In-Reply-To: <20240619220629.1994362-1-pierre.gondois@arm.com> References: <20240619220629.1994362-1-pierre.gondois@arm.com> MIME-Version: 1.0 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 Resent-Date: Wed, 19 Jun 2024 15:06:51 -0700 Resent-From: pierre.gondois@arm.com Reply-To: devel@edk2.groups.io,pierre.gondois@arm.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: nchX3ELuirpM8GVqEBD8etRNx7686176AA= Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=vcFG2Evr; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=arm.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 45.79.224.7 as permitted sender) smtp.mailfrom=bounce@groups.io Allow other architectures to reuse ACPI common libraries by: - Removing the Arm prefix from the BASE_NAME - Moving Arm specific libraries/packages to ARM/AARCH64 specific sections in the .inf files Also remove the empty .inf sections. Suggested-by: Sunil V L Signed-off-by: Pierre Gondois --- .../Acpi/Common/AcpiDbg2Lib/AcpiDbg2Lib.inf | 15 +++++++-------- .../Acpi/Common/AcpiFadtLib/AcpiFadtLib.inf | 9 +-------- .../Acpi/Common/AcpiMcfgLib/AcpiMcfgLib.inf | 9 +-------- .../Acpi/Common/AcpiPcctLib/AcpiPcctLib.inf | 2 +- .../Acpi/Common/AcpiPpttLib/AcpiPpttLib.inf | 2 +- .../Library/Acpi/Common/AcpiRawLib/AcpiRawLib.inf | 9 +-------- .../Acpi/Common/AcpiSpcrLib/AcpiSpcrLib.inf | 9 +-------- .../Acpi/Common/AcpiSratLib/AcpiSratLib.inf | 2 +- .../AcpiSsdtCpuTopologyLib/SsdtCpuTopologyLib.inf | 6 ++++-- .../Acpi/Common/AcpiSsdtPcieLib/SsdtPcieLib.inf | 2 +- .../AcpiSsdtSerialPortLib/SsdtSerialPortLib.inf | 6 ++++-- 11 files changed, 23 insertions(+), 48 deletions(-) diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/AcpiDbg2Lib.i= nf b/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/AcpiDbg2Lib.inf index f7b7c1c025a6..32dcd20c082b 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/AcpiDbg2Lib.inf +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/AcpiDbg2Lib.inf @@ -8,7 +8,7 @@ =0D [Defines]=0D INF_VERSION =3D 0x00010019=0D - BASE_NAME =3D AcpiDbg2LibArm=0D + BASE_NAME =3D AcpiDbg2Lib=0D FILE_GUID =3D A17BA4F0-3DEB-4FE5-BD27-EC008E541B22=0D VERSION_STRING =3D 1.0=0D MODULE_TYPE =3D DXE_DRIVER=0D @@ -19,16 +19,20 @@ [Defines] [Sources]=0D Dbg2Generator.c=0D =0D +[Packages.ARM, Packages.AARCH64]=0D + ArmPlatformPkg/ArmPlatformPkg.dec=0D +=0D [Packages]=0D MdePkg/MdePkg.dec=0D MdeModulePkg/MdeModulePkg.dec=0D EmbeddedPkg/EmbeddedPkg.dec=0D - ArmPlatformPkg/ArmPlatformPkg.dec=0D DynamicTablesPkg/DynamicTablesPkg.dec=0D =0D +[LibraryClasses.ARM, LibraryClasses.AARCH64]=0D + PL011UartLib=0D +=0D [LibraryClasses]=0D BaseLib=0D - PL011UartLib=0D SsdtSerialPortFixupLib=0D =0D [FixedPcd]=0D @@ -36,8 +40,3 @@ [FixedPcd] gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits=0D gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity=0D gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits=0D -=0D -[Protocols]=0D -=0D -[Guids]=0D -=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/AcpiFadtLib.i= nf b/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/AcpiFadtLib.inf index 8fe34013d420..c9cd850faac0 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/AcpiFadtLib.inf +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/AcpiFadtLib.inf @@ -8,7 +8,7 @@ =0D [Defines]=0D INF_VERSION =3D 0x00010019=0D - BASE_NAME =3D AcpiFadtLibArm=0D + BASE_NAME =3D AcpiFadtLib=0D FILE_GUID =3D 686FE5FE-B944-485F-8B1C-7D60E0056487=0D VERSION_STRING =3D 1.0=0D MODULE_TYPE =3D DXE_DRIVER=0D @@ -27,10 +27,3 @@ [Packages] =0D [LibraryClasses]=0D BaseLib=0D -=0D -[Pcd]=0D -=0D -[Protocols]=0D -=0D -[Guids]=0D -=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/AcpiMcfgLib.i= nf b/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/AcpiMcfgLib.inf index 1c7f085274e6..36c343d3875a 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/AcpiMcfgLib.inf +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/AcpiMcfgLib.inf @@ -8,7 +8,7 @@ =0D [Defines]=0D INF_VERSION =3D 0x00010019=0D - BASE_NAME =3D AcpiMcfgLibArm=0D + BASE_NAME =3D AcpiMcfgLib=0D FILE_GUID =3D 8C9BDCB2-72D4-4F30-A12D-1145C3807FF7=0D VERSION_STRING =3D 1.0=0D MODULE_TYPE =3D DXE_DRIVER=0D @@ -27,10 +27,3 @@ [Packages] =0D [LibraryClasses]=0D BaseLib=0D -=0D -[Pcd]=0D -=0D -[Protocols]=0D -=0D -[Guids]=0D -=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/AcpiPcctLib.i= nf b/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/AcpiPcctLib.inf index da54585c2dd9..666bdcab2225 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/AcpiPcctLib.inf +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/AcpiPcctLib.inf @@ -8,7 +8,7 @@ =0D [Defines]=0D INF_VERSION =3D 0x0001001B=0D - BASE_NAME =3D AcpiPcctLibArm=0D + BASE_NAME =3D AcpiPcctLib=0D FILE_GUID =3D 38FE945C-D6ED-4CD6-8D20-FCEF3260D15A=0D VERSION_STRING =3D 1.0=0D MODULE_TYPE =3D DXE_DRIVER=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/AcpiPpttLib.i= nf b/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/AcpiPpttLib.inf index 2c7d19513d6c..a1c91a6eab74 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/AcpiPpttLib.inf +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/AcpiPpttLib.inf @@ -8,7 +8,7 @@ =0D [Defines]=0D INF_VERSION =3D 0x0001001B=0D - BASE_NAME =3D AcpiPpttLibArm=0D + BASE_NAME =3D AcpiPpttLib=0D FILE_GUID =3D FA102D52-5A92-4F95-A097-1D53F9CF5959=0D VERSION_STRING =3D 1.0=0D MODULE_TYPE =3D DXE_DRIVER=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiRawLib/AcpiRawLib.inf= b/DynamicTablesPkg/Library/Acpi/Common/AcpiRawLib/AcpiRawLib.inf index f2ab1b7111fb..8b461ea05b86 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiRawLib/AcpiRawLib.inf +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiRawLib/AcpiRawLib.inf @@ -8,7 +8,7 @@ =0D [Defines]=0D INF_VERSION =3D 0x00010019=0D - BASE_NAME =3D AcpiRawLibArm=0D + BASE_NAME =3D AcpiRawLib=0D FILE_GUID =3D 20F31568-D687-49BA-B326-CCD9D38EDE16=0D VERSION_STRING =3D 1.0=0D MODULE_TYPE =3D DXE_DRIVER=0D @@ -27,10 +27,3 @@ [Packages] =0D [LibraryClasses]=0D BaseLib=0D -=0D -[Pcd]=0D -=0D -[Protocols]=0D -=0D -[Guids]=0D -=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/AcpiSpcrLib.i= nf b/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/AcpiSpcrLib.inf index e11f878ec83e..80a61022da48 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/AcpiSpcrLib.inf +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/AcpiSpcrLib.inf @@ -8,7 +8,7 @@ =0D [Defines]=0D INF_VERSION =3D 0x00010019=0D - BASE_NAME =3D AcpiSpcrLibArm=0D + BASE_NAME =3D AcpiSpcrLib=0D FILE_GUID =3D 55088136-7B78-4974-B1EE-F630150D0DE7=0D VERSION_STRING =3D 1.0=0D MODULE_TYPE =3D DXE_DRIVER=0D @@ -28,10 +28,3 @@ [Packages] [LibraryClasses]=0D BaseLib=0D SsdtSerialPortFixupLib=0D -=0D -[Pcd]=0D -=0D -[Protocols]=0D -=0D -[Guids]=0D -=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/AcpiSratLib.i= nf b/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/AcpiSratLib.inf index 5891dc4d1c7c..2f23f4e668e5 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/AcpiSratLib.inf +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/AcpiSratLib.inf @@ -8,7 +8,7 @@ =0D [Defines]=0D INF_VERSION =3D 0x0001001B=0D - BASE_NAME =3D AcpiSratLibArm=0D + BASE_NAME =3D AcpiSratLib=0D FILE_GUID =3D 2CE21E0A-A39C-4B26-BC0E-526178036ACD=0D VERSION_STRING =3D 1.0=0D MODULE_TYPE =3D DXE_DRIVER=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/Ss= dtCpuTopologyLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopo= logyLib/SsdtCpuTopologyLib.inf index 3e2d15474980..2d38fb30fb09 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTo= pologyLib.inf +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTo= pologyLib.inf @@ -8,7 +8,7 @@ =0D [Defines]=0D INF_VERSION =3D 0x0001001B=0D - BASE_NAME =3D SsdtCpuTopologyLibArm=0D + BASE_NAME =3D SsdtCpuTopologyLib=0D FILE_GUID =3D F2835EB6-4B05-48D4-A475-147DA0F3755C=0D VERSION_STRING =3D 1.0=0D MODULE_TYPE =3D DXE_DRIVER=0D @@ -20,11 +20,13 @@ [Sources] SsdtCpuTopologyGenerator.c=0D SsdtCpuTopologyGenerator.h=0D =0D +[Packages.ARM, Packages.AARCH64]=0D + ArmPlatformPkg/ArmPlatformPkg.dec=0D +=0D [Packages]=0D MdePkg/MdePkg.dec=0D MdeModulePkg/MdeModulePkg.dec=0D EmbeddedPkg/EmbeddedPkg.dec=0D - ArmPlatformPkg/ArmPlatformPkg.dec=0D DynamicTablesPkg/DynamicTablesPkg.dec=0D =0D [LibraryClasses]=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieL= ib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieLib.i= nf index c2a1acb57066..440b0d721214 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieLib.inf +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieLib.inf @@ -8,7 +8,7 @@ =0D [Defines]=0D INF_VERSION =3D 0x0001001B=0D - BASE_NAME =3D SsdtPcieLibArm=0D + BASE_NAME =3D SsdtPcieLib=0D FILE_GUID =3D E431D7FD-26BF-4E3D-9064-5B13B0439057=0D VERSION_STRING =3D 1.0=0D MODULE_TYPE =3D DXE_DRIVER=0D diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/Ssd= tSerialPortLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPor= tLib/SsdtSerialPortLib.inf index 36e61ea9b132..24d7db5645c1 100644 --- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerial= PortLib.inf +++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerial= PortLib.inf @@ -8,7 +8,7 @@ =0D [Defines]=0D INF_VERSION =3D 0x0001001B=0D - BASE_NAME =3D SsdtSerialPortLibArm=0D + BASE_NAME =3D SsdtSerialPortLib=0D FILE_GUID =3D D1F92325-2DFB-435C-9B4C-A6B864F19230=0D VERSION_STRING =3D 1.0=0D MODULE_TYPE =3D DXE_DRIVER=0D @@ -19,11 +19,13 @@ [Defines] [Sources]=0D SsdtSerialPortGenerator.c=0D =0D +[Packages.ARM, Packages.AARCH64]=0D + ArmPlatformPkg/ArmPlatformPkg.dec=0D +=0D [Packages]=0D MdePkg/MdePkg.dec=0D MdeModulePkg/MdeModulePkg.dec=0D EmbeddedPkg/EmbeddedPkg.dec=0D - ArmPlatformPkg/ArmPlatformPkg.dec=0D DynamicTablesPkg/DynamicTablesPkg.dec=0D =0D [LibraryClasses]=0D --=20 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#119634): https://edk2.groups.io/g/devel/message/119634 Mute This Topic: https://groups.io/mt/106770153/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=-=-=-=-=-=-=-=-=-=-=-