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

diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf b/ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf
index b7e53b2976666a001d1d279f6b37de1cb6471a43..73faa39b6683533289cf944579fa4a2459582df3 100644 (file)
--- a/ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf
+++ b/ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf
@@ -17,7 +17,7 @@
   FILE_GUID                      = 85f3cf80-b5f4-11df-9855-0002a5d5c51b\r
   MODULE_TYPE                    = SEC\r
   VERSION_STRING                 = 1.0\r
-  LIBRARY_CLASS                  = ArmGicSecLib\r
+  LIBRARY_CLASS                  = ArmGicLib\r
 \r
 [Sources]\r
   PL390Gic.c\r

diff --git a/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc b/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
index fbbb79f230ce3be2fa7a3f619158d0b073af00a5..a4dd415de7bd79481071087c9c442cd0cd7d2d26 100644 (file)
--- 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 69cdfef3d5506ed1276f5330ab11156dfcab74df..2788a99a18f78e83e09f44ce9a078b83dfefa0c8 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg.dsc
+++ b/ArmPlatformPkg/ArmPlatformPkg.dsc
@@ -79,9 +79,6 @@
   CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf\r
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf\r
   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.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
   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf\r
@@ -336,15 +333,17 @@
   #\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/PL390Gic/PL390GicSecLib.inf\r
+  }\r
   \r
   #\r
   # PEI Phase modules\r
   #\r
   ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf {\r
     <LibraryClasses>\r
-      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
-\r
       ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.inf\r
   }\r
   MdeModulePkg/Core/Pei/PeiMain.inf\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
index 703c84c221112f124a09f15d48637618769742f5..48c37434c1e65035553ae8d689c0ab66d392d2bf 100644 (file)
--- 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\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
   ArmPlatformSecLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbSecLibRTSM/ArmRealViewEbSecLib.inf\r
@@ -148,7 +144,11 @@
   #\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/PL390Gic/PL390GicSecLib.inf\r
+  }\r
   \r
   #\r
   # PEI Phase modules\r
@@ -156,7 +156,6 @@
 !ifdef $(EDK2_SKIP_PEICORE)\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
       ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf\r
@@ -164,7 +163,7 @@
 !else\r
   ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf {\r
     <LibraryClasses>\r
-      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
+      ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.inf\r
   }\r
   MdeModulePkg/Core/Pei/PeiMain.inf\r
   MdeModulePkg/Universal/PCD/Pei/Pcd.inf  {\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
index 53ef035693972d4a909c1768f1c02515317c7dac..3a0d934fb9da8ca255a5158226804f6559d6e8b3 100644 (file)
--- 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\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
   ArmPlatformSecLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbSecLibRTSM/ArmRealViewEbSecLib.inf\r
@@ -144,7 +140,11 @@
   #\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/PL390Gic/PL390GicSecLib.inf\r
+  }\r
   \r
   #\r
   # PEI Phase modules\r
@@ -152,16 +152,12 @@
 !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

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
index bb4ada6edac92bd4ef48f0ac78ce871172e8f125..76f1c7e045101bec4248bced43f959ed1895326c 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
@@ -60,6 +60,7 @@
   CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf\r
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf\r
   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf\r
+  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
 \r
   # RealView Emulation Board Specific Libraries\r
   EfiResetSystemLib|ArmPlatformPkg/ArmRealViewEbPkg/Library/ResetSystemLib/ResetSystemLib.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index 4f3b5681173ab8892e287315aa8b2efbb923e908..bf044944ec7f12ef89c6bbc63343a6a87d615d5c 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -59,10 +59,6 @@
 \r
   # Uncomment to turn on GDB stub in SEC. \r
   #DebugAgentLib|EmbeddedPkg/Library/GdbDebugAgent/GdbDebugAgent.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
 [BuildOptions]\r
   RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A9 -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4\r
@@ -196,7 +192,11 @@
   #\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/PL390Gic/PL390GicSecLib.inf\r
+  }\r
   \r
   #\r
   # PEI Phase modules\r
@@ -204,7 +204,6 @@
 !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/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf\r
       ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf\r
@@ -212,7 +211,6 @@
 !else\r
   ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf {\r
     <LibraryClasses>\r
-      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
       ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.inf\r
   }\r
   MdeModulePkg/Core/Pei/PeiMain.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
index 69438ec38bba7de2f881e96a853debd2718d560f..ba112631a79ee019f6d65f1fe11677b9c099f934 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
@@ -40,10 +40,6 @@
 \r
   #DebugAgentTimerLib|ArmPlatformPkg/ArmVExpressPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.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
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf \r
 \r
 [LibraryClasses.common.SEC]\r
@@ -180,7 +176,11 @@
   #\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/PL390Gic/PL390GicSecLib.inf\r
+  }\r
   \r
   #\r
   # PEI Phase modules\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
index c06cb1d96894b26a62e842096e724b917f322349..9bf2c4cc7bd0c1b08716cc62b4618f67c90b6212 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
@@ -40,10 +40,6 @@
 \r
   #DebugAgentTimerLib|ArmPlatformPkg/ArmVExpressPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.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
   TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf \r
 \r
 [LibraryClasses.common.SEC]\r
@@ -180,7 +176,11 @@
   #\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/PL390Gic/PL390GicSecLib.inf\r
+  }\r
   \r
   #\r
   # PEI Phase modules\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
index cb92c17acbb9717fbe466b7e088cb4e982894a00..68092a05a1ff2461f143580fefdd43066d06a172 100644 (file)
--- 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. \r
   #DebugAgentLib|EmbeddedPkg/Library/GdbDebugAgent/GdbDebugAgent.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
 [BuildOptions]\r
   RVCT:*_*_ARM_PLATFORM_FLAGS == --cpu Cortex-A9 -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include -I$(WORKSPACE)/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/RTSM\r
 \r
@@ -183,7 +179,11 @@
   #\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/PL390Gic/PL390GicSecLib.inf\r
+  }\r
   \r
   #\r
   # PEI Phase modules\r
@@ -191,7 +191,6 @@
 !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/ArmVExpressPkg/Library/ArmVExpressLibRTSM/ArmVExpressLib.inf\r
       ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf\r
@@ -199,7 +198,6 @@
 !else\r
   ArmPlatformPkg/PrePeiCore/PrePeiCoreMPCore.inf {\r
     <LibraryClasses>\r
-      ArmGicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
       ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/Pei/PeiArmPlatformGlobalVariableLib.inf\r
   }\r
   MdeModulePkg/Core/Pei/PeiMain.inf\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
index a16808fc7ed47f29eaf17ca40c725711b28efae1..5bfb21a6958311ed5e20faef47b4caf32d6bf131 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
@@ -60,6 +60,7 @@
   CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf\r
   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf\r
   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf\r
+  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf\r
 \r
   # Versatile Express Specific Libraries\r
   ArmPlatformSysConfigLib|ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf\r

diff --git a/ArmPlatformPkg/Sec/Sec.inf b/ArmPlatformPkg/Sec/Sec.inf
index a9ef05607535f264586ece5425b64d693139f997..0b7a9c04e83ecddb0913a7cad41f81a886a160cf 100644 (file)
--- a/ArmPlatformPkg/Sec/Sec.inf
+++ b/ArmPlatformPkg/Sec/Sec.inf
@@ -44,7 +44,7 @@
   DebugLib\r
   DebugAgentLib\r
   IoLib\r
-  ArmGicSecLib\r
+  ArmGicLib\r
   PrintLib\r
   SerialPortLib\r
   \r