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:
- Juno
Cc: Sami Mujawar <sami.muja...@arm.com>
Cc: Pierre Gondois <pierre.gond...@arm.com>
Cc: Yeo Reum Yun <yeoreum....@arm.com>
Cc: AbdulLateef Attar <abdullateef.at...@amd.com>
Cc: Jeshua Smith <jesh...@nvidia.com>
Cc: Jeff Brasen <jbra...@nvidia.com>
Cc: Girish Mahadevan <gmahade...@nvidia.com>
Cc: Leif Lindholm <quic_llind...@quicinc.com>
Cc: Meenakshi Aggarwal <meenakshi.aggar...@nxp.com>
Signed-off-by: Pierre Gondois <pierre.gond...@arm.com>
---
.../ConfigurationManager.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git
a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index a6ded5a38629..54c71c11e656 100644
---
a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++
b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -361,7 +361,7 @@ EDKII_PLATFORM_REPOSITORY_INFO
ArmJunoPlatformRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
CM_NULL_TOKEN,
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
CM_NULL_TOKEN,
// UINT32 NoOfPrivateResources
0,
@@ -384,7 +384,7 @@ EDKII_PLATFORM_REPOSITORY_INFO
ArmJunoPlatformRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[0]), // -> Package
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
CM_NULL_TOKEN,
// UINT32 NoOfPrivateResources
BIG_CLUSTER_RESOURCE_COUNT,
@@ -407,7 +407,7 @@ EDKII_PLATFORM_REPOSITORY_INFO
ArmJunoPlatformRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[0]), // -> Package
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
CM_NULL_TOKEN,
// UINT32 NoOfPrivateResources
LITTLE_CLUSTER_RESOURCE_COUNT,
@@ -430,7 +430,7 @@ EDKII_PLATFORM_REPOSITORY_INFO
ArmJunoPlatformRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[1]), // -> 'big' cluster
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[0]),
// UINT32 NoOfPrivateResources
BIG_CORE_RESOURCE_COUNT,
@@ -452,7 +452,7 @@ EDKII_PLATFORM_REPOSITORY_INFO
ArmJunoPlatformRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[1]), // -> 'big' cluster
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[1]),
// UINT32 NoOfPrivateResources
BIG_CORE_RESOURCE_COUNT,
@@ -475,7 +475,7 @@ EDKII_PLATFORM_REPOSITORY_INFO
ArmJunoPlatformRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[2]), // -> 'LITTLE' cluster
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[2]),
// UINT32 NoOfPrivateResources
LITTLE_CORE_RESOURCE_COUNT,
@@ -497,7 +497,7 @@ EDKII_PLATFORM_REPOSITORY_INFO
ArmJunoPlatformRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[2]), // -> 'LITTLE' cluster
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[3]),
// UINT32 NoOfPrivateResources
LITTLE_CORE_RESOURCE_COUNT,
@@ -519,7 +519,7 @@ EDKII_PLATFORM_REPOSITORY_INFO
ArmJunoPlatformRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[2]), // -> 'LITTLE' cluster
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[4]),
// UINT32 NoOfPrivateResources
LITTLE_CORE_RESOURCE_COUNT,
@@ -541,7 +541,7 @@ EDKII_PLATFORM_REPOSITORY_INFO
ArmJunoPlatformRepositoryInfo = {
),
// CM_OBJECT_TOKEN ParentToken
REFERENCE_TOKEN (ProcHierarchyInfo[2]), // -> 'LITTLE' cluster
- // CM_OBJECT_TOKEN GicCToken
+ // CM_OBJECT_TOKEN AcpiIdObjectToken
REFERENCE_TOKEN (GicCInfo[5]),
// UINT32 NoOfPrivateResources
LITTLE_CORE_RESOURCE_COUNT,
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#117011): https://edk2.groups.io/g/devel/message/117011
Mute This Topic: https://groups.io/mt/105069946/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
