DynamicTablesPkg: Acpi: Prepare common libraries to support other archs

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 <sunilvl@ventanamicro.com>
Signed-off-by: Pierre Gondois <pierre.gondois@arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>

11 files changed, 23 insertions, 48 deletions

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/AcpiDbg2Lib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/AcpiDbg2Lib.inf
index f7b7c1c025..32dcd20c08 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/AcpiDbg2Lib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiDbg2Lib/AcpiDbg2Lib.inf
@@ -8,7 +8,7 @@
 

 [Defines]

   INF_VERSION    = 0x00010019

-  BASE_NAME      = AcpiDbg2LibArm

+  BASE_NAME      = AcpiDbg2Lib

   FILE_GUID      = A17BA4F0-3DEB-4FE5-BD27-EC008E541B22

   VERSION_STRING = 1.0

   MODULE_TYPE    = DXE_DRIVER

@@ -19,16 +19,20 @@
 [Sources]

   Dbg2Generator.c

 

+[Packages.ARM, Packages.AARCH64]

+  ArmPlatformPkg/ArmPlatformPkg.dec

+

 [Packages]

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

   EmbeddedPkg/EmbeddedPkg.dec

-  ArmPlatformPkg/ArmPlatformPkg.dec

   DynamicTablesPkg/DynamicTablesPkg.dec

 

+[LibraryClasses.ARM, LibraryClasses.AARCH64]

+  PL011UartLib

+

 [LibraryClasses]

   BaseLib

-  PL011UartLib

   SsdtSerialPortFixupLib

 

 [FixedPcd]

@@ -36,8 +40,3 @@
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits

   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultParity

   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultStopBits

-

-[Protocols]

-

-[Guids]

-

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/AcpiFadtLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/AcpiFadtLib.inf
index 8fe34013d4..c9cd850faa 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/AcpiFadtLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiFadtLib/AcpiFadtLib.inf
@@ -8,7 +8,7 @@
 

 [Defines]

   INF_VERSION    = 0x00010019

-  BASE_NAME      = AcpiFadtLibArm

+  BASE_NAME      = AcpiFadtLib

   FILE_GUID      = 686FE5FE-B944-485F-8B1C-7D60E0056487

   VERSION_STRING = 1.0

   MODULE_TYPE    = DXE_DRIVER

@@ -27,10 +27,3 @@
 

 [LibraryClasses]

   BaseLib

-

-[Pcd]

-

-[Protocols]

-

-[Guids]

-

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/AcpiMcfgLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/AcpiMcfgLib.inf
index 1c7f085274..36c343d387 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/AcpiMcfgLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiMcfgLib/AcpiMcfgLib.inf
@@ -8,7 +8,7 @@
 

 [Defines]

   INF_VERSION    = 0x00010019

-  BASE_NAME      = AcpiMcfgLibArm

+  BASE_NAME      = AcpiMcfgLib

   FILE_GUID      = 8C9BDCB2-72D4-4F30-A12D-1145C3807FF7

   VERSION_STRING = 1.0

   MODULE_TYPE    = DXE_DRIVER

@@ -27,10 +27,3 @@
 

 [LibraryClasses]

   BaseLib

-

-[Pcd]

-

-[Protocols]

-

-[Guids]

-

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/AcpiPcctLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/AcpiPcctLib.inf
index da54585c2d..666bdcab22 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/AcpiPcctLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiPcctLib/AcpiPcctLib.inf
@@ -8,7 +8,7 @@
 

 [Defines]

   INF_VERSION    = 0x0001001B

-  BASE_NAME      = AcpiPcctLibArm

+  BASE_NAME      = AcpiPcctLib

   FILE_GUID      = 38FE945C-D6ED-4CD6-8D20-FCEF3260D15A

   VERSION_STRING = 1.0

   MODULE_TYPE    = DXE_DRIVER

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/AcpiPpttLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/AcpiPpttLib.inf
index 2c7d19513d..a1c91a6eab 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/AcpiPpttLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiPpttLib/AcpiPpttLib.inf
@@ -8,7 +8,7 @@
 

 [Defines]

   INF_VERSION    = 0x0001001B

-  BASE_NAME      = AcpiPpttLibArm

+  BASE_NAME      = AcpiPpttLib

   FILE_GUID      = FA102D52-5A92-4F95-A097-1D53F9CF5959

   VERSION_STRING = 1.0

   MODULE_TYPE    = DXE_DRIVER

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiRawLib/AcpiRawLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiRawLib/AcpiRawLib.inf
index f2ab1b7111..8b461ea05b 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiRawLib/AcpiRawLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiRawLib/AcpiRawLib.inf
@@ -8,7 +8,7 @@
 

 [Defines]

   INF_VERSION    = 0x00010019

-  BASE_NAME      = AcpiRawLibArm

+  BASE_NAME      = AcpiRawLib

   FILE_GUID      = 20F31568-D687-49BA-B326-CCD9D38EDE16

   VERSION_STRING = 1.0

   MODULE_TYPE    = DXE_DRIVER

@@ -27,10 +27,3 @@
 

 [LibraryClasses]

   BaseLib

-

-[Pcd]

-

-[Protocols]

-

-[Guids]

-

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/AcpiSpcrLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/AcpiSpcrLib.inf
index e11f878ec8..80a61022da 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/AcpiSpcrLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSpcrLib/AcpiSpcrLib.inf
@@ -8,7 +8,7 @@
 

 [Defines]

   INF_VERSION    = 0x00010019

-  BASE_NAME      = AcpiSpcrLibArm

+  BASE_NAME      = AcpiSpcrLib

   FILE_GUID      = 55088136-7B78-4974-B1EE-F630150D0DE7

   VERSION_STRING = 1.0

   MODULE_TYPE    = DXE_DRIVER

@@ -28,10 +28,3 @@
 [LibraryClasses]

   BaseLib

   SsdtSerialPortFixupLib

-

-[Pcd]

-

-[Protocols]

-

-[Guids]

-

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/AcpiSratLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/AcpiSratLib.inf
index 5891dc4d1c..2f23f4e668 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/AcpiSratLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSratLib/AcpiSratLib.inf
@@ -8,7 +8,7 @@
 

 [Defines]

   INF_VERSION    = 0x0001001B

-  BASE_NAME      = AcpiSratLibArm

+  BASE_NAME      = AcpiSratLib

   FILE_GUID      = 2CE21E0A-A39C-4B26-BC0E-526178036ACD

   VERSION_STRING = 1.0

   MODULE_TYPE    = DXE_DRIVER

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyLib.inf
index 3e2d154749..2d38fb30fb 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtCpuTopologyLib/SsdtCpuTopologyLib.inf
@@ -8,7 +8,7 @@
 

 [Defines]

   INF_VERSION    = 0x0001001B

-  BASE_NAME      = SsdtCpuTopologyLibArm

+  BASE_NAME      = SsdtCpuTopologyLib

   FILE_GUID      = F2835EB6-4B05-48D4-A475-147DA0F3755C

   VERSION_STRING = 1.0

   MODULE_TYPE    = DXE_DRIVER

@@ -20,11 +20,13 @@
   SsdtCpuTopologyGenerator.c

   SsdtCpuTopologyGenerator.h

 

+[Packages.ARM, Packages.AARCH64]

+  ArmPlatformPkg/ArmPlatformPkg.dec

+

 [Packages]

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

   EmbeddedPkg/EmbeddedPkg.dec

-  ArmPlatformPkg/ArmPlatformPkg.dec

   DynamicTablesPkg/DynamicTablesPkg.dec

 

 [LibraryClasses]

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieLib.inf
index c2a1acb570..440b0d7212 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtPcieLib/SsdtPcieLib.inf
@@ -8,7 +8,7 @@
 

 [Defines]

   INF_VERSION    = 0x0001001B

-  BASE_NAME      = SsdtPcieLibArm

+  BASE_NAME      = SsdtPcieLib

   FILE_GUID      = E431D7FD-26BF-4E3D-9064-5B13B0439057

   VERSION_STRING = 1.0

   MODULE_TYPE    = DXE_DRIVER

diff --git a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerialPortLib.inf b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerialPortLib.inf
index 36e61ea9b1..24d7db5645 100644
--- a/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerialPortLib.inf
+++ b/DynamicTablesPkg/Library/Acpi/Common/AcpiSsdtSerialPortLib/SsdtSerialPortLib.inf
@@ -8,7 +8,7 @@
 

 [Defines]

   INF_VERSION    = 0x0001001B

-  BASE_NAME      = SsdtSerialPortLibArm

+  BASE_NAME      = SsdtSerialPortLib

   FILE_GUID      = D1F92325-2DFB-435C-9B4C-A6B864F19230

   VERSION_STRING = 1.0

   MODULE_TYPE    = DXE_DRIVER

@@ -19,11 +19,13 @@
 [Sources]

   SsdtSerialPortGenerator.c

 

+[Packages.ARM, Packages.AARCH64]

+  ArmPlatformPkg/ArmPlatformPkg.dec

+

 [Packages]

   MdePkg/MdePkg.dec

   MdeModulePkg/MdeModulePkg.dec

   EmbeddedPkg/EmbeddedPkg.dec

-  ArmPlatformPkg/ArmPlatformPkg.dec

   DynamicTablesPkg/DynamicTablesPkg.dec

 

 [LibraryClasses]