ArmPkg/Gic: force GIC driver to run before CPU arch protocol driver

[mirror_edk2.git] / ArmPkg / Drivers / ArmGic / ArmGicDxe.inf

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf b/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
index 3974f3c37daf1c9a927410f1c736b841ff136844..24b02ef30e8317f3664c84e0251f524f51521943 100644 (file)
--- a/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
@@ -1,31 +1,33 @@
 #/** @file\r
-#  \r
+#\r
 #  Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>\r
-#  Copyright (c) 2012 - 2013, ARM Ltd. All rights reserved.<BR>\r
+#  Copyright (c) 2012 - 2017, ARM Ltd. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
 #  which accompanies this distribution.  The full text of the license may be found at\r
 #  http://opensource.org/licenses/bsd-license.php\r
-#  \r
+#\r
 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#  \r
+#\r
 #**/\r
 \r
 [Defines]\r
   INF_VERSION                    = 0x00010005\r
   BASE_NAME                      = ArmGicDxe\r
-  FILE_GUID                      = DE371F7C-DEC4-4D21-ADF1-593ABCC15882 \r
+  FILE_GUID                      = DE371F7C-DEC4-4D21-ADF1-593ABCC15882 # gArmGicDxeFileGuid\r
   MODULE_TYPE                    = DXE_DRIVER\r
   VERSION_STRING                 = 1.0\r
 \r
   ENTRY_POINT                    = InterruptDxeInitialize\r
 \r
-\r
 [Sources.common]\r
-  ArmGic.c\r
   ArmGicDxe.c\r
+  ArmGicCommonDxe.c\r
+\r
+  GicV2/ArmGicV2Dxe.c\r
+  GicV3/ArmGicV3Dxe.c\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
@@ -33,6 +35,7 @@
   ArmPkg/ArmPkg.dec\r
 \r
 [LibraryClasses]\r
+  ArmGicLib\r
   BaseLib\r
   UefiLib\r
   UefiBootServicesTableLib\r
@@ -41,16 +44,19 @@
   MemoryAllocationLib\r
   UefiDriverEntryPoint\r
   IoLib\r
+  PcdLib\r
+  UefiLib\r
 \r
 [Protocols]\r
   gHardwareInterruptProtocolGuid\r
+  gHardwareInterrupt2ProtocolGuid\r
   gEfiCpuArchProtocolGuid\r
-  \r
-[FixedPcd.common]\r
+\r
+[Pcd.common]\r
   gArmTokenSpaceGuid.PcdGicDistributorBase\r
+  gArmTokenSpaceGuid.PcdGicRedistributorsBase\r
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase\r
-  \r
-  gArmTokenSpaceGuid.PcdArmPrimaryCore\r
+  gArmTokenSpaceGuid.PcdArmGicV3WithV2Legacy\r
 \r
 [Depex]\r
-  gEfiCpuArchProtocolGuid\r
+  TRUE\r