ArmPkg: Create MpCoreInfo PPI and HOB to describe CPU Cores on a MPCore platform

[mirror_edk2.git] / ArmPlatformPkg / ArmRealViewEbPkg / ArmRealViewEb-RTSM-A8.dsc

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
index a82e13f4a967910081378619b612c27e18eaa85f..f5bff086ebc5c4681c03ae4f26dde46d4f42fdc1 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
@@ -136,7 +136,7 @@
   # L2 Cache Driver\r
   L2X0CacheLib|ArmPlatformPkg/Library/L2X0CacheLibNull/L2X0CacheLibNull.inf\r
   # ARM PL390 General Interrupt Driver in Secure and Non-secure\r
-  PL390GicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSec.inf\r
+  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSec.inf\r
 \r
 !if $(EDK2_SKIP_PEICORE) == 1\r
   PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf\r
@@ -344,16 +344,11 @@
   gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0x00000000\r
   \r
   # Stack for CPU Cores in Secure Mode\r
-  gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x4B000000     # Top of SEC Stack for Secure World\r
-  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecStackSize|0x2000          # Size of SEC Stack for Secure World\r
-\r
+  gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x4B000000\r
   # Stack for CPU Cores in Secure Monitor Mode\r
-  gArmPlatformTokenSpaceGuid.PcdCPUCoresSecMonStackBase|0x4A000000  # Top of SEC Stack for Monitor World\r
-  gArmPlatformTokenSpaceGuid.PcdCPUCoreSecMonStackSize|0x2000       # Size of SEC Stack for Monitor World\r
-\r
+  gArmPlatformTokenSpaceGuid.PcdCPUCoresSecMonStackBase|0x4A000000\r
   # Stack for CPU Cores in Non Secure Mode\r
-  gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackBase|0x48000000  # Top of SEC Stack for Normal World\r
-  gArmPlatformTokenSpaceGuid.PcdCPUCoresNonSecStackSize|0x20000     # Size of SEC Stack for Normal World\r
+  gArmPlatformTokenSpaceGuid.PcdCPUCoresStackBase|0x48000000\r
 \r
   # System Memory (256MB) \r
   gArmTokenSpaceGuid.PcdSystemMemoryBase|0x70000000\r
@@ -441,13 +436,14 @@
 !if $(EDK2_SKIP_PEICORE) == 1\r
   ArmPlatformPkg/PrePi/PeiUniCore.inf {\r
     <LibraryClasses>\r
+      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r
       ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf\r
   }\r
 !else\r
   ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf {\r
     <LibraryClasses>\r
-      PL390GicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicNonSec.inf\r
+      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
   }\r
   MdeModulePkg/Core/Pei/PeiMain.inf\r
   MdeModulePkg/Universal/PCD/Pei/Pcd.inf  {\r
@@ -456,6 +452,7 @@
   }\r
   ArmPlatformPkg/PlatformPei/PlatformPeim.inf\r
   ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf\r
+  ArmPkg/Drivers/CpuPei/CpuPei.inf\r
   IntelFrameworkModulePkg/Universal/StatusCode/Pei/StatusCodePei.inf\r
   Nt32Pkg/BootModePei/BootModePei.inf\r
   MdeModulePkg/Universal/Variable/Pei/VariablePei.inf\r