From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.9970.1608298490051490054 for ; Fri, 18 Dec 2020 05:34:50 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: aditya.angadi@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id A68D8101E; Fri, 18 Dec 2020 05:34:44 -0800 (PST) Received: from usa.arm.com (a073440-lin.blr.arm.com [10.162.16.34]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 78CA83F66B; Fri, 18 Dec 2020 05:34:42 -0800 (PST) From: "Aditya Angadi" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Sami Mujawar , Thomas Abraham , Vijayenthiran Subramaniam , Aditya Angadi Subject: [PATCH v1][edk2-platforms 1/2] Platform/ARM/SgiPkg: Rename RdDanielCfgM to RdV1 Date: Fri, 18 Dec 2020 19:04:13 +0530 Message-Id: <20201218133414.19254-2-aditya.angadi@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201218133414.19254-1-aditya.angadi@arm.com> References: <20201218133414.19254-1-aditya.angadi@arm.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable 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 --- Platform/ARM/SgiPkg/AcpiTables/{RdDanielCfgM =3D> RdV1}/Dsdt.asl = | 32 ++++++++++---------- Platform/ARM/SgiPkg/AcpiTables/{RdDanielCfgM =3D> RdV1}/Madt.aslc = | 0 Platform/ARM/SgiPkg/AcpiTables/{RdDanielCfgMAcpiTables.inf =3D> RdV1Acpi= Tables.inf} | 6 ++-- Platform/ARM/SgiPkg/Include/SgiPlatform.h = | 8 ++--- Platform/ARM/SgiPkg/{RdDanielCfgM/RdDanielCfgM.dsc =3D> RdV1/RdV1.dsc} = | 6 ++-- Platform/ARM/SgiPkg/{RdDanielCfgM/RdDanielCfgM.fdf.inc =3D> RdV1/RdV1.fd= f.inc} | 2 +- 6 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdDanielCfgM/Dsdt.asl b/Platf= orm/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) } =20 - Device (CP01) { // Zeus core 1 + Device (CP01) { // Neoverse V1 core 1 Name (_HID, "ACPI0007") Name (_UID, 1) Name (_STA, 0xF) } =20 - Device (CP02) { // Zeus core 2 + Device (CP02) { // Neoverse V1 core 2 Name (_HID, "ACPI0007") Name (_UID, 2) Name (_STA, 0xF) } =20 - Device (CP03) { // Zeus core 3 + Device (CP03) { // Neoverse V1 core 3 Name (_HID, "ACPI0007") Name (_UID, 3) Name (_STA, 0xF) } =20 - Device (CP04) { // Zeus core 4 + Device (CP04) { // Neoverse V1 core 4 Name (_HID, "ACPI0007") Name (_UID, 4) Name (_STA, 0xF) } =20 - Device (CP05) { // Zeus core 5 + Device (CP05) { // Neoverse V1 core 5 Name (_HID, "ACPI0007") Name (_UID, 5) Name (_STA, 0xF) } =20 - Device (CP06) { // Zeus core 6 + Device (CP06) { // Neoverse V1 core 6 Name (_HID, "ACPI0007") Name (_UID, 6) Name (_STA, 0xF) } =20 - Device (CP07) { // Zeus core 7 + Device (CP07) { // Neoverse V1 core 7 Name (_HID, "ACPI0007") Name (_UID, 7) Name (_STA, 0xF) } =20 - Device (CP08) { // Zeus core 8 + Device (CP08) { // Neoverse V1 core 8 Name (_HID, "ACPI0007") Name (_UID, 8) Name (_STA, 0xF) } =20 - Device (CP09) { // Zeus core 9 + Device (CP09) { // Neoverse V1 core 9 Name (_HID, "ACPI0007") Name (_UID, 9) Name (_STA, 0xF) } =20 - Device (CP10) { // Zeus core 10 + Device (CP10) { // Neoverse V1 core 10 Name (_HID, "ACPI0007") Name (_UID, 10) Name (_STA, 0xF) } =20 - Device (CP11) { // Zeus core 11 + Device (CP11) { // Neoverse V1 core 11 Name (_HID, "ACPI0007") Name (_UID, 11) Name (_STA, 0xF) } =20 - Device (CP12) { // Zeus core 12 + Device (CP12) { // Neoverse V1 core 12 Name (_HID, "ACPI0007") Name (_UID, 12) Name (_STA, 0xF) } =20 - Device (CP13) { // Zeus core 13 + Device (CP13) { // Neoverse V1 core 13 Name (_HID, "ACPI0007") Name (_UID, 13) Name (_STA, 0xF) } =20 - Device (CP14) { // Zeus core 14 + Device (CP14) { // Neoverse V1 core 14 Name (_HID, "ACPI0007") Name (_UID, 14) Name (_STA, 0xF) } =20 - 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/Plat= form/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 @@ =20 [Defines] INF_VERSION =3D 0x0001001A - BASE_NAME =3D RdDanielCfgMAcpiTables + BASE_NAME =3D RdV1AcpiTables FILE_GUID =3D c712719a-0aaf-438c-9cdd-35ab4d60207= d # gArmSgiAcpiTablesGuid MODULE_TYPE =3D USER_DEFINED VERSION_STRING =3D 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 =20 [Packages] diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h b/Platform/ARM/Sgi= Pkg/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 =20 -// 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 =20 #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 =3D RdDanielCfgM + PLATFORM_NAME =3D RdV1 PLATFORM_GUID =3D d301ac4e-0828-4cef-b754-34ca9b6781b= 5 PLATFORM_VERSION =3D 0.1 DSC_SPECIFICATION =3D 0x0001001B @@ -19,7 +19,7 @@ [Defines] BUILD_TARGETS =3D NOOPT|DEBUG|RELEASE SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/ARM/SgiPkg/SgiPlatform.fdf - BOARD_DXE_FV_COMPONENTS =3D Platform/ARM/SgiPkg/RdDanielCfgM/Rd= DanielCfgM.fdf.inc + BOARD_DXE_FV_COMPONENTS =3D Platform/ARM/SgiPkg/RdV1/RdV1.fdf.i= nc BUILD_NUMBER =3D 1 =20 # include common definitions from SgiPlatform.dsc @@ -48,4 +48,4 @@ [PcdsFixedAtBuild.common] ########################################################################= ######## =20 [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/Plat= form/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 =20 # ACPI support - INF RuleOverride=3DACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdDanielCf= gMAcpiTables.inf + INF RuleOverride=3DACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdV1AcpiTa= bles.inf --=20 2.17.1