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
- FVP
for the following Arch Common object Id:
- EArchCommonObjConsolePortInfo
- EArchCommonObjSerialDebugPortInfo
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 | 38 +++++++++---------
.../ConfigurationManager.h | 4 +-
.../ConfigurationManager.c | 40 +++++++++----------
.../ConfigurationManager.h | 4 +-
4 files changed, 44 insertions(+), 42 deletions(-)
diff --git
a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index c1af3bac2458..813e420a4740 100644
---
a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++
b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -1658,6 +1658,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 ((
@@ -1795,25 +1815,7 @@ GetArmNameSpaceObject (
CmObject
);
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 EArmObjGicMsiFrameInfo:
Status = HandleCmObject (
CmObjectId,
diff --git
a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index 034d945f18c5..72b035e1421f 100644
---
a/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++
b/Platform/ARM/JunoPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -250,10 +250,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;
/// PCI configuration space information
CM_ARM_PCI_CONFIG_SPACE_INFO PciConfigInfo;
diff --git
a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
index dd7b068a335b..397de8a365dc 100644
---
a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
+++
b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.c
@@ -775,6 +775,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 ((
@@ -943,26 +963,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/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
index f4d26242c27c..ae7df98824d9 100644
---
a/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
+++
b/Platform/ARM/VExpressPkg/ConfigurationManager/ConfigurationManagerDxe/ConfigurationManager.h
@@ -144,10 +144,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;
/// GIC ITS information
CM_ARM_GIC_ITS_INFO GicItsInfo;
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#117004): https://edk2.groups.io/g/devel/message/117004
Mute This Topic: https://groups.io/mt/105069938/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
