Some DynamicTables objects have been moved from the Arm namespace to a new Arch Common namespace. Reflect this change by renaming/moving the relevant object.
This patch modifies the ConfigurationManager of the following platforms: - Juno for the following Arch Common object Id: - EArchCommonObjProcHierarchyInfo 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 | 20 +++++++++---------- .../ConfigurationManager.h | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c index 54c71c11e656..fbcbe97bf02e 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c @@ -1742,6 +1742,16 @@ GetArchCommonNameSpaceObject ( ); break; + case EArchCommonObjProcHierarchyInfo: + Status = HandleCmObject ( + CmObjectId, + PlatformRepo->ProcHierarchyInfo, + sizeof (PlatformRepo->ProcHierarchyInfo), + ARRAY_SIZE (PlatformRepo->ProcHierarchyInfo), + CmObject + ); + break; + default: { Status = EFI_NOT_FOUND; DEBUG (( @@ -1890,16 +1900,6 @@ GetArmNameSpaceObject ( ); break; - case EArmObjProcHierarchyInfo: - Status = HandleCmObject ( - CmObjectId, - PlatformRepo->ProcHierarchyInfo, - sizeof (PlatformRepo->ProcHierarchyInfo), - ARRAY_SIZE (PlatformRepo->ProcHierarchyInfo), - CmObject - ); - break; - case EArmObjCacheInfo: Status = HandleCmObject ( CmObjectId, diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h index f34aa087aa31..8517eae3f8da 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h @@ -274,7 +274,7 @@ typedef struct PlatformRepositoryInfo { CM_ARM_GIC_MSI_FRAME_INFO GicMsiFrameInfo; // Processor topology information - CM_ARM_PROC_HIERARCHY_INFO ProcHierarchyInfo[PLAT_PROC_HIERARCHY_NODE_COUNT]; + CM_ARCH_COMMON_PROC_HIERARCHY_INFO ProcHierarchyInfo[PLAT_PROC_HIERARCHY_NODE_COUNT]; // Cache information CM_ARM_CACHE_INFO CacheInfo[PLAT_CACHE_COUNT]; -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117012): https://edk2.groups.io/g/devel/message/117012 Mute This Topic: https://groups.io/mt/105069947/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-