ArmPkg/ArmGic: Make the GicDxe driver depends on ArmGicLib

... and also rename the ArmGicLib sources to use an explicit 'Lib' suffix.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15620 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf b/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
index 3974f3c37daf1c9a927410f1c736b841ff136844..c6e7140c6ee4b983f8eb18db935b33d95c6525bf 100644 (file)
--- a/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
@@ -1,16 +1,16 @@
 #/** @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 - 2014, 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
@@ -22,9 +22,7 @@
 \r
   ENTRY_POINT                    = InterruptDxeInitialize\r
 \r
-\r
 [Sources.common]\r
-  ArmGic.c\r
   ArmGicDxe.c\r
 \r
 [Packages]\r
@@ -33,6 +31,7 @@
   ArmPkg/ArmPkg.dec\r
 \r
 [LibraryClasses]\r
+  ArmGicLib\r
   BaseLib\r
   UefiLib\r
   UefiBootServicesTableLib\r

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
index dab29b99c2efbdfb9a61e84d86eb5ff3d1e88010..a6e9d7e6767ed433adbeef5606d635a5bedd51e8 100644 (file)
--- a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
@@ -1,13 +1,13 @@
 #/* @file\r
-#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\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
+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.\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
+#  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
+#  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
@@ -20,8 +20,8 @@
   LIBRARY_CLASS                  = ArmGicLib\r
 \r
 [Sources]\r
-  ArmGic.c\r
-  ArmGicNonSec.c\r
+  ArmGicLib.c\r
+  ArmGicNonSecLib.c\r
 \r
 [LibraryClasses]\r
   IoLib\r

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf b/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf
index bb7f242517d203e9333756ed0271fca04bf7b640..0b25c8e093a5c3ef0492eddbe46772e40651ed7b 100644 (file)
--- a/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf
@@ -1,13 +1,13 @@
 #/* @file\r
-#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.\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
+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.\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
+#  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
+#  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
@@ -20,8 +20,8 @@
   LIBRARY_CLASS                  = ArmGicLib\r
 \r
 [Sources]\r
-  ArmGic.c\r
-  ArmGicSec.c\r
+  ArmGicLib.c\r
+  ArmGicSecLib.c\r
 \r
 [Packages]\r
   ArmPkg/ArmPkg.dec\r
@@ -35,4 +35,3 @@
   DebugLib\r
   IoLib\r
   PcdLib\r
-\r