From: Pierre Gondois <pierre.gond...@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.gond...@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/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
