[edk2-devel] [PATCH edk2-platforms 1/1] Platform/ARM: Update Morello and SgiPkg for ARM_CORE_INFO Mpidr change

[Rebecca Cran]

The ARM_CORE_INFO struct now has a single Mpidr field instead of
separate ClusterId and CoreId fields. Update mCoreInfoTable in
PlatformLib.c in Morello and SgiPkg to match.

Signed-off-by: Rebecca Cran <rebecca at bsdio.com>
---
 Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c | 8 ++++----
 Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c b/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c
index 52318a62911a..894a53c9ca01 100644
--- a/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c
+++ b/Platform/ARM/Morello/Library/PlatformLib/PlatformLib.c
@@ -10,10 +10,10 @@
 #include <Ppi/ArmMpCoreInfo.h>
 
 STATIC ARM_CORE_INFO mCoreInfoTable[] = {
-  { 0x0, 0x0 }, // Cluster 0, Core 0
-  { 0x0, 0x1 }, // Cluster 0, Core 1
-  { 0x1, 0x0 }, // Cluster 1, Core 0
-  { 0x1, 0x1 }  // Cluster 1, Core 1
+  { 0x000 }, // Cluster 0, Core 0
+  { 0x001 }, // Cluster 0, Core 1
+  { 0x100 }, // Cluster 1, Core 0
+  { 0x101 }  // Cluster 1, Core 1
 };
 
 /**
diff --git a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
index fa006320025b..b9ec998d8ef4 100644
--- a/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
+++ b/Platform/ARM/SgiPkg/Library/PlatformLib/PlatformLib.c
@@ -20,7 +20,7 @@ STATIC SGI_NT_FW_CONFIG_INFO_PPI mNtFwConfigDtInfoPpi;
 STATIC ARM_CORE_INFO mCoreInfoTable[] = {
   {
     // Cluster 0, Core 0
-    0x0, 0x0,
+    0x000,
   },
 };
 
-- 
2.34.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#93633): https://edk2.groups.io/g/devel/message/93633
Mute This Topic: https://groups.io/mt/93618126/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-