From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=217.140.101.70; helo=foss.arm.com; envelope-from=jagadeesh.ujja@arm.com; receiver=edk2-devel@lists.01.org Received: from foss.arm.com (usa-sjc-mx-foss1.foss.arm.com [217.140.101.70]) by ml01.01.org (Postfix) with ESMTP id 2C1AA2194EB7A for ; Mon, 4 Mar 2019 22:41:54 -0800 (PST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id C6C5280D; Mon, 4 Mar 2019 22:41:53 -0800 (PST) Received: from usa.arm.com (a075556-lin.blr.arm.com [10.162.2.22]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 726123F706; Mon, 4 Mar 2019 22:41:52 -0800 (PST) From: Jagadeesh Ujja To: edk2-devel@lists.01.org, leif.lindholm@linaro.org, ard.biesheuvel@linaro.org Date: Tue, 5 Mar 2019 12:11:39 +0530 Message-Id: <1551768099-14310-3-git-send-email-jagadeesh.ujja@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1551768099-14310-1-git-send-email-jagadeesh.ujja@arm.com> References: <1551768099-14310-1-git-send-email-jagadeesh.ujja@arm.com> Subject: [PATCH edk2-platforms 2/2] Platforms/ARM/SgiPkg: Rename SgiClarkHelios to RdE1Edge X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 Mar 2019 06:41:54 -0000 Replace all usage of 'SgiClark' with 'RdN1E1Edge' and 'SgiClarkHelios with 'RdE1Edge' as per the updated product names. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Jagadeesh Ujja --- Platform/ARM/SgiPkg/AcpiTables/{SgiClarkHelios => RdE1Edge}/Dsdt.asl | 66 ++++++++++---------- Platform/ARM/SgiPkg/AcpiTables/{SgiClarkHelios => RdE1Edge}/Madt.aslc | 0 Platform/ARM/SgiPkg/AcpiTables/{SgiClarkHeliosAcpiTables.inf => RdE1EdgeAcpiTables.inf} | 6 +- Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c | 4 +- Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf | 2 +- Platform/ARM/SgiPkg/Include/SgiPlatform.h | 2 +- Platform/ARM/SgiPkg/SgiPlatform.dec | 2 +- Platform/ARM/SgiPkg/SgiPlatform.dsc | 2 +- Platform/ARM/SgiPkg/SgiPlatform.fdf | 2 +- 9 files changed, 43 insertions(+), 43 deletions(-) diff --git a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkHelios/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl similarity index 68% rename from Platform/ARM/SgiPkg/AcpiTables/SgiClarkHelios/Dsdt.asl rename to Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl index 7cfc419..c2f2dfb 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkHelios/Dsdt.asl +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Dsdt.asl @@ -20,195 +20,195 @@ DefinitionBlock ("DsdtTable.aml", "DSDT", 1, "ARMLTD", "ARMSGI", EFI_ACPI_ARM_OEM_REVISION) { Scope (_SB) { // - // HeliosCores 8X2 Processor declaration + // Neoverse-E1 8X2 Processor declaration // - Device (CP00) { // HeliosCore: Cluster 0, Cpu 0, Thread 0 + Device (CP00) { // Neoverse-E1: Cluster 0, Cpu 0, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 0) Name (_STA, 0xF) } - Device (CP01) { // HeliosCore: Cluster 0, Cpu 0, Thread 1 + Device (CP01) { // Neoverse-E1: Cluster 0, Cpu 0, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 1) Name (_STA, 0xF) } - Device (CP02) { // HeliosCore: Cluster 0, Cpu 1, Thread 0 + Device (CP02) { // Neoverse-E1: Cluster 0, Cpu 1, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 2) Name (_STA, 0xF) } - Device (CP03) { // HeliosCore: Cluster 0, Cpu 1, Thread 1 + Device (CP03) { // Neoverse-E1: Cluster 0, Cpu 1, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 3) Name (_STA, 0xF) } - Device (CP04) { // HeliosCore: Cluster 0, Cpu 2, Thread 0 + Device (CP04) { // Neoverse-E1: Cluster 0, Cpu 2, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 4) Name (_STA, 0xF) } - Device (CP05) { // HeliosCore: Cluster 0, Cpu 2, Thread 1 + Device (CP05) { // Neoverse-E1: Cluster 0, Cpu 2, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 5) Name (_STA, 0xF) } - Device (CP06) { // HeliosCore: Cluster 0, Cpu 3, Thread 0 + Device (CP06) { // Neoverse-E1: Cluster 0, Cpu 3, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 6) Name (_STA, 0xF) } - Device (CP07) { // HeliosCore: Cluster 0, Cpu 3, Thread 1 + Device (CP07) { // Neoverse-E1: Cluster 0, Cpu 3, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 7) Name (_STA, 0xF) } - Device (CP08) { // HeliosCore: Cluster 0, Cpu 4, Thread 0 + Device (CP08) { // Neoverse-E1: Cluster 0, Cpu 4, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 8) Name (_STA, 0xF) } - Device (CP09) { // HeliosCore: Cluster 0, Cpu 4, Thread 1 + Device (CP09) { // Neoverse-E1: Cluster 0, Cpu 4, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 9) Name (_STA, 0xF) } - Device (CP10) { // HeliosCore: Cluster 0, Cpu 5, Thread 0 + Device (CP10) { // Neoverse-E1: Cluster 0, Cpu 5, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 10) Name (_STA, 0xF) } - Device (CP11) { // HeliosCore: Cluster 0, Cpu 5, Thread 1 + Device (CP11) { // Neoverse-E1: Cluster 0, Cpu 5, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 11) Name (_STA, 0xF) } - Device (CP12) { // HeliosCore: Cluster 0, Cpu 6, Thread 0 + Device (CP12) { // Neoverse-E1: Cluster 0, Cpu 6, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 12) Name (_STA, 0xF) } - Device (CP13) { // HeliosCore: Cluster 0, Cpu 6, Thread 1 + Device (CP13) { // Neoverse-E1: Cluster 0, Cpu 6, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 13) Name (_STA, 0xF) } - Device (CP14) { // HeliosCore: Cluster 0, Cpu 7, Thread 0 + Device (CP14) { // Neoverse-E1: Cluster 0, Cpu 7, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 14) Name (_STA, 0xF) } - Device (CP15) { // HeliosCore: Cluster 0, Cpu 7, Thread 1 + Device (CP15) { // Neoverse-E1: Cluster 0, Cpu 7, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 15) Name (_STA, 0xF) } - Device (CP16) { // HeliosCore: Cluster 0, Cpu 0, Thread 0 + Device (CP16) { // Neoverse-E1: Cluster 0, Cpu 0, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 16) Name (_STA, 0xF) } - Device (CP17) { // HeliosCore: Cluster 0, Cpu 0, Thread 1 + Device (CP17) { // Neoverse-E1: Cluster 0, Cpu 0, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 17) Name (_STA, 0xF) } - Device (CP18) { // HeliosCore: Cluster 0, Cpu 1, Thread 0 + Device (CP18) { // Neoverse-E1: Cluster 0, Cpu 1, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 18) Name (_STA, 0xF) } - Device (CP19) { // HeliosCore: Cluster 0, Cpu 1, Thread 1 + Device (CP19) { // Neoverse-E1: Cluster 0, Cpu 1, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 19) Name (_STA, 0xF) } - Device (CP20) { // HeliosCore: Cluster 0, Cpu 2, Thread 0 + Device (CP20) { // Neoverse-E1: Cluster 0, Cpu 2, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 20) Name (_STA, 0xF) } - Device (CP21) { // HeliosCore: Cluster 0, Cpu 2, Thread 1 + Device (CP21) { // Neoverse-E1: Cluster 0, Cpu 2, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 21) Name (_STA, 0xF) } - Device (CP22) { // HeliosCore: Cluster 0, Cpu 3, Thread 0 + Device (CP22) { // Neoverse-E1: Cluster 0, Cpu 3, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 22) Name (_STA, 0xF) } - Device (CP23) { // HeliosCore: Cluster 0, Cpu 3, Thread 1 + Device (CP23) { // Neoverse-E1: Cluster 0, Cpu 3, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 23) Name (_STA, 0xF) } - Device (CP24) { // HeliosCore: Cluster 0, Cpu 4, Thread 0 + Device (CP24) { // Neoverse-E1: Cluster 0, Cpu 4, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 24) Name (_STA, 0xF) } - Device (CP25) { // HeliosCore: Cluster 0, Cpu 4, Thread 1 + Device (CP25) { // Neoverse-E1: Cluster 0, Cpu 4, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 25) Name (_STA, 0xF) } - Device (CP26) { // HeliosCore: Cluster 0, Cpu 5, Thread 0 + Device (CP26) { // Neoverse-E1: Cluster 0, Cpu 5, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 26) Name (_STA, 0xF) } - Device (CP27) { // HeliosCore: Cluster 0, Cpu 5, Thread 1 + Device (CP27) { // Neoverse-E1: Cluster 0, Cpu 5, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 27) Name (_STA, 0xF) } - Device (CP28) { // HeliosCore: Cluster 0, Cpu 6, Thread 0 + Device (CP28) { // Neoverse-E1: Cluster 0, Cpu 6, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 28) Name (_STA, 0xF) } - Device (CP29) { // HeliosCore: Cluster 0, Cpu 6, Thread 1 + Device (CP29) { // Neoverse-E1: Cluster 0, Cpu 6, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 29) Name (_STA, 0xF) } - Device (CP30) { // HeliosCore: Cluster 0, Cpu 7, Thread 0 + Device (CP30) { // Neoverse-E1: Cluster 0, Cpu 7, Thread 0 Name (_HID, "ACPI0007") Name (_UID, 30) Name (_STA, 0xF) } - Device (CP31) { // HeliosCore: Cluster 0, Cpu 7, Thread 1 + Device (CP31) { // Neoverse-E1: Cluster 0, Cpu 7, Thread 1 Name (_HID, "ACPI0007") Name (_UID, 31) Name (_STA, 0xF) diff --git a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkHelios/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc similarity index 100% rename from Platform/ARM/SgiPkg/AcpiTables/SgiClarkHelios/Madt.aslc rename to Platform/ARM/SgiPkg/AcpiTables/RdE1Edge/Madt.aslc diff --git a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkHeliosAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf similarity index 91% rename from Platform/ARM/SgiPkg/AcpiTables/SgiClarkHeliosAcpiTables.inf rename to Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf index 8b45702..da6d634 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/SgiClarkHeliosAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf @@ -15,7 +15,7 @@ [Defines] INF_VERSION = 0x0001001A - BASE_NAME = SgiClarkHeliosAcpiTables + BASE_NAME = RdE1EdgeAcpiTables FILE_GUID = 2af40815-a84e-4de9-8c38-9140b3544073 MODULE_TYPE = USER_DEFINED VERSION_STRING = 1.0 @@ -26,8 +26,8 @@ Gtdt.aslc Iort.aslc Mcfg.aslc - SgiClarkHelios/Dsdt.asl - SgiClarkHelios/Madt.aslc + RdE1Edge/Dsdt.asl + RdE1Edge/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 e00febd..cc9b0a6 100644 --- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c +++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.c @@ -52,8 +52,8 @@ ArmSgiPkgEntryPoint ( (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); + (ConfigId == RD_E1_EDGE_CONF_ID)) { + Status = LocateAndInstallAcpiFromFv (&gRdE1EdgeAcpiTablesFileGuid); } else { Status = EFI_UNSUPPORTED; } diff --git a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf index 7b8b3b6..7752256 100644 --- a/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf +++ b/Platform/ARM/SgiPkg/Drivers/PlatformDxe/PlatformDxe.inf @@ -38,7 +38,7 @@ gArmSgiPlatformIdDescriptorGuid gSgi575AcpiTablesFileGuid gRdN1EdgeAcpiTablesFileGuid - gSgiClarkHeliosAcpiTablesFileGuid + gRdE1EdgeAcpiTablesFileGuid [FeaturePcd] gArmSgiTokenSpaceGuid.PcdVirtioBlkSupported diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h b/Platform/ARM/SgiPkg/Include/SgiPlatform.h index 99bad78..e89a508 100644 --- a/Platform/ARM/SgiPkg/Include/SgiPlatform.h +++ b/Platform/ARM/SgiPkg/Include/SgiPlatform.h @@ -79,7 +79,7 @@ //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 RD_E1_EDGE_CONF_ID 0x2 #define SGI_CONFIG_MASK 0x0F #define SGI_CONFIG_SHIFT 0x1C diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dec b/Platform/ARM/SgiPkg/SgiPlatform.dec index 512ee4c..612c494 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.dec +++ b/Platform/ARM/SgiPkg/SgiPlatform.dec @@ -34,7 +34,7 @@ gArmSgiTokenSpaceGuid = { 0x577d6941, 0xaea1, 0x40b4, { 0x90, 0x93, 0x2a, 0x86, 0x61, 0x72, 0x5a, 0x57 } } gSgi575AcpiTablesFileGuid = { 0xc712719a, 0x0aaf, 0x438c, { 0x9c, 0xdd, 0x35, 0xab, 0x4d, 0x60, 0x20, 0x7d } } gRdN1EdgeAcpiTablesFileGuid = { 0x4b0b91d0, 0x4a05, 0x45c4, { 0x88, 0xa7, 0x88, 0xe1, 0x70, 0xe7, 0x66, 0x94 } } - gSgiClarkHeliosAcpiTablesFileGuid = { 0x2af40815, 0xa84e, 0x4de9, { 0x8c, 0x38, 0x91, 0x40, 0xb3, 0x54, 0x40, 0x73 } } + gRdE1EdgeAcpiTablesFileGuid = { 0x2af40815, 0xa84e, 0x4de9, { 0x8c, 0x38, 0x91, 0x40, 0xb3, 0x54, 0x40, 0x73 } } [PcdsFeatureFlag.common] gArmSgiTokenSpaceGuid.PcdVirtioBlkSupported|FALSE|BOOLEAN|0x00000001 diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc b/Platform/ARM/SgiPkg/SgiPlatform.dsc index f2d6672..ae55139 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc @@ -282,7 +282,7 @@ MdeModulePkg/Universal/Acpi/AcpiTableDxe/AcpiTableDxe.inf Platform/ARM/SgiPkg/AcpiTables/Sgi575AcpiTables.inf Platform/ARM/SgiPkg/AcpiTables/RdN1EdgeAcpiTables.inf - Platform/ARM/SgiPkg/AcpiTables/SgiClarkHeliosAcpiTables.inf + Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf # diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiPlatform.fdf index 5e8ccec..3d450a8 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf @@ -107,7 +107,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/RdN1EdgeAcpiTables.inf - INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/SgiClarkHeliosAcpiTables.inf + INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdE1EdgeAcpiTables.inf INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf # Required by PCI -- 2.7.4