From: "PierreGondois" <pierre.gondois@arm.com>
To: devel@edk2.groups.io
Cc: Pierre Gondois <pierre.gondois@arm.com>,
Pierre Gondois <Pierre.Gondois@arm.com>
Subject: [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 07/14] Platform/ARM: Morello,N1Sdp: Rename GicCToken
Date: Mon, 10 Jun 2024 11:33:58 +0200 [thread overview]
Message-ID: <20240610093405.1980592-8-Pierre.Gondois@arm.com> (raw)
In-Reply-To: <20240610093405.1980592-1-Pierre.Gondois@arm.com>
From: Pierre Gondois <pierre.gondois@arm.com>
Some DynamicTables objects have been moved from the Arm namespace
to a new Arch Common namespace. The following field:
(struct CmArchCommonProcHierarchyInfo).GicCToken
was renamed to 'AcpiIdObjectToken'. Reflect this change in the
edk2-platforms repository.
This patch modifies the ConfigurationManager of the following
platforms:
- Morello
- N1Sdp
Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
---
.../ConfigurationManager.c | 14 +++++-----
.../ConfigurationManager.c | 28 +++++++++----------
2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 7b6acd854fd3..640fdde96e2a 100644
--- a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -172,7 +172,7 @@ EDKII_COMMON_PLATFORM_REPOSITORY_INFO CommonPlatformInfo = {
),
// CM_OBJECT_TOKEN ParentToken
CM_NULL_TOKEN,
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
CM_NULL_TOKEN,
// UINT32 NoOfPrivateResources
SOC_RESOURCE_COUNT,
@@ -194,7 +194,7 @@ EDKII_COMMON_PLATFORM_REPOSITORY_INFO CommonPlatformInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[0]), // -> Package
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
CM_NULL_TOKEN,
// UINT32 NoOfPrivateResources
CLUSTER_RESOURCE_COUNT,
@@ -215,7 +215,7 @@ EDKII_COMMON_PLATFORM_REPOSITORY_INFO CommonPlatformInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[0]), // -> Package
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
CM_NULL_TOKEN,
// UINT32 NoOfPrivateResources
CLUSTER_RESOURCE_COUNT,
@@ -236,7 +236,7 @@ EDKII_COMMON_PLATFORM_REPOSITORY_INFO CommonPlatformInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[1]), // -> 'cluster in Cluster0
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[0]),
// UINT32 NoOfPrivateResources
CORE_RESOURCE_COUNT,
@@ -257,7 +257,7 @@ EDKII_COMMON_PLATFORM_REPOSITORY_INFO CommonPlatformInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[1]), // -> 'cluster in Cluster0
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[1]),
// UINT32 NoOfPrivateResources
CORE_RESOURCE_COUNT,
@@ -278,7 +278,7 @@ EDKII_COMMON_PLATFORM_REPOSITORY_INFO CommonPlatformInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[2]), // -> 'cluster in Cluster1
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[2]),
// UINT32 NoOfPrivateResources
CORE_RESOURCE_COUNT,
@@ -300,7 +300,7 @@ EDKII_COMMON_PLATFORM_REPOSITORY_INFO CommonPlatformInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[2]), // -> 'cluster in Cluster1
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[3]),
// UINT32 NoOfPrivateResources
CORE_RESOURCE_COUNT,
diff --git a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 5713bb578029..c23fa78038fa 100644
--- a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++ b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -341,7 +341,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
CM_NULL_TOKEN,
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
CM_NULL_TOKEN,
// UINT32 NoOfPrivateResources
SOC_RESOURCE_COUNT,
@@ -362,7 +362,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[0]), // -> Package
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
CM_NULL_TOKEN,
// UINT32 NoOfPrivateResources
CLUSTER_RESOURCE_COUNT,
@@ -383,7 +383,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[0]), // -> Package
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
CM_NULL_TOKEN,
// UINT32 NoOfPrivateResources
CLUSTER_RESOURCE_COUNT,
@@ -404,7 +404,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[1]), // -> 'cluster in Cluster0
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[0]),
// UINT32 NoOfPrivateResources
CORE_RESOURCE_COUNT,
@@ -425,7 +425,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[1]), // -> 'cluster in Cluster0
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[1]),
// UINT32 NoOfPrivateResources
CORE_RESOURCE_COUNT,
@@ -446,7 +446,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[2]), // -> 'cluster in Cluster1
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[2]),
// UINT32 NoOfPrivateResources
CORE_RESOURCE_COUNT,
@@ -467,7 +467,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[2]), // -> 'cluster in Cluster1
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[3]),
// UINT32 NoOfPrivateResources
CORE_RESOURCE_COUNT,
@@ -489,7 +489,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
CM_NULL_TOKEN,
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
CM_NULL_TOKEN,
// UINT32 NoOfPrivateResources
SOC_RESOURCE_COUNT,
@@ -510,7 +510,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[7]), // -> Package
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
CM_NULL_TOKEN,
// UINT32 NoOfPrivateResources
CLUSTER_RESOURCE_COUNT,
@@ -531,7 +531,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[7]), // -> Package
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
CM_NULL_TOKEN,
// UINT32 NoOfPrivateResources
CLUSTER_RESOURCE_COUNT,
@@ -552,7 +552,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[8]), // -> 'cluster in Cluster0
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[4]),
// UINT32 NoOfPrivateResources
CORE_RESOURCE_COUNT,
@@ -573,7 +573,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[8]), // -> 'cluster in Cluster0
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[5]),
// UINT32 NoOfPrivateResources
CORE_RESOURCE_COUNT,
@@ -594,7 +594,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[9]), // -> 'cluster in Cluster1
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[6]),
// UINT32 NoOfPrivateResources
CORE_RESOURCE_COUNT,
@@ -615,7 +615,7 @@ EDKII_PLATFORM_REPOSITORY_INFO N1sdpRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[9]), // -> 'cluster in Cluster1
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[7]),
// UINT32 NoOfPrivateResources
CORE_RESOURCE_COUNT,
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119527): https://edk2.groups.io/g/devel/message/119527
Mute This Topic: https://groups.io/mt/106589345/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2024-06-10 9:34 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-10 9:33 [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj to Arch Common PierreGondois
2024-06-10 9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 01/14] Platform/ARM: Morello,N1Sdp: Add Arch Common objects handler PierreGondois
2024-06-10 9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 02/14] Platform/ARM: Morello,N1Sdp: Move Power Mgmt Profile info to Arch Common PierreGondois
2024-06-10 9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 03/14] Platform/ARM: Morello,N1Sdp: Move Serial Port " PierreGondois
2024-06-10 9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 04/14] Platform/ARM: Morello,N1Sdp: Move Fixed Feat Flags " PierreGondois
2024-06-10 9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 05/14] Platform/ARM: Morello,N1Sdp: Move CmRef " PierreGondois
2024-06-10 9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 06/14] Platform/ARM: Morello,N1Sdp: Move Pci Config Space " PierreGondois
2024-06-10 9:33 ` PierreGondois [this message]
2024-06-10 9:33 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 08/14] Platform/ARM: Morello,N1Sdp: Move Proc Hierarchy " PierreGondois
2024-06-10 9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 09/14] Platform/ARM: Morello,N1Sdp: Move Cache " PierreGondois
2024-06-10 9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 10/14] Platform/ARM: N1Sdp: Move Memory Affinity " PierreGondois
2024-06-10 9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 11/14] Platform/NXP: Add Arch Common objects handler PierreGondois
2024-06-11 13:33 ` Sami Mujawar
2024-06-10 9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 12/14] Platform/NXP: Move Power Mgmt Profile info to Arch Common PierreGondois
2024-06-10 9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 13/14] Platform/NXP: Move Serial Port " PierreGondois
2024-06-10 9:34 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 14/14] Platform/NXP: Move Pci Config Space " PierreGondois
2024-06-11 13:29 ` [edk2-devel] [platforms/devel-dynamictables-reorg PATCH 00/14] Platform: N1Sdp,Morello,NXP: Move DynamicTablesPkg obj " Sami Mujawar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240610093405.1980592-8-Pierre.Gondois@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox