From: Pierre Gondois <pierre.gond...@arm.com>
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:
- Morello
- N1Sdp
for the following Arch Common object Id:
- EArchCommonObjFixedFeatureFlags
Signed-off-by: Pierre Gondois <pierre.gond...@arm.com>
---
.../ConfigurationManager.c | 24 +++++++++----------
.../ConfigurationManager.h | 2 +-
.../ConfigurationManager.c | 20 ++++++++--------
.../ConfigurationManager.h | 2 +-
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index b4c0af1307b1..0eef9ede01cb 100644
---
a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++
b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -831,6 +831,18 @@ GetArchCommonNameSpaceObject (
);
break;
+#ifdef HEADLESS_PLATFORM
+ case EArchCommonObjFixedFeatureFlags:
+ Status = HandleCmObject (
+ CmObjectId,
+ &CommonPlatRepo->FixedFeatureFlags,
+ sizeof (CommonPlatRepo->FixedFeatureFlags),
+ 1,
+ CmObject
+ );
+ break;
+#endif
+
default: {
Status = EFI_NOT_FOUND;
DEBUG ((
@@ -894,18 +906,6 @@ GetArmNameSpaceObject (
);
break;
-#ifdef HEADLESS_PLATFORM
- case EArmObjFixedFeatureFlags:
- Status = HandleCmObject (
- CmObjectId,
- &CommonPlatRepo->FixedFeatureFlags,
- sizeof (CommonPlatRepo->FixedFeatureFlags),
- 1,
- CmObject
- );
- break;
-#endif
-
case EArmObjGenericTimerInfo:
Status = HandleCmObject (
CmObjectId,
diff --git
a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index 2a35494bcc81..c2a34102b584 100644
---
a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++
b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -225,7 +225,7 @@ typedef struct CommonPlatformRepositoryInfo {
#ifdef HEADLESS_PLATFORM
/// Fixed feature flag information
- CM_ARM_FIXED_FEATURE_FLAGS FixedFeatureFlags;
+ CM_ARCH_COMMON_FIXED_FEATURE_FLAGS FixedFeatureFlags;
#endif
/// Power management profile information
diff --git
a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 21180e8f2d51..20a0f276a164 100644
---
a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++
b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1743,6 +1743,16 @@ GetArchCommonNameSpaceObject (
);
break;
+ case EArchCommonObjFixedFeatureFlags:
+ Status = HandleCmObject (
+ CmObjectId,
+ &PlatformRepo->FixedFeatureFlags,
+ sizeof (PlatformRepo->FixedFeatureFlags),
+ 1,
+ CmObject
+ );
+ break;
+
default: {
Status = EFI_NOT_FOUND;
DEBUG ((
@@ -1838,16 +1848,6 @@ GetArmNameSpaceObject (
);
break;
- case EArmObjFixedFeatureFlags:
- Status = HandleCmObject (
- CmObjectId,
- &PlatformRepo->FixedFeatureFlags,
- sizeof (PlatformRepo->FixedFeatureFlags),
- 1,
- CmObject
- );
- break;
-
case EArmObjGenericTimerInfo:
Status = HandleCmObject (
CmObjectId,
diff --git
a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index cb87b58a68ff..0c0e2b5aa43b 100644
---
a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++
b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -229,7 +229,7 @@ typedef struct PlatformRepositoryInfo {
CM_ARM_BOOT_ARCH_INFO BootArchInfo;
/// Fixed feature flag information
- CM_ARM_FIXED_FEATURE_FLAGS FixedFeatureFlags;
+ CM_ARCH_COMMON_FIXED_FEATURE_FLAGS FixedFeatureFlags;
/// Power management profile information
CM_ARCH_COMMON_POWER_MANAGEMENT_PROFILE_INFO PmProfileInfo;
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119524): https://edk2.groups.io/g/devel/message/119524
Mute This Topic: https://groups.io/mt/106589342/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
