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: - EArchCommonObjCpcInfo 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 | 28 +++++++++---------- .../ConfigurationManager.h | 2 +- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c index 0ccd110eab71..c63b8bc68d3f 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c @@ -1404,7 +1404,7 @@ GetPsdInfo ( @param [in] This Pointer to the Configuration Manager Protocol. @param [in] CmObjectId The Object ID of the CM object requested @param [in] SearchToken A unique token for identifying the requested - CM_ARM_PCI_INTERRUPT_MAP_INFO object. + CM_ARCH_COMMON_CPC_INFO object. @param [in, out] CmObject Pointer to the Configuration Manager Object descriptor describing the requested Object. @@ -1762,6 +1762,19 @@ GetArchCommonNameSpaceObject ( ); break; + case EArchCommonObjCpcInfo: + Status = HandleCmObjectRefByToken ( + This, + CmObjectId, + PlatformRepo->CpcInfo, + sizeof (PlatformRepo->CpcInfo), + ARRAY_SIZE (PlatformRepo->CpcInfo), + Token, + GetCpcInfo, + CmObject + ); + break; + default: { Status = EFI_NOT_FOUND; DEBUG (( @@ -1923,19 +1936,6 @@ GetArmNameSpaceObject ( ); break; - case EArmObjCpcInfo: - Status = HandleCmObjectRefByToken ( - This, - CmObjectId, - PlatformRepo->CpcInfo, - sizeof (PlatformRepo->CpcInfo), - ARRAY_SIZE (PlatformRepo->CpcInfo), - Token, - GetCpcInfo, - CmObject - ); - break; - default: { Status = EFI_NOT_FOUND; DEBUG (( diff --git a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h index a3833809779d..9a12a7807d1c 100644 --- a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h +++ b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h @@ -308,7 +308,7 @@ typedef struct PlatformRepositoryInfo { // // Cpc info (1 for each PSD domain) - CM_ARM_CPC_INFO CpcInfo[PSD_DOMAIN_COUNT]; + CM_ARCH_COMMON_CPC_INFO CpcInfo[PSD_DOMAIN_COUNT]; /// Juno Board Revision UINT32 JunoRevision; -- 2.25.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#117014): https://edk2.groups.io/g/devel/message/117014 Mute This Topic: https://groups.io/mt/105069949/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-