Change all occurrences of RD-Fremont to RD-V3 to align with the official platform name.
Signed-off-by: Prabin CA <prabin...@arm.com> --- Platform/ARM/SgiPkg/{RdFremont/RdFremont.dsc => RdV3/RdV3.dsc} | 6 +++--- Platform/ARM/SgiPkg/AcpiTables/{RdFremontAcpiTables.inf => RdV3AcpiTables.inf} | 8 ++++---- Platform/ARM/SgiPkg/Include/SgiPlatform.h | 8 ++++---- Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type1SystemInformation.c | 4 ++-- Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type4ProcessorInformation.c | 2 +- Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type7CacheInformation.c | 2 +- Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c | 6 +++--- Platform/ARM/SgiPkg/AcpiTables/{RdFremont => RdV3}/Dsdt.asl | 0 Platform/ARM/SgiPkg/AcpiTables/{RdFremont => RdV3}/Madt.aslc | 0 Platform/ARM/SgiPkg/AcpiTables/{RdFremont => RdV3}/Pptt.aslc | 8 ++++---- Platform/ARM/SgiPkg/{RdFremont/RdFremont.fdf.inc => RdV3/RdV3.fdf.inc} | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Platform/ARM/SgiPkg/RdFremont/RdFremont.dsc b/Platform/ARM/SgiPkg/RdV3/RdV3.dsc similarity index 88% rename from Platform/ARM/SgiPkg/RdFremont/RdFremont.dsc rename to Platform/ARM/SgiPkg/RdV3/RdV3.dsc index b52d2f59e15d..cf7606a5d147 100644 --- a/Platform/ARM/SgiPkg/RdFremont/RdFremont.dsc +++ b/Platform/ARM/SgiPkg/RdV3/RdV3.dsc @@ -10,7 +10,7 @@ # ################################################################################ [Defines] - PLATFORM_NAME = RdFremont + PLATFORM_NAME = RdV3 PLATFORM_GUID = fd140b0f-4467-4314-aa69-cd0bd712e08e 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/RdFremont/RdFremont.fdf.inc + BOARD_DXE_FV_COMPONENTS = Platform/ARM/SgiPkg/RdV3/RdV3.fdf.inc BUILD_NUMBER = 1 # include common definitions from SgiPlatform.dsc @@ -52,4 +52,4 @@ [PcdsFixedAtBuild.common] ################################################################################ [Components.common] - Platform/ARM/SgiPkg/AcpiTables/RdFremontAcpiTables.inf + Platform/ARM/SgiPkg/AcpiTables/RdV3AcpiTables.inf diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdFremontAcpiTables.inf b/Platform/ARM/SgiPkg/AcpiTables/RdV3AcpiTables.inf similarity index 92% rename from Platform/ARM/SgiPkg/AcpiTables/RdFremontAcpiTables.inf rename to Platform/ARM/SgiPkg/AcpiTables/RdV3AcpiTables.inf index fcaa3299c4ea..6775c1e91a87 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdFremontAcpiTables.inf +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV3AcpiTables.inf @@ -9,7 +9,7 @@ [Defines] INF_VERSION = 0x0001001A - BASE_NAME = RdFremontAcpiTables + BASE_NAME = RdV3AcpiTables FILE_GUID = c712719a-0aaf-438c-9cdd-35ab4d60207d # gArmSgiAcpiTablesGuid MODULE_TYPE = USER_DEFINED VERSION_STRING = 1.0 @@ -18,9 +18,9 @@ [Sources] Dbg2.aslc Fadt.aslc Gtdt.aslc - RdFremont/Dsdt.asl - RdFremont/Madt.aslc - RdFremont/Pptt.aslc + RdV3/Dsdt.asl + RdV3/Madt.aslc + RdV3/Pptt.aslc Spcr.aslc SsdtEvents.asl SsdtRos.asl diff --git a/Platform/ARM/SgiPkg/Include/SgiPlatform.h b/Platform/ARM/SgiPkg/Include/SgiPlatform.h index acfa45910aed..e4bc8fe723c3 100644 --- a/Platform/ARM/SgiPkg/Include/SgiPlatform.h +++ b/Platform/ARM/SgiPkg/Include/SgiPlatform.h @@ -51,9 +51,9 @@ #define RD_V2_PART_NUM 0x7F2 #define RD_V2_CONF_ID 0x1 -// RD-Fremont Platform Identification values -#define RD_Fremont_PART_NUM 0x7EE -#define RD_Fremont_CONF_ID 0x1 +// RD-V3 Platform Identification values +#define RD_V3_PART_NUM 0x7EE +#define RD_V3_CONF_ID 0x1 #define SGI_CONFIG_MASK 0x0F #define SGI_CONFIG_SHIFT 0x1C @@ -94,7 +94,7 @@ typedef enum { RdN2Cfg1, RdN2Cfg2, RdV2, - RdFremont, + RdV3, } ARM_RD_PRODUCT_ID; // Arm ProductId look-up table diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type1SystemInformation.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type1SystemInformation.c index 9c28b051ebc2..c6d809a98d67 100644 --- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type1SystemInformation.c +++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type1SystemInformation.c @@ -35,7 +35,7 @@ "RdN2Cfg1\0" \ "RdN2Cfg2\0" \ "RdV2\0" \ - "RdFremont\0" + "RdV3\0" typedef enum { ManufacturerName = 1, @@ -75,7 +75,7 @@ STATIC GUID mSmbiosUid[] = { {0xd2946d07, 0x8057, 0x4c26, {0xbf, 0x53, 0x78, 0xa6, 0x5b, 0xe1, 0xc1, 0x60}}, /* Rd-V2 */ {0x3b1180a3, 0x0744, 0x4194, {0xae, 0x2e, 0xed, 0xa5, 0xbc, 0x2e, 0x43, 0x45}}, - /* Rd-Fremont */ + /* Rd-V3 */ {0x904b28d6, 0x0662, 0x11ed, {0xb9, 0x39, 0x02, 0x42, 0xac, 0x12, 0x00, 0x02}}, }; diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type4ProcessorInformation.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type4ProcessorInformation.c index c39c1553f6aa..c9c4dbda5fa6 100644 --- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type4ProcessorInformation.c +++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type4ProcessorInformation.c @@ -183,7 +183,7 @@ InstallType4ProcessorInformation ( case RdN2: case RdN2Cfg1: case RdV2: - case RdFremont: + case RdV3: mArmRdSmbiosType4.Base.CoreCount = CoreCount; mArmRdSmbiosType4.Base.EnabledCoreCount = CoreCount; mArmRdSmbiosType4.Base.ThreadCount = CoreCount; diff --git a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type7CacheInformation.c b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type7CacheInformation.c index 4cdea5b3b763..1e4d5a3d6128 100644 --- a/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type7CacheInformation.c +++ b/Platform/ARM/SgiPkg/Drivers/SmbiosPlatformDxe/Type7CacheInformation.c @@ -335,7 +335,7 @@ InstallType7CacheInformation ( mArmRdSmbiosType7[4].Base.Associativity = CacheAssociativity16Way; break; case RdV2: - case RdFremont: + case RdV3: /* L1 instruction cache */ mArmRdSmbiosType7[0].Base.MaximumCacheSize2 = 64; // 64KB mArmRdSmbiosType7[0].Base.InstalledSize2 = 64; // 64KB diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c index ae31be142d12..ecefa8750834 100644 --- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c +++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c @@ -86,9 +86,9 @@ STATIC CONST SGI_PRODUCT_ID_LOOKUP SgiProductIdLookup[] = { 0 }, { - RdFremont, - RD_Fremont_PART_NUM, - RD_Fremont_CONF_ID, + RdV3, + RD_V3_PART_NUM, + RD_V3_CONF_ID, 0 }, }; diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdFremont/Dsdt.asl b/Platform/ARM/SgiPkg/AcpiTables/RdV3/Dsdt.asl similarity index 100% rename from Platform/ARM/SgiPkg/AcpiTables/RdFremont/Dsdt.asl rename to Platform/ARM/SgiPkg/AcpiTables/RdV3/Dsdt.asl diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdFremont/Madt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdV3/Madt.aslc similarity index 100% rename from Platform/ARM/SgiPkg/AcpiTables/RdFremont/Madt.aslc rename to Platform/ARM/SgiPkg/AcpiTables/RdV3/Madt.aslc diff --git a/Platform/ARM/SgiPkg/AcpiTables/RdFremont/Pptt.aslc b/Platform/ARM/SgiPkg/AcpiTables/RdV3/Pptt.aslc similarity index 94% rename from Platform/ARM/SgiPkg/AcpiTables/RdFremont/Pptt.aslc rename to Platform/ARM/SgiPkg/AcpiTables/RdV3/Pptt.aslc index 28cb6d452479..fe5b60001515 100644 --- a/Platform/ARM/SgiPkg/AcpiTables/RdFremont/Pptt.aslc +++ b/Platform/ARM/SgiPkg/AcpiTables/RdV3/Pptt.aslc @@ -1,14 +1,14 @@ /** @file -* Processor Properties Topology Table (PPTT) for RD-Fremont platform +* Processor Properties Topology Table (PPTT) for RD-V3 platform * * Copyright (c) 2024, Arm Limited. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * * This file describes the topological structure of the processor block on the -* RD-Fremont platform in the form as defined by ACPI PPTT table. The RD-Fremont -* platform includes sixteen single-thread CPUs. Each of the CPUs include 64KB -* L1 Data cache, 64KB L1 Instruction cache and 2MB L2 cache. +* RD-V3 platform in the form as defined by ACPI PPTT table. The RD-V3 platform +* includes sixteen single-thread CPUs. Each of the CPUs include 64KB L1 Data +* cache, 64KB L1 Instruction cache and 2MB L2 cache. * * @par Specification Reference: * - ACPI 6.4, Chapter 5, Section 5.2.29, Processor Properties Topology Table diff --git a/Platform/ARM/SgiPkg/RdFremont/RdFremont.fdf.inc b/Platform/ARM/SgiPkg/RdV3/RdV3.fdf.inc similarity index 67% rename from Platform/ARM/SgiPkg/RdFremont/RdFremont.fdf.inc rename to Platform/ARM/SgiPkg/RdV3/RdV3.fdf.inc index a465b7426653..89140426372c 100644 --- a/Platform/ARM/SgiPkg/RdFremont/RdFremont.fdf.inc +++ b/Platform/ARM/SgiPkg/RdV3/RdV3.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/RdFremontAcpiTables.inf + INF RuleOverride=ACPITABLE Platform/ARM/SgiPkg/AcpiTables/RdV3AcpiTables.inf -- 2.34.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#119801): https://edk2.groups.io/g/devel/message/119801 Mute This Topic: https://groups.io/mt/107049626/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-