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 7dc14b34ec489001da211acc8c544ea08da8f154..24b02ef30e8317f3664c84e0251f524f51521943 100644 (file)
--- a/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
@@ -1,7 +1,7 @@
 #/** @file\r
 #\r
 #  Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>\r
-#  Copyright (c) 2012 - 2014, 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
@@ -16,7 +16,7 @@
 [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
@@ -27,6 +27,7 @@
   ArmGicCommonDxe.c\r
 \r
   GicV2/ArmGicV2Dxe.c\r
+  GicV3/ArmGicV3Dxe.c\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
@@ -43,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
+[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