Replace all usage of 'SgiClark' with 'RdN1E1Edge' and 'SgiClarkAres'
with 'RdN1Edge' as per the updated product names.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jagadeesh Ujja <jagadeesh.u...@arm.com>
---
Platform/ARM/SgiPkg/AcpiTables/{SgiClarkAres => RdN1Edge}/Dsdt.asl
| 16 ++++++++--------
Platform/ARM/SgiPkg/AcpiTables/{SgiClarkAres => RdN1Edge}/Madt.aslc
| 16 ++++++++--------
Platform/ARM/SgiPkg/AcpiTables/{SgiClarkAresAcpiTables.inf =>
RdN1EdgeAcpiTables.inf} | 6 +++---
Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
| 8 ++++----
Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
| 2 +-
Platform/ARM/SgiPkg/Include/SgiPlatform.h
| 6 +++---
Platform/ARM/SgiPkg/SgiPlatform.dec
| 2 +-
Platform/ARM/SgiPkg/SgiPlatform.dsc
| 2 +-
Platform/ARM/SgiPkg/SgiPlatform.fdf
| 2 +-
9 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Dsdt.asl
b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl
similarity index 85%
rename from Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Dsdt.asl
rename to Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl
index 69dc33c..9226229 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Dsdt.asl
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Dsdt.asl
@@ -20,49 +20,49 @@ DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD",
"ARMSGI",
EFI_ACPI_ARM_OEM_REVISION) {
Scope (_SB) {
- Device (CP00) { // Ares: Cluster 0, Cpu 0
+ Device (CP00) { // Neoverse-N1: Cluster 0, Cpu 0
Name (_HID, "ACPI0007")
Name (_UID, 0)
Name (_STA, 0xF)
}
- Device (CP01) { // Ares: Cluster 0, Cpu 1
+ Device (CP01) { // Neoverse-N1: Cluster 0, Cpu 1
Name (_HID, "ACPI0007")
Name (_UID, 1)
Name (_STA, 0xF)
}
- Device (CP02) { // Ares: Cluster 0, Cpu 2
+ Device (CP02) { // Neoverse-N1: Cluster 0, Cpu 2
Name (_HID, "ACPI0007")
Name (_UID, 2)
Name (_STA, 0xF)
}
- Device (CP03) { // Ares: Cluster 0, Cpu 3
+ Device (CP03) { // Neoverse-N1: Cluster 0, Cpu 3
Name (_HID, "ACPI0007")
Name (_UID, 3)
Name (_STA, 0xF)
}
- Device (CP04) { // Ares: Cluster 1, Cpu 0
+ Device (CP04) { // Neoverse-N1: Cluster 1, Cpu 0
Name (_HID, "ACPI0007")
Name (_UID, 4)
Name (_STA, 0xF)
}
- Device (CP05) { // Ares: Cluster 1, Cpu 1
+ Device (CP05) { // Neoverse-N1: Cluster 1, Cpu 1
Name (_HID, "ACPI0007")
Name (_UID, 5)
Name (_STA, 0xF)
}
- Device (CP06) { // Ares: Cluster 1, Cpu 2
+ Device (CP06) { // Neoverse-N1: Cluster 1, Cpu 2
Name (_HID, "ACPI0007")
Name (_UID, 6)
Name (_STA, 0xF)
}
- Device (CP07) { // Ares: Cluster 1, Cpu 3
+ Device (CP07) { // Neoverse-N1: Cluster 1, Cpu 3
Name (_HID, "ACPI0007")
Name (_UID, 7)
Name (_STA, 0xF)
diff --git a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Madt.aslc
b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc
similarity index 93%
rename from Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Madt.aslc
rename to Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc
index f60b62d..d29eda5 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAres/Madt.aslc
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1Edge/Madt.aslc
@@ -120,36 +120,36 @@ STATIC EFI_ACPI_6_2_MULTIPLE_APIC_DESCRIPTION_TABLE Madt
= {
// Efficiency)
// Note: The GIC Structure of the primary CPU must be the first entry
// (see note in 5.2.12.14 GICC Structure of ACPI v6.2).
- EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Ares-0
+ EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Neoverse-N1-0
0, 0, GET_MPID(0x0, 0x0), EFI_ACPI_6_2_GIC_ENABLED, 23,
FixedPcdGet32 (PcdGicDistributorBase),
0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),
- EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Ares-1
+ EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Neoverse-N1-1
0, 1, GET_MPID(0x0, 0x100), EFI_ACPI_6_2_GIC_ENABLED, 23,
FixedPcdGet32 (PcdGicDistributorBase),
0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),
- EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Ares-2
+ EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Neoverse-N1-2
0, 2, GET_MPID(0x0, 0x200), EFI_ACPI_6_2_GIC_ENABLED, 23,
FixedPcdGet32 (PcdGicDistributorBase),
0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),
- EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Ares-3
+ EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Neoverse-N1-3
0, 3, GET_MPID(0x0, 0x300), EFI_ACPI_6_2_GIC_ENABLED, 23,
FixedPcdGet32 (PcdGicDistributorBase),
0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),
- EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Ares-4
+ EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Neoverse-N1-4
0, 4, GET_MPID(0x100, 0x00), EFI_ACPI_6_2_GIC_ENABLED, 23,
FixedPcdGet32 (PcdGicDistributorBase),
0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),
- EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Ares-5
+ EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Neoverse-N1-5
0, 5, GET_MPID(0x100, 0x100), EFI_ACPI_6_2_GIC_ENABLED, 23,
FixedPcdGet32 (PcdGicDistributorBase),
0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),
- EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Ares-6
+ EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Neoverse-N1-6
0, 6, GET_MPID(0x100, 0x200), EFI_ACPI_6_2_GIC_ENABLED, 23,
FixedPcdGet32 (PcdGicDistributorBase),
0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */),
- EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Ares-7
+ EFI_ACPI_6_2_GICC_STRUCTURE_INIT( // Neoverse-N1-7
0, 7, GET_MPID(0x100, 0x300), EFI_ACPI_6_2_GIC_ENABLED, 23,
FixedPcdGet32 (PcdGicDistributorBase),
0x2c020000, 0x2c010000, 25, 0 /* GicRBase */, 0 /* Efficiency */)
diff --git a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf
b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
similarity index 92%
rename from Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf
rename to Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
index d4bacdb..aa9fec7 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
@@ -15,7 +15,7 @@
[Defines]
INF_VERSION = 0x0001001A
- BASE_NAME = SgiClarkAresAcpiTables
+ BASE_NAME = RdN1EdgeAcpiTables
FILE_GUID = 4b0b91d0-4a05-45c4-88a7-88e170e76694
MODULE_TYPE = USER_DEFINED
VERSION_STRING = 1.0
@@ -26,8 +26,8 @@
Gtdt.aslc
Iort.aslc
Mcfg.aslc
- SgiClarkAres/Dsdt.asl
- SgiClarkAres/Madt.aslc
+ RdN1Edge/Dsdt.asl
+ RdN1Edge/Madt.aslc
Spcr.aslc
Ssdt.asl
diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
index 5c1eec0..e00febd 100644
--- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
+++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c
@@ -48,10 +48,10 @@ ArmSgiPkgEntryPoint (
if ((PartNum == SGI575_PART_NUM) && (ConfigId == SGI575_CONF_NUM)) {
Status = LocateAndInstallAcpiFromFv (&gSgi575AcpiTablesFileGuid);
- } else if ((PartNum == SGI_CLARK_PART_NUM) &&
- (ConfigId == SGI_CLARK_CONF_ARES)) {
- Status = LocateAndInstallAcpiFromFv (&gSgiClarkAresAcpiTablesFileGuid);
- } else if ((PartNum == SGI_CLARK_PART_NUM) &&
+ } else if ((PartNum == RD_N1E1_EDGE_PART_NUM) &&
+ (ConfigId == RD_N1_EDGE_CONF_ID)) {
+ Status = LocateAndInstallAcpiFromFv (&gRdN1EdgeAcpiTablesFileGuid);
+ } else if ((PartNum == RD_N1E1_EDGE_PART_NUM) &&
(ConfigId == SGI_CLARK_CONF_HELIOS)) {
Status = LocateAndInstallAcpiFromFv (&gSgiClarkHeliosAcpiTablesFileGuid);
} else {
diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
index 3283ff0..7b8b3b6 100644
--- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
+++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf
@@ -37,7 +37,7 @@
[Guids]
gArmSgiPlatformIdDescriptorGuid
gSgi575AcpiTablesFileGuid
- gSgiClarkAresAcpiTablesFileGuid
+ gRdN1EdgeAcpiTablesFileGuid
gSgiClarkHeliosAcpiTablesFileGuid
[FeaturePcd]
diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h
b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
index b9a662a..99bad78 100644
--- a/Platform/ARM/SgiPkg/Include/SgiPlatform.h
+++ b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
@@ -76,9 +76,9 @@
#define SGI575_CONF_NUM 0x3
#define SGI575_PART_NUM 0x783
-//SGI-Clark Platform Identification values
-#define SGI_CLARK_PART_NUM 0x786
-#define SGI_CLARK_CONF_ARES 0x1
+//RDN1E1EDGE Platform Identification values
+#define RD_N1E1_EDGE_PART_NUM 0x786
+#define RD_N1_EDGE_CONF_ID 0x1
#define SGI_CLARK_CONF_HELIOS 0x2
#define SGI_CONFIG_MASK 0x0F
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dec
b/Platform/ARM/SgiPkg/SgiPlatform.dec
index 10157c7..512ee4c 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dec
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dec
@@ -33,7 +33,7 @@
gArmSgiPlatformIdDescriptorGuid = { 0xf56f152a, 0xad2a, 0x11e6, { 0xb1,
0xa7, 0x00, 0x50, 0x56, 0x3c, 0x44, 0xcc } }
gArmSgiTokenSpaceGuid = { 0x577d6941, 0xaea1, 0x40b4, { 0x90, 0x93,
0x2a, 0x86, 0x61, 0x72, 0x5a, 0x57 } }
gSgi575AcpiTablesFileGuid = { 0xc712719a, 0x0aaf, 0x438c, { 0x9c, 0xdd,
0x35, 0xab, 0x4d, 0x60, 0x20, 0x7d } }
- gSgiClarkAresAcpiTablesFileGuid = { 0x4b0b91d0, 0x4a05, 0x45c4, { 0x88,
0xa7, 0x88, 0xe1, 0x70, 0xe7, 0x66, 0x94 } }
+ gRdN1EdgeAcpiTablesFileGuid = { 0x4b0b91d0, 0x4a05, 0x45c4, { 0x88, 0xa7,
0x88, 0xe1, 0x70, 0xe7, 0x66, 0x94 } }
gSgiClarkHeliosAcpiTablesFileGuid = { 0x2af40815, 0xa84e, 0x4de9, { 0x8c,
0x38, 0x91, 0x40, 0xb3, 0x54, 0x40, 0x73 } }
[PcdsFeatureFlag.common]
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc
b/Platform/ARM/SgiPkg/SgiPlatform.dsc
index bdb4ecb..f2d6672 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.dsc
+++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc
@@ -281,7 +281,7 @@
#
MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
- Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf
+ Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
Platform/ARM/SgiPkg/AcpiTables/SgiClarkHeliosAcpiTables.inf
MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf
b/Platform/ARM/SgiPkg/SgiPlatform.fdf
index 7916a52..5e8ccec 100644
--- a/Platform/ARM/SgiPkg/SgiPlatform.fdf
+++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf
@@ -106,7 +106,7 @@ READ_LOCK_STATUS = TRUE
#
INF MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf
INF RuleOverride=ACPITABLE
Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf
- INF RuleOverride=ACPITABLE
Platform/ARM/SgiPkg/AcpiTables/SgiClarkAresAcpiTables.inf
+ INF RuleOverride=ACPITABLE
Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf
INF RuleOverride=ACPITABLE
Platform/ARM/SgiPkg/AcpiTables/SgiClarkHeliosAcpiTables.inf
INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf
--
2.7.4
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
