Platform/ARM: Juno: Remove Serial port SSDT

Dynamic Tables Framework has been updated to add support for
Dynamic AML. The SPCR and DBG generators have also been updated
to dynamically generate the AML description for the Serial Ports.
Therefore, the SSDT serial port description is redundant when
Dynamic Tables Framework is enabled, so remove it.

Signed-off-by: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Leif Lindholm <leif@nuviainc.com>

4 files changed, 2 insertions, 53 deletions

diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/SsdtUart.asl b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/SsdtUart.asl
deleted file mode 100644
index 55a7ffc8..00000000
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/AslTables/SsdtUart.asl
+++ /dev/null
@@ -1,42 +0,0 @@
-/** @file

-  SSDT for UART

-

-  Copyright (c) 2014 - 2019, ARM Ltd. All rights reserved.<BR>

-    SPDX-License-Identifier: BSD-2-Clause-Patent

-

-**/

-#include "ArmPlatform.h"

-

-DefinitionBlock("SsdtUart.aml", "SSDT", 1, "ARMLTD", "ARM-JUNO", EFI_ACPI_ARM_OEM_REVISION) {

-  Scope(_SB) {

-    // UART PL011

-    Device(COM2) {

-      Name(_HID, "ARMH0011")

-      Name(_CID, "PL011")

-      Name(_UID, Zero)

-

-      Method(_STA) {

-        Return (0xF)

-      }

-

-      Method(_CRS, 0x0, NotSerialized) {

-        Name(RBUF, ResourceTemplate() {

-          Memory32Fixed(

-            ReadWrite,

-            FixedPcdGet64 (PcdSerialRegisterBase),

-            0x1000

-            )

-          Interrupt(

-            ResourceConsumer,

-            Level,

-            ActiveHigh,

-            Exclusive

-            ) {

-              FixedPcdGet32 (PL011UartInterrupt)

-            }

-          })

-        Return (RBUF)

-      }

-    }

-  }

-}

diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 8d92a8a6..80a98a10 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -83,13 +83,6 @@ EDKII_PLATFORM_REPOSITORY_INFO ArmJunoPlatformRepositoryInfo = {
       CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdSsdt),

       (EFI_ACPI_DESCRIPTION_HEADER*)ssdtjunousb_aml_code

     },

-    // SSDT table describing the PL011 UART

-    {

-      EFI_ACPI_6_2_SECONDARY_SYSTEM_DESCRIPTION_TABLE_SIGNATURE,

-      0, // Unused

-      CREATE_STD_ACPI_TABLE_GEN_ID (EStdAcpiTableIdSsdt),

-      (EFI_ACPI_DESCRIPTION_HEADER*)ssdtuart_aml_code

-    },

     // PPTT Table

     {

       EFI_ACPI_6_3_PROCESSOR_PROPERTIES_TOPOLOGY_TABLE_STRUCTURE_SIGNATURE,

diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index f382c7f9..771b00c3 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -19,7 +19,6 @@
 extern CHAR8  dsdt_aml_code[];

 extern CHAR8  ssdtjunousb_aml_code[];

 extern CHAR8  ssdtpci_aml_code[];

-extern CHAR8  ssdtuart_aml_code[];

 

 /** The configuration manager version

 */

@@ -116,7 +115,7 @@ typedef EFI_STATUS (*CM_OBJECT_HANDLER_PROC) (
 

 /** The number of ACPI tables to install

 */

-#define PLAT_ACPI_TABLE_COUNT   11

+#define PLAT_ACPI_TABLE_COUNT   10

 

 /** The number of platform generic timer blocks

 */

diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
index a3e7db12..00be2c43 100644
--- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
+++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManagerDxe.inf
@@ -1,7 +1,7 @@
 ## @file

 #  Configuration Manager Dxe

 #

-#  Copyright (c) 2017 - 2020, Arm Limited. All rights reserved.<BR>

+#  Copyright (c) 2017 - 2021, Arm Limited. All rights reserved.<BR>

 #

 #  SPDX-License-Identifier: BSD-2-Clause-Patent

 ##

@@ -25,7 +25,6 @@
   AslTables/Dsdt.asl

   AslTables/SsdtJunoUsb.asl

   AslTables/SsdtPci.asl

-  AslTables/SsdtUart.asl

 

 [Packages]

   ArmPkg/ArmPkg.dec