ArmPkg/CpuDxe: Change chain of dependency for CpuDxe and PL390Gic

[mirror_edk2.git] / ArmPkg / Drivers / CpuDxe / CpuDxe.inf

diff --git a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
index 99d52f96b4f3314875c670b7df28fe96c9f9c2ce..94e91c1ebd77e21f31092142fa5995f1173c30ae 100644 (file)
--- a/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
+++ b/ArmPkg/Drivers/CpuDxe/CpuDxe.inf
@@ -2,8 +2,8 @@
 #  \r
 #  DXE CPU driver\r
 #  \r
-#  Copyright (c) 2009, Apple Inc. <BR>\r
-#  All rights reserved. This program and the accompanying materials\r
+#  Copyright (c) 2009, Apple Inc. All rights reserved.<BR>\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
@@ -25,20 +25,19 @@
 [Sources.ARM]\r
   CpuDxe.c\r
   CpuDxe.h\r
-  DebugSupport.c\r
   Exception.c\r
 \r
 #\r
 # Prior to ARMv6 we have multiple stacks, one per mode\r
 #\r
 #  ExceptionSupport.asm | RVCT\r
-  ExceptionSupport.S         | GCC\r
+#  ExceptionSupport.S   | GCC\r
 \r
 #\r
 # ARMv6 or later uses a single stack via srs/stm instructions\r
 #\r
   ExceptionSupport.ARMv6.asm | RVCT\r
-#  ExceptionSupport.ARMv6.S   | GCC\r
+  ExceptionSupport.ARMv6.S   | GCC\r
   Mmu.c\r
 \r
 \r
@@ -57,6 +56,7 @@
   UefiLib\r
   CpuLib\r
   DefaultExceptioHandlerLib\r
+  DebugLib\r
 \r
 [Protocols]\r
   gEfiCpuArchProtocolGuid\r
@@ -67,10 +67,14 @@
   gEfiDebugImageInfoTableGuid\r
 \r
 [Pcd.common]\r
+  gArmTokenSpaceGuid.PcdVFPEnabled\r
   gArmTokenSpaceGuid.PcdCpuVectorBaseAddress\r
   \r
 [FeaturePcd.common]\r
   gArmTokenSpaceGuid.PcdCpuDxeProduceDebugSupport\r
+  gArmTokenSpaceGuid.PcdRelocateVectorTable\r
+  gArmTokenSpaceGuid.PcdDebuggerExceptionSupport\r
+  gArmTokenSpaceGuid.PcdEfiUncachedMemoryToStronglyOrdered\r
 \r
-[depex]\r
-  gHardwareInterruptProtocolGuid\r
+[Depex]\r
+  TRUE\r