Remove references to RPi and Arm Juno

edk2-porting · Sep 18, 2023 · 06dcc23 · 06dcc23
1 parent 842db13
commit 06dcc23
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 66 deletions.
diff --git a/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Ameridroid/IndiedroidNova/AcpiTables/Dsdt.asl
@@ -13,7 +13,7 @@
 
 #include "AcpiTables.h"
 
-DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
 {
   Scope (\_SB_)
   {

diff --git a/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Firefly/ROC-RK3588S-PC/AcpiTables/Dsdt.asl
@@ -13,7 +13,7 @@
 
 #include "AcpiTables.h"
 
-DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
 {
   Scope (\_SB_)
   {

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/FriendlyElec/NanoPC-T6/AcpiTables/Dsdt.asl
@@ -13,7 +13,7 @@
 
 #include "AcpiTables.h"
 
-DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
 {
   Scope (\_SB_)
   {

diff --git a/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/FriendlyElec/NanoPi-R6S/AcpiTables/Dsdt.asl
@@ -13,7 +13,7 @@
 
 #include "AcpiTables.h"
 
-DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
 {
   Scope (\_SB_)
   {

diff --git a/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/Dsdt.asl
@@ -13,7 +13,7 @@
 
 #include "AcpiTables.h"
 
-DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
 {
   Scope (\_SB_)
   {

diff --git a/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/Dsdt.asl
@@ -13,7 +13,7 @@
 
 #include "AcpiTables.h"
 
-DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
 {
   Scope (\_SB_)
   {

diff --git a/edk2-rockchip/Platform/Mekotronics/R58-Mini/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Mekotronics/R58-Mini/AcpiTables/Dsdt.asl
@@ -13,7 +13,7 @@
 
 #include "AcpiTables.h"
 
-DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
 {
   Scope (\_SB_)
   {

diff --git a/edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/Dsdt.asl
@@ -13,7 +13,7 @@
 
 #include "AcpiTables.h"
 
-DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
 {
   Scope (\_SB_)
   {

diff --git a/edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/Dsdt.asl
@@ -13,7 +13,7 @@
 
 #include "AcpiTables.h"
 
-DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
 {
   Scope (\_SB_)
   {

diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/OrangePi/OrangePi5/AcpiTables/Dsdt.asl
@@ -13,7 +13,7 @@
 
 #include "AcpiTables.h"
 
-DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
 {
   Scope (\_SB_)
   {

diff --git a/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/OrangePi/OrangePi5Plus/AcpiTables/Dsdt.asl
@@ -13,7 +13,7 @@
 
 #include "AcpiTables.h"
 
-DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
 {
   Scope (\_SB_)
   {

diff --git a/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/Dsdt.asl
@@ -13,7 +13,7 @@
 
 #include "AcpiTables.h"
 
-DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
 {
   Scope (\_SB_)
   {

diff --git a/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/Dsdt.asl b/edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/Dsdt.asl
@@ -13,7 +13,7 @@
 
 #include "AcpiTables.h"
 
-DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RPIFDN", "RPI", 2)
+DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP  ", "RK3588  ", 2)
 {
   Scope (\_SB_)
   {

diff --git a/edk2-rockchip/Silicon/Rockchip/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c b/edk2-rockchip/Silicon/Rockchip/Drivers/PlatformSmbiosDxe/PlatformSmbiosDxe.c
@@ -409,11 +409,7 @@ SMBIOS_TABLE_TYPE7 mCacheInfoType7_L1D = {
   0,                        // Cache Speed unknown
   CacheErrorSingleBit,      // Error Correction
   CacheTypeData,            // System Cache Type
-#if (RPI_MODEL == 4)
-  CacheAssociativity2Way    // Associativity
-#else
   CacheAssociativity4Way    // Associativity
-#endif
 };
 CHAR8  *mCacheInfoType7Strings_L1D[] = {
   "L1 Data",

diff --git a/edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/Fadt.aslc b/edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/Fadt.aslc
@@ -16,16 +16,6 @@
 
 #include "AcpiTables.h"
 
-/*
- * Windows 10 on the Raspberry Pi 3 requires a specific OEM Id for FADT.
- * We replace the one that was defined in "AcpiTables.h", so that it is
- * picked by the ACPI_HEADER () macro.
- */
-#if (RPI_MODEL == 3)
-#undef  EFI_ACPI_OEM_ID
-#define EFI_ACPI_OEM_ID         {'R','O','C','K',' ',' '}
-#endif
-
 EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE Fadt = {
   ACPI_HEADER (
     EFI_ACPI_6_3_FIXED_ACPI_DESCRIPTION_TABLE_SIGNATURE,

diff --git a/edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/Gtdt.aslc b/edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/Gtdt.aslc
@@ -12,6 +12,8 @@
 #include <Library/PcdLib.h>
 #include <IndustryStandard/Acpi.h>
 
+#include "AcpiTables.h"
+
 #define GTDT_GLOBAL_FLAGS_MAPPED      EFI_ACPI_5_0_GTDT_GLOBAL_FLAG_MEMORY_MAPPED_BLOCK_PRESENT
 #define GTDT_GLOBAL_FLAGS_NOT_MAPPED  0
 #define GTDT_GLOBAL_FLAGS_EDGE        EFI_ACPI_5_0_GTDT_GLOBAL_FLAG_INTERRUPT_MODE
@@ -32,24 +34,6 @@
 
 #define GTDT_GTIMER_FLAGS           (GTDT_TIMER_ACTIVE_LOW | GTDT_TIMER_LEVEL_TRIGGERED)
 
-#define EFI_ACPI_ARM_OEM_ID           'A','R','M','L','T','D'   // OEMID 6 bytes long
-#define EFI_ACPI_ARM_OEM_TABLE_ID     SIGNATURE_64('A','R','M','-','J','U','N','O') // OEM table id 8 bytes long
-#define EFI_ACPI_ARM_OEM_REVISION     0x20140727
-#define EFI_ACPI_ARM_CREATOR_ID       SIGNATURE_32('A','R','M',' ')
-#define EFI_ACPI_ARM_CREATOR_REVISION 0x00000099
-
-#define ARM_ACPI_HEADER(Signature, Type, Revision) {              \
-      Signature,		      /* UINT32  Signature */	    \
-      sizeof (Type),		      /* UINT32  Length */	    \
-      Revision, 		      /* UINT8	 Revision */	    \
-      0,			      /* UINT8	 Checksum */	    \
-      { EFI_ACPI_ARM_OEM_ID },	      /* UINT8	 OemId[6] */	    \
-      EFI_ACPI_ARM_OEM_TABLE_ID,      /* UINT64  OemTableId */	    \
-      EFI_ACPI_ARM_OEM_REVISION,      /* UINT32  OemRevision */     \
-      EFI_ACPI_ARM_CREATOR_ID,	      /* UINT32  CreatorId */	    \
-      EFI_ACPI_ARM_CREATOR_REVISION   /* UINT32  CreatorRevision */ \
-    }
-
 #pragma pack (1)
 
 typedef struct {
@@ -60,7 +44,7 @@ typedef struct {
 
 GENERIC_TIMER_DESCRIPTION_TABLE Gtdt = {
   {
-    ARM_ACPI_HEADER(
+    ACPI_HEADER(
       EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_SIGNATURE,
       GENERIC_TIMER_DESCRIPTION_TABLE,
       EFI_ACPI_5_1_GENERIC_TIMER_DESCRIPTION_TABLE_REVISION

diff --git a/edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/RK3588PcieIort.aslc b/edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/RK3588PcieIort.aslc
@@ -14,24 +14,6 @@
 
 #pragma pack(1)
 
-#define EFI_ACPI_ARM_OEM_ID           'A','R','M','L','T','D'   // OEMID 6 bytes long
-#define EFI_ACPI_ARM_OEM_TABLE_ID     SIGNATURE_64('A','R','M','-','J','U','N','O') // OEM table id 8 bytes long
-#define EFI_ACPI_ARM_OEM_REVISION     0x20140727
-#define EFI_ACPI_ARM_CREATOR_ID       SIGNATURE_32('A','R','M',' ')
-#define EFI_ACPI_ARM_CREATOR_REVISION 0x00000099
-
-#define ARM_ACPI_HEADER(Signature, Type, Revision) {             \
-    Signature,                      /* UINT32  Signature */       \
-    sizeof (Type),                  /* UINT32  Length */          \
-    Revision,                       /* UINT8   Revision */        \
-    0,                              /* UINT8   Checksum */        \
-    { EFI_ACPI_ARM_OEM_ID },        /* UINT8   OemId[6] */        \
-    EFI_ACPI_ARM_OEM_TABLE_ID,      /* UINT64  OemTableId */      \
-    EFI_ACPI_ARM_OEM_REVISION,      /* UINT32  OemRevision */     \
-    EFI_ACPI_ARM_CREATOR_ID,        /* UINT32  CreatorId */       \
-    EFI_ACPI_ARM_CREATOR_REVISION   /* UINT32  CreatorRevision */ \
-  }
-
 typedef struct
 {
   EFI_ACPI_6_0_IO_REMAPPING_ITS_NODE       ItsNode;
@@ -58,7 +40,7 @@ ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE Iort =
 {
   // EFI_ACPI_6_0_IO_REMAPPING_TABLE
   {
-     ARM_ACPI_HEADER  // EFI_ACPI_DESCRIPTION_HEADER
+     ACPI_HEADER  // EFI_ACPI_DESCRIPTION_HEADER
      (
        EFI_ACPI_6_2_IO_REMAPPING_TABLE_SIGNATURE,
        ARM_EFI_ACPI_6_0_IO_REMAPPING_TABLE,

diff --git a/edk2-rockchip/Silicon/Rockchip/RK3588/Include/AcpiTables.h b/edk2-rockchip/Silicon/Rockchip/RK3588/Include/AcpiTables.h
@@ -1,6 +1,6 @@
 /** @file
  *
- *  RPi defines for constructing ACPI tables
+ *  RK3588 defines for constructing ACPI tables
  *
  *  Copyright (c) 2020, Pete Batard <[email protected]>
  *  Copyright (c) 2019, ARM Ltd. All rights reserved.