[edk2-devel] [PATCH v1][edk2-platforms 1/2] Platform/ARM/SgiPkg: Rename RdDanielCfgM to RdV1
Aditya Angadi
aditya.angadi at arm.com
Fri Dec 18 13:34:13 UTC 2020
Reference Design platform RD-Daniel has been renamed to RD-V1.
Correspondingly, remove all uses of 'RdDanielCfgM' and replace it with
RdV1 where appropriate
Signed-off-by: Aditya Angadi <aditya.angadi at arm.com>
---
Platform/ARM/SgiPkg/AcpiTables/{RdDanielCfgM => RdV1}/Dsdt.asl | 32 ++++++++++----------
Platform/ARM/SgiPkg/AcpiTables/{RdDanielCfgM => RdV1}/Madt.aslc | 0
Platform/ARM/SgiPkg/AcpiTables/{RdDanielCfgMAcpiTables.inf => RdV1AcpiTables.inf} | 6 ++--
Platform/ARM/SgiPkg/Include/SgiPlatform.h | 8 ++---
Platform/ARM/SgiPkg/{RdDanielCfgM/RdDanielCfgM.dsc => RdV1/RdV1.dsc} | 6 ++--
Platform/ARM/SgiPkg/{RdDanielCfgM/RdDanielCfgM.fdf.inc => RdV1/RdV1.fdf.inc} | 2 +-
6 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdDanielCfgM/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/RdV1/Dsdt.asl
similarity index 68%
rename from Platform/ARM/SgiPkg/AcpiTables/RdDanielCfgM/Dsdt.asl
rename to Platform/ARM/SgiPkg/AcpiTables/RdV1/Dsdt.asl
index a1d842a11d97..7cc0614f4d60 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdDanielCfgM/Dsdt.asl
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1/Dsdt.asl
@@ -13,97 +13,97 @@
DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI",
EFI_ACPI_ARM_OEM_REVISION) {
Scope (_SB) {
- Device (CP00) { // Zeus core 0
+ Device (CP00) { // Neoverse V1 core 0
Name (_HID, "ACPI0007")
Name (_UID, 0)
Name (_STA, 0xF)
}
- Device (CP01) { // Zeus core 1
+ Device (CP01) { // Neoverse V1 core 1
Name (_HID, "ACPI0007")
Name (_UID, 1)
Name (_STA, 0xF)
}
- Device (CP02) { // Zeus core 2
+ Device (CP02) { // Neoverse V1 core 2
Name (_HID, "ACPI0007")
Name (_UID, 2)
Name (_STA, 0xF)
}
- Device (CP03) { // Zeus core 3
+ Device (CP03) { // Neoverse V1 core 3
Name (_HID, "ACPI0007")
Name (_UID, 3)
Name (_STA, 0xF)
}
- Device (CP04) { // Zeus core 4
+ Device (CP04) { // Neoverse V1 core 4
Name (_HID, "ACPI0007")
Name (_UID, 4)
Name (_STA, 0xF)
}
- Device (CP05) { // Zeus core 5
+ Device (CP05) { // Neoverse V1 core 5
Name (_HID, "ACPI0007")
Name (_UID, 5)
Name (_STA, 0xF)
}
- Device (CP06) { // Zeus core 6
+ Device (CP06) { // Neoverse V1 core 6
Name (_HID, "ACPI0007")
Name (_UID, 6)
Name (_STA, 0xF)
}
- Device (CP07) { // Zeus core 7
+ Device (CP07) { // Neoverse V1 core 7
Name (_HID, "ACPI0007")
Name (_UID, 7)
Name (_STA, 0xF)
}
- Device (CP08) { // Zeus core 8
+ Device (CP08) { // Neoverse V1 core 8
Name (_HID, "ACPI0007")
Name (_UID, 8)
Name (_STA, 0xF)
}
- Device (CP09) { // Zeus core 9
+ Device (CP09) { // Neoverse V1 core 9
Name (_HID, "ACPI0007")
Name (_UID, 9)
Name (_STA, 0xF)
}
- Device (CP10) { // Zeus core 10
+ Device (CP10) { // Neoverse V1 core 10
Name (_HID, "ACPI0007")
Name (_UID, 10)
Name (_STA, 0xF)
}
- Device (CP11) { // Zeus core 11
+ Device (CP11) { // Neoverse V1 core 11
Name (_HID, "ACPI0007")
Name (_UID, 11)
Name (_STA, 0xF)
}
- Device (CP12) { // Zeus core 12
+ Device (CP12) { // Neoverse V1 core 12
Name (_HID, "ACPI0007")
Name (_UID, 12)
Name (_STA, 0xF)
}
- Device (CP13) { // Zeus core 13
+ Device (CP13) { // Neoverse V1 core 13
Name (_HID, "ACPI0007")
Name (_UID, 13)
Name (_STA, 0xF)
}
- Device (CP14) { // Zeus core 14
+ Device (CP14) { // Neoverse V1 core 14
Name (_HID, "ACPI0007")
Name (_UID, 14)
Name (_STA, 0xF)
}
- Device (CP15) { // Zeus core 15
+ Device (CP15) { // Neoverse V1 core 15
Name (_HID, "ACPI0007")
Name (_UID, 15)
Name (_STA, 0xF)
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdDanielCfgM/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdV1/Madt.aslc
similarity index 100%
rename from Platform/ARM/SgiPkg/AcpiTables/RdDanielCfgM/Madt.aslc
rename to Platform/ARM/SgiPkg/AcpiTables/RdV1/Madt.aslc
diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdDanielCfgMAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
similarity index 90%
rename from Platform/ARM/SgiPkg/AcpiTables/RdDanielCfgMAcpiTables.inf
rename to Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
index 5ae82e302228..a5f936b8a758 100644
--- a/Platform/ARM/SgiPkg/AcpiTables/RdDanielCfgMAcpiTables.inf
+++ b/Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
@@ -9,7 +9,7 @@
[Defines]
INF_VERSION = 0x0001001A
- BASE_NAME = RdDanielCfgMAcpiTables
+ BASE_NAME = RdV1AcpiTables
FILE_GUID = c712719a-0aaf-438c-9cdd-35ab4d60207d # gArmSgiAcpiTablesGuid
MODULE_TYPE = USER_DEFINED
VERSION_STRING = 1.0
@@ -21,8 +21,8 @@ [Sources]
Gtdt.aslc
Iort.aslc
Mcfg.aslc
- RdDanielCfgM/Dsdt.asl
- RdDanielCfgM/Madt.aslc
+ RdV1/Dsdt.asl
+ RdV1/Madt.aslc
Spcr.aslc
[Packages]
diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
index f4bba7c05d42..f5174c12b89a 100644
--- a/Platform/ARM/SgiPkg/Include/SgiPlatform.h
+++ b/Platform/ARM/SgiPkg/Include/SgiPlatform.h
@@ -70,10 +70,10 @@
#define RD_N1_EDGE_CONF_ID 0x1
#define RD_E1_EDGE_CONF_ID 0x2
-// RD-Daniel Platform Identification values
-#define RD_DANIEL_PART_NUM 0x78A
-#define RD_DANIEL_CFGM_CONF_ID 0x1
-#define RD_DANIEL_CFGXLR_CONF_ID 0x2
+// RD-V1 Platform Identification values
+#define RD_V1_PART_NUM 0x78A
+#define RD_V1_CONF_ID 0x1
+#define RD_V1_MC_CONF_ID 0x2
#define SGI_CONFIG_MASK 0x0F
#define SGI_CONFIG_SHIFT 0x1C
diff --git a/Platform/ARM/SgiPkg/RdDanielCfgM/RdDanielCfgM.dsc b/Platform/ARM/SgiPkg/RdV1/RdV1.dsc
similarity index 87%
rename from Platform/ARM/SgiPkg/RdDanielCfgM/RdDanielCfgM.dsc
rename to Platform/ARM/SgiPkg/RdV1/RdV1.dsc
index a76a9ad715ad..223f4815c122 100644
--- a/Platform/ARM/SgiPkg/RdDanielCfgM/RdDanielCfgM.dsc
+++ b/Platform/ARM/SgiPkg/RdV1/RdV1.dsc
@@ -10,7 +10,7 @@
#
################################################################################
[Defines]
- PLATFORM_NAME = RdDanielCfgM
+ PLATFORM_NAME = RdV1
PLATFORM_GUID = d301ac4e-0828-4cef-b754-34ca9b6781b5
PLATFORM_VERSION = 0.1
DSC_SPECIFICATION = 0x0001001B
@@ -19,7 +19,7 @@ [Defines]
BUILD_TARGETS = NOOPT|DEBUG|RELEASE
SKUID_IDENTIFIER = DEFAULT
FLASH_DEFINITION = Platform/ARM/SgiPkg/SgiPlatform.fdf
- BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdDanielCfgM/RdDanielCfgM.fdf.inc
+ BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc
BUILD_NUMBER = 1
# include common definitions from SgiPlatform.dsc
@@ -48,4 +48,4 @@ [PcdsFixedAtBuild.common]
################################################################################
[Components.common]
- Platform/ARM/SgiPkg/AcpiTables/RdDanielCfgMAcpiTables.inf
+ Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
diff --git a/Platform/ARM/SgiPkg/RdDanielCfgM/RdDanielCfgM.fdf.inc b/Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc
similarity index 67%
rename from Platform/ARM/SgiPkg/RdDanielCfgM/RdDanielCfgM.fdf.inc
rename to Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc
index 6a99bdbbbed1..1277bf39c162 100644
--- a/Platform/ARM/SgiPkg/RdDanielCfgM/RdDanielCfgM.fdf.inc
+++ b/Platform/ARM/SgiPkg/RdV1/RdV1.fdf.inc
@@ -7,4 +7,4 @@
# Per-platform additional content of the DXE phase firmware volume
# ACPI support
- INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdDanielCfgMAcpiTables.inf
+ INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTables.inf
--
2.17.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#69189): https://edk2.groups.io/g/devel/message/69189
Mute This Topic: https://groups.io/mt/79060810/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list