[edk2-devel] [PATCH edk2-platforms 1/1] Platform/ARM: Update Morello and N1Sdp to use PrePeiCoreUniCore

[Rebecca Cran]

Modern platforms that use TF-A should use PrePeiCoreUniCore, since
any secondary cores will be put in the TF-A holding pen and won't
reach EDK2.

Update the Morello and N1Sdp files to use PrePeiCoreUniCore instead of
PrePeiCoreMPCore.

Signed-off-by: Rebecca Cran <rebecca at quicinc.com>
---
 Platform/ARM/Morello/MorelloPlatform.dsc.inc | 2 +-
 Platform/ARM/N1Sdp/N1SdpPlatform.dsc         | 2 +-
 Platform/ARM/Morello/MorelloPlatformFvp.fdf  | 2 +-
 Platform/ARM/N1Sdp/N1SdpPlatform.fdf         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Platform/ARM/Morello/MorelloPlatform.dsc.inc b/Platform/ARM/Morello/MorelloPlatform.dsc.inc
index 1c93246a5273..b8210c87ad18 100644
--- a/Platform/ARM/Morello/MorelloPlatform.dsc.inc
+++ b/Platform/ARM/Morello/MorelloPlatform.dsc.inc
@@ -148,7 +148,7 @@ [Components.common]
   # PEI Phase modules
   ArmPkg/Drivers/CpuPei/CpuPei.inf
   ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
-  ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+  ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
   ArmPlatformPkg/PlatformPei/PlatformPeim.inf
   MdeModulePkg/Core/Pei/PeiMain.inf
   MdeModulePkg/Universal/PCD/Pei/Pcd.inf {
diff --git a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc b/Platform/ARM/N1Sdp/N1SdpPlatform.dsc
index 865dd04deb09..d04b22d3ef51 100644
--- a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc
+++ b/Platform/ARM/N1Sdp/N1SdpPlatform.dsc
@@ -176,7 +176,7 @@ [Components.common]
   # PEI Phase modules
   ArmPkg/Drivers/CpuPei/CpuPei.inf
   ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
-  ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+  ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
   ArmPlatformPkg/PlatformPei/PlatformPeim.inf
   MdeModulePkg/Core/Pei/PeiMain.inf
   MdeModulePkg/Universal/PCD/Pei/Pcd.inf {
diff --git a/Platform/ARM/Morello/MorelloPlatformFvp.fdf b/Platform/ARM/Morello/MorelloPlatformFvp.fdf
index 5f2af05c8bfc..581579270488 100644
--- a/Platform/ARM/Morello/MorelloPlatformFvp.fdf
+++ b/Platform/ARM/Morello/MorelloPlatformFvp.fdf
@@ -187,7 +187,7 @@ [FV.FVMAIN_COMPACT]
   INF ArmPkg/Drivers/CpuPei/CpuPei.inf
   INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
   INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf
-  INF ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+  INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
   INF MdeModulePkg/Core/Pei/PeiMain.inf
   INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
diff --git a/Platform/ARM/N1Sdp/N1SdpPlatform.fdf b/Platform/ARM/N1Sdp/N1SdpPlatform.fdf
index 09f1e0e0073b..e5e24ea50294 100644
--- a/Platform/ARM/N1Sdp/N1SdpPlatform.fdf
+++ b/Platform/ARM/N1Sdp/N1SdpPlatform.fdf
@@ -190,7 +190,7 @@ [FV.FVMAIN_COMPACT]
   INF ArmPkg/Drivers/CpuPei/CpuPei.inf
   INF ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf
   INF ArmPlatformPkg/PlatformPei/PlatformPeim.inf
-  INF ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf
+  INF ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf
   INF MdeModulePkg/Core/DxeIplPeim/DxeIpl.inf
   INF MdeModulePkg/Core/Pei/PeiMain.inf
   INF MdeModulePkg/Universal/PCD/Pei/Pcd.inf
-- 
2.30.2



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