ArmPlatformPkg: Minor code changes (comments, misspellings, coding stylei, line endings)

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

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
index 2169ed8c7f2e45ccae195e2c42dd4b97b3c8e400..822b0848f14440cfa7bbe2dac18cd31865dffb56 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
@@ -30,7 +30,8 @@
 !include ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc\r
 \r
 [LibraryClasses.common]\r
-  ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLib.inf\r
+  ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r
+  ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.inf\r
   ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf\r
   \r
   # ARM PL390 General Interrupt Driver in Secure and Non-secure\r
@@ -38,13 +39,13 @@
   ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
 \r
 [LibraryClasses.common.SEC]\r
-  ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLibSec.inf\r
+  ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf\r
   ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf\r
 \r
 [BuildOptions]\r
   RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A9 --fpu=softvfp -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform\r
 \r
-  GCC:*_*_ARM_PLATFORM_FLAGS == -march=armv7-a -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform\r
+  GCC:*_*_ARM_PLATFORM_FLAGS == -mcpu=cortex-a9 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform\r
 \r
   XCODE:*_*_ARM_PLATFORM_FLAGS == -arch armv7 -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform\r
 \r
@@ -56,7 +57,7 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
-!if $(EDK2_SKIP_PEICORE) == 1\r
+!ifdef $(EDK2_SKIP_PEICORE)\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE\r
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE\r
 !endif\r
@@ -79,8 +80,6 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareBase|0x43FE0000\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageFtwSpareSize|0x00020000\r
 \r
-  gArmPlatformTokenSpaceGuid.PcdMPCoreSupport|1\r
-  \r
   # Stacks for MPCores in Secure World\r
   gArmPlatformTokenSpaceGuid.PcdCPUCoresSecStackBase|0x4B000000\r
   # Stacks for MPCores in Monitor Mode\r
@@ -155,12 +154,13 @@
   #\r
   # PEI Phase modules\r
   #\r
-!if $(EDK2_SKIP_PEICORE) == 1\r
+!ifdef $(EDK2_SKIP_PEICORE)\r
   ArmPlatformPkg/PrePi/PeiMPCore.inf {\r
     <LibraryClasses>\r
       ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
-      ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7MPCoreLib.inf\r
+      ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf\r
       ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf\r
+      ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf\r
   }\r
 !else\r
   ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf {\r