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:
- EArchCommonObjConsolePortInfo
- EArchCommonObjSerialDebugPortInfo
Signed-off-by: Pierre Gondois <pierre.gond...@arm.com>
---
.../ConfigurationManager.c | 40 +++++++++----------
.../ConfigurationManager.h | 4 +-
.../ConfigurationManager.c | 40 +++++++++----------
.../ConfigurationManager.h | 4 +-
4 files changed, 44 insertions(+), 44 deletions(-)
diff --git
a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 098199bbaa58..b4c0af1307b1 100644
---
a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++
b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -811,6 +811,26 @@ GetArchCommonNameSpaceObject (
);
break;
+ case EArchCommonObjConsolePortInfo:
+ Status = HandleCmObject (
+ CmObjectId,
+ &CommonPlatRepo->SpcrSerialPort,
+ sizeof (CommonPlatRepo->SpcrSerialPort),
+ 1,
+ CmObject
+ );
+ break;
+
+ case EArchCommonObjSerialDebugPortInfo:
+ Status = HandleCmObject (
+ CmObjectId,
+ &CommonPlatRepo->DbgSerialPort,
+ sizeof (CommonPlatRepo->DbgSerialPort),
+ 1,
+ CmObject
+ );
+ break;
+
default: {
Status = EFI_NOT_FOUND;
DEBUG ((
@@ -962,26 +982,6 @@ GetArmNameSpaceObject (
);
break;
- case EArmObjSerialConsolePortInfo:
- Status = HandleCmObject (
- CmObjectId,
- &CommonPlatRepo->SpcrSerialPort,
- sizeof (CommonPlatRepo->SpcrSerialPort),
- 1,
- CmObject
- );
- break;
-
- case EArmObjSerialDebugPortInfo:
- Status = HandleCmObject (
- CmObjectId,
- &CommonPlatRepo->DbgSerialPort,
- sizeof (CommonPlatRepo->DbgSerialPort),
- 1,
- CmObject
- );
- break;
-
case EArmObjProcHierarchyInfo:
Status = HandleCmObject (
CmObjectId,
diff --git
a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index 2881ed871bd6..2a35494bcc81 100644
---
a/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++
b/Platform/ARM/Morello/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -255,10 +255,10 @@ typedef struct CommonPlatformRepositoryInfo {
/** Serial port information for the
serial port console redirection port
*/
- CM_ARM_SERIAL_PORT_INFO SpcrSerialPort;
+ CM_ARCH_COMMON_SERIAL_PORT_INFO SpcrSerialPort;
/// Serial port information for the DBG2 UART port
- CM_ARM_SERIAL_PORT_INFO DbgSerialPort;
+ CM_ARCH_COMMON_SERIAL_PORT_INFO DbgSerialPort;
// Processor topology information
CM_ARM_PROC_HIERARCHY_INFO
ProcHierarchyInfo[PLAT_PROC_HIERARCHY_NODE_COUNT];
diff --git
a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index 3b72d7705703..21180e8f2d51 100644
---
a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++
b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1723,6 +1723,26 @@ GetArchCommonNameSpaceObject (
);
break;
+ case EArchCommonObjConsolePortInfo:
+ Status = HandleCmObject (
+ CmObjectId,
+ &PlatformRepo->SpcrSerialPort,
+ sizeof (PlatformRepo->SpcrSerialPort),
+ 1,
+ CmObject
+ );
+ break;
+
+ case EArchCommonObjSerialDebugPortInfo:
+ Status = HandleCmObject (
+ CmObjectId,
+ &PlatformRepo->DbgSerialPort,
+ sizeof (PlatformRepo->DbgSerialPort),
+ 1,
+ CmObject
+ );
+ break;
+
default: {
Status = EFI_NOT_FOUND;
DEBUG ((
@@ -1904,26 +1924,6 @@ GetArmNameSpaceObject (
);
break;
- case EArmObjSerialConsolePortInfo:
- Status = HandleCmObject (
- CmObjectId,
- &PlatformRepo->SpcrSerialPort,
- sizeof (PlatformRepo->SpcrSerialPort),
- 1,
- CmObject
- );
- break;
-
- case EArmObjSerialDebugPortInfo:
- Status = HandleCmObject (
- CmObjectId,
- &PlatformRepo->DbgSerialPort,
- sizeof (PlatformRepo->DbgSerialPort),
- 1,
- CmObject
- );
- break;
-
case EArmObjGicItsInfo:
Status = HandleCmObject (
CmObjectId,
diff --git
a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index dc15f17eb626..cb87b58a68ff 100644
---
a/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++
b/Platform/ARM/N1Sdp/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -261,10 +261,10 @@ typedef struct PlatformRepositoryInfo {
/** Serial port information for the
serial port console redirection port
*/
- CM_ARM_SERIAL_PORT_INFO SpcrSerialPort;
+ CM_ARCH_COMMON_SERIAL_PORT_INFO SpcrSerialPort;
/// Serial port information for the DBG2 UART port
- CM_ARM_SERIAL_PORT_INFO DbgSerialPort;
+ CM_ARCH_COMMON_SERIAL_PORT_INFO DbgSerialPort;
// Processor topology information
CM_ARM_PROC_HIERARCHY_INFO
ProcHierarchyInfo[PLAT_PROC_HIERARCHY_NODE_COUNT * 2];
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#119523): https://edk2.groups.io/g/devel/message/119523
Mute This Topic: https://groups.io/mt/106589341/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
