ARM Packages: Renamed PL390Gic driver into ArmGic driver

[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 235740e49f3de869d74d3e4821b1d79852610a5f..36bd1ab3e5c497e21b6291b2a022367ea2cbe6d7 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
@@ -1,5 +1,5 @@
 #\r
-#  Copyright (c) 2011, ARM Limited. All rights reserved.\r
+#  Copyright (c) 2011-2013, ARM Limited. All rights reserved.\r
 #  \r
 #  This program and the accompanying materials                          \r
 #  are licensed and made available under the terms and conditions of the BSD License         \r
@@ -34,13 +34,10 @@
   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
-  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf\r
-  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
-\r
 [LibraryClasses.common.SEC]\r
   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf\r
-  ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf\r
+  ArmPlatformSecLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbSecLibRTSM/ArmRealViewEbSecLib.inf\r
+  ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLibSec.inf\r
 \r
 [BuildOptions]\r
   RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A9 --fpu=softvfp -I$(WORKSPACE)/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform\r
@@ -57,7 +54,7 @@
 ################################################################################\r
 \r
 [PcdsFeatureFlag.common]\r
-!ifdef $(EDK2_SKIP_PEICORE)\r
+!ifdef EDK2_SKIP_PEICORE\r
   gArmPlatformTokenSpaceGuid.PcdSystemMemoryInitializeInSec|TRUE\r
   gArmPlatformTokenSpaceGuid.PcdSendSgiToBringUpSecondaryCores|TRUE\r
 !endif\r
@@ -69,6 +66,8 @@
 [PcdsFixedAtBuild.common]\r
   gArmPlatformTokenSpaceGuid.PcdFirmwareVendor|"ARM RealView Emulation Board"\r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPrompt|"ArmRealViewEb-A9x2"\r
+\r
+  gArmPlatformTokenSpaceGuid.PcdCoreCount|2\r
   \r
   #\r
   # NV Storage PCDs. Use base of 0x43F00000 for NOR0\r
@@ -99,11 +98,6 @@
   #\r
   gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000\r
   \r
-  #\r
-  # ARM EB PCDS\r
-  #\r
-  gArmRealViewEbPkgTokenSpaceGuid.PcdGdbUartBase|0x1000a000\r
-  \r
   #\r
   # ARM PrimeCells\r
   #\r
@@ -128,11 +122,10 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x10009000\r
   \r
   #\r
-  # ARM PL390 General Interrupt Controller\r
+  # ARM General Interrupt Controller\r
   #\r
   gArmTokenSpaceGuid.PcdGicDistributorBase|0x1F001000\r
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x1F000100\r
-  gArmTokenSpaceGuid.PcdGicNumInterrupts|96\r
 \r
   #\r
   # ARM L2x0 PCDs\r
@@ -149,23 +142,24 @@
   #\r
   # SEC\r
   #\r
-  ArmPlatformPkg/Sec/Sec.inf\r
+  ArmPlatformPkg/Sec/Sec.inf {\r
+    <LibraryClasses>\r
+      # Use the implementation which set the Secure bits\r
+      ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf\r
+  }\r
   \r
   #\r
   # PEI Phase modules\r
   #\r
-!ifdef $(EDK2_SKIP_PEICORE)\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/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
-    <LibraryClasses>\r
-      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
-  }\r
+  ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf\r
   MdeModulePkg/Core/Pei/PeiMain.inf\r
   MdeModulePkg/Universal/PCD/Pei/Pcd.inf  {\r
     <LibraryClasses>\r
@@ -217,7 +211,7 @@
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf\r
   EmbeddedPkg/SerialDxe/SerialDxe.inf\r
 \r
-  ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf\r
+  ArmPkg/Drivers/ArmGic/ArmGicDxe.inf\r
   ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf\r
   \r
   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf\r
@@ -232,14 +226,8 @@
   #\r
   MdeModulePkg/Universal/Disk/DiskIoDxe/DiskIoDxe.inf\r
   MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf\r
-  FatPkg/EnhancedFatDxe/Fat.inf\r
   MdeModulePkg/Universal/Disk/UnicodeCollation/EnglishDxe/EnglishDxe.inf\r
   \r
-  #\r
-  # Application\r
-  #  \r
-  EmbeddedPkg/Ebl/Ebl.inf\r
-\r
   #\r
   # Bds\r
   #\r