Roll back one unnecessary change in Dispatcher.c, which is added by previous patch.

[mirror_edk2.git] / ArmPlatformPkg / ArmPlatformPkg.dsc

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