ArmPlatformPkg: Replaced 'ArmGicSecLib' by 'ArmGicLib'

Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@13265 6f19259b-4bc3-4df7-8a09-765794883524

12 files changed, 41 insertions, 54 deletions

diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf b/ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf
index b7e53b2976..73faa39b66 100644
--- a/ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf
+++ b/ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf
@@ -17,7 +17,7 @@
   FILE_GUID                      = 85f3cf80-b5f4-11df-9855-0002a5d5c51b

   MODULE_TYPE                    = SEC

   VERSION_STRING                 = 1.0

-  LIBRARY_CLASS                  = ArmGicSecLib

+  LIBRARY_CLASS                  = ArmGicLib

 

 [Sources]

   PL390Gic.c

diff --git a/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc b/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
index fbbb79f230..a4dd415de7 100644
--- a/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
+++ b/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
@@ -79,9 +79,6 @@
   CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf
   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
-
-  # ARM PL390 General Interrupt Driver in Secure and Non-secure
-  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf
   ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf
 
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf
@@ -114,8 +111,6 @@
   BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf
 
 [LibraryClasses.common.SEC]
-  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf
-
   ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf
 
   ArmPlatformSecExtraActionLib|ArmPlatformPkg/Library/DebugSecExtraActionLib/DebugSecExtraActionLib.inf  
diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatformPkg.dsc
index 69cdfef3d5..2788a99a18 100644
--- a/ArmPlatformPkg/ArmPlatformPkg.dsc
+++ b/ArmPlatformPkg/ArmPlatformPkg.dsc
@@ -79,9 +79,6 @@
   CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf

   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf

   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf

-

-  # ARM PL390 General Interrupt Driver in Secure and Non-secure

-  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

   ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

 

   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf

@@ -336,15 +333,17 @@
   #

   # SEC

   #

-  ArmPlatformPkg/Sec/Sec.inf

+  ArmPlatformPkg/Sec/Sec.inf {

+    <LibraryClasses>

+      # Use the implementation which set the Secure bits

+      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+  }

   

   #

   # PEI Phase modules

   #

   ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf {

     <LibraryClasses>

-      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

-

       ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.inf

   }

   MdeModulePkg/Core/Pei/PeiMain.inf

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
index 703c84c221..48c37434c1 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
@@ -34,10 +34,6 @@
   ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA8Lib/ArmCortexA8Lib.inf

   ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf

   

-  # ARM PL390 General Interrupt Driver in Secure and Non-secure

-  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

-  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

-

 [LibraryClasses.common.SEC]

   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf

   ArmPlatformSecLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbSecLibRTSM/ArmRealViewEbSecLib.inf

@@ -148,7 +144,11 @@
   #

   # SEC

   #

-  ArmPlatformPkg/Sec/Sec.inf

+  ArmPlatformPkg/Sec/Sec.inf {

+    <LibraryClasses>

+      # Use the implementation which set the Secure bits

+      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+  }

   

   #

   # PEI Phase modules

@@ -156,7 +156,6 @@
 !ifdef $(EDK2_SKIP_PEICORE)

   ArmPlatformPkg/PrePi/PeiUniCore.inf {

     <LibraryClasses>

-      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf

       ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf

       ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf

@@ -164,7 +163,7 @@
 !else

   ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf {

     <LibraryClasses>

-      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

+      ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.inf

   }

   MdeModulePkg/Core/Pei/PeiMain.inf

   MdeModulePkg/Universal/PCD/Pei/Pcd.inf  {

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
index 53ef035693..3a0d934fb9 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
@@ -34,10 +34,6 @@
   ArmCpuLib|ArmPkg/Drivers/ArmCpuLib/ArmCortexA9Lib/ArmCortexA9Lib.inf

   ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf

   

-  # ARM PL390 General Interrupt Driver in Secure and Non-secure

-  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

-  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

-

 [LibraryClasses.common.SEC]

   ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf

   ArmPlatformSecLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbSecLibRTSM/ArmRealViewEbSecLib.inf

@@ -144,7 +140,11 @@
   #

   # SEC

   #

-  ArmPlatformPkg/Sec/Sec.inf

+  ArmPlatformPkg/Sec/Sec.inf {

+    <LibraryClasses>

+      # Use the implementation which set the Secure bits

+      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+  }

   

   #

   # PEI Phase modules

@@ -152,16 +152,12 @@
 !ifdef $(EDK2_SKIP_PEICORE)

   ArmPlatformPkg/PrePi/PeiMPCore.inf {

     <LibraryClasses>

-      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf

       ArmPlatformLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbLib.inf

       ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf

   }

 !else

-  ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf {

-    <LibraryClasses>

-      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

-  }

+  ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf

   MdeModulePkg/Core/Pei/PeiMain.inf

   MdeModulePkg/Universal/PCD/Pei/Pcd.inf  {

     <LibraryClasses>

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
index bb4ada6eda..76f1c7e045 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
@@ -60,6 +60,7 @@
   CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf

   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf

   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf

+  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

 

   # RealView Emulation Board Specific Libraries

   EfiResetSystemLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ResetSystemLib/ResetSystemLib.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index 4f3b568117..bf044944ec 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -59,10 +59,6 @@
 

   # Uncomment to turn on GDB stub in SEC. 

   #DebugAgentLib|EmbeddedPkg/Library/GdbDebugAgent/GdbDebugAgent.inf

-  

-  # ARM PL390 General Interrupt Driver in Secure and Non-secure

-  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

-  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

 

 [BuildOptions]

   RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A9 -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4

@@ -196,7 +192,11 @@
   #

   # SEC

   #

-  ArmPlatformPkg/Sec/Sec.inf

+  ArmPlatformPkg/Sec/Sec.inf {

+    <LibraryClasses>

+      # Use the implementation which set the Secure bits

+      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+  }

   

   #

   # PEI Phase modules

@@ -204,7 +204,6 @@
 !ifdef $(EDK2_SKIP_PEICORE)

   ArmPlatformPkg/PrePi/PeiMPCore.inf {

     <LibraryClasses>

-      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf

       ArmPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf

       ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf

@@ -212,7 +211,6 @@
 !else

   ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf {

     <LibraryClasses>

-      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

       ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.inf

   }

   MdeModulePkg/Core/Pei/PeiMain.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
index 69438ec38b..ba112631a7 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
@@ -40,10 +40,6 @@
 

   #DebugAgentTimerLib|ArmPlatformPkg/ArmVExpressPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf

 

-  # ARM PL390 General Interrupt Driver in Secure and Non-secure

-  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

-  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

-

   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf 

 

 [LibraryClasses.common.SEC]

@@ -180,7 +176,11 @@
   #

   # SEC

   #

-  ArmPlatformPkg/Sec/Sec.inf

+  ArmPlatformPkg/Sec/Sec.inf {

+    <LibraryClasses>

+      # Use the implementation which set the Secure bits

+      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+  }

   

   #

   # PEI Phase modules

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
index c06cb1d968..9bf2c4cc7b 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
@@ -40,10 +40,6 @@
 

   #DebugAgentTimerLib|ArmPlatformPkg/ArmVExpressPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf

 

-  # ARM PL390 General Interrupt Driver in Secure and Non-secure

-  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

-  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

-

   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf 

 

 [LibraryClasses.common.SEC]

@@ -180,7 +176,11 @@
   #

   # SEC

   #

-  ArmPlatformPkg/Sec/Sec.inf

+  ArmPlatformPkg/Sec/Sec.inf {

+    <LibraryClasses>

+      # Use the implementation which set the Secure bits

+      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+  }

   

   #

   # PEI Phase modules

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
index cb92c17acb..68092a05a1 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
@@ -48,10 +48,6 @@
   # Uncomment to turn on GDB stub in SEC. 

   #DebugAgentLib|EmbeddedPkg/Library/GdbDebugAgent/GdbDebugAgent.inf

   

-  # ARM PL390 General Interrupt Driver in Secure and Non-secure

-  ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

-  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

-

 [BuildOptions]

   RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A9 -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM

 

@@ -183,7 +179,11 @@
   #

   # SEC

   #

-  ArmPlatformPkg/Sec/Sec.inf

+  ArmPlatformPkg/Sec/Sec.inf {

+    <LibraryClasses>

+      # Use the implementation which set the Secure bits

+      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+  }

   

   #

   # PEI Phase modules

@@ -191,7 +191,6 @@
 !ifdef $(EDK2_SKIP_PEICORE)

   ArmPlatformPkg/PrePi/PeiMPCore.inf {

     <LibraryClasses>

-      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

       ArmLib|ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.inf

       ArmPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf

       ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf

@@ -199,7 +198,6 @@
 !else

   ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf {

     <LibraryClasses>

-      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

       ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.inf

   }

   MdeModulePkg/Core/Pei/PeiMain.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
index a16808fc7e..5bfb21a695 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
@@ -60,6 +60,7 @@
   CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf

   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf

   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf

+  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

 

   # Versatile Express Specific Libraries

   ArmPlatformSysConfigLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf

diff --git a/ArmPlatformPkg/Sec/Sec.inf b/ArmPlatformPkg/Sec/Sec.inf
index a9ef056075..0b7a9c04e8 100644
--- a/ArmPlatformPkg/Sec/Sec.inf
+++ b/ArmPlatformPkg/Sec/Sec.inf
@@ -44,7 +44,7 @@
   DebugLib

   DebugAgentLib

   IoLib

-  ArmGicSecLib

+  ArmGicLib

   PrintLib

   SerialPortLib