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

3 files changed, 25 insertions, 27 deletions

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf b/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
index 3974f3c37..c6e7140c6 100644
--- a/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
@@ -1,16 +1,16 @@
 #/** @file

-#  

+#

 #  Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>

-#  Copyright (c) 2012 - 2013, ARM Ltd. All rights reserved.<BR>

+#  Copyright (c) 2012 - 2014, ARM Ltd. All rights reserved.<BR>

 #

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

 #  which accompanies this distribution.  The full text of the license may be found at

 #  http://opensource.org/licenses/bsd-license.php

-#  

+#

 #  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 #  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

-#  

+#

 #**/

 

 [Defines]

@@ -22,9 +22,7 @@
 

   ENTRY_POINT                    = InterruptDxeInitialize

 

-

 [Sources.common]

-  ArmGic.c

   ArmGicDxe.c

 

 [Packages]

@@ -33,6 +31,7 @@
   ArmPkg/ArmPkg.dec

 

 [LibraryClasses]

+  ArmGicLib

   BaseLib

   UefiLib

   UefiBootServicesTableLib

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
index dab29b99c..a6e9d7e67 100644
--- a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
@@ -1,13 +1,13 @@
 #/* @file

-#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.

-#  

-#  This program and the accompanying materials                          

-#  are licensed and made available under the terms and conditions of the BSD License         

-#  which accompanies this distribution.  The full text of the license may be found at        

-#  http://opensource.org/licenses/bsd-license.php                                            

+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.

 #

-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+#  This program and the accompanying materials

+#  are licensed and made available under the terms and conditions of the BSD License

+#  which accompanies this distribution.  The full text of the license may be found at

+#  http://opensource.org/licenses/bsd-license.php

+#

+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #*/

 

@@ -20,8 +20,8 @@
   LIBRARY_CLASS                  = ArmGicLib

 

 [Sources]

-  ArmGic.c

-  ArmGicNonSec.c

+  ArmGicLib.c

+  ArmGicNonSecLib.c

 

 [LibraryClasses]

   IoLib

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf b/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf
index bb7f24251..0b25c8e09 100644
--- a/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf
@@ -1,13 +1,13 @@
 #/* @file

-#  Copyright (c) 2011-2012, ARM Limited. All rights reserved.

-#  

-#  This program and the accompanying materials                          

-#  are licensed and made available under the terms and conditions of the BSD License         

-#  which accompanies this distribution.  The full text of the license may be found at        

-#  http://opensource.org/licenses/bsd-license.php                                            

+#  Copyright (c) 2011-2014, ARM Limited. All rights reserved.

 #

-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+#  This program and the accompanying materials

+#  are licensed and made available under the terms and conditions of the BSD License

+#  which accompanies this distribution.  The full text of the license may be found at

+#  http://opensource.org/licenses/bsd-license.php

+#

+#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 #

 #*/

 

@@ -20,8 +20,8 @@
   LIBRARY_CLASS                  = ArmGicLib

 

 [Sources]

-  ArmGic.c

-  ArmGicSec.c

+  ArmGicLib.c

+  ArmGicSecLib.c

 

 [Packages]

   ArmPkg/ArmPkg.dec

@@ -35,4 +35,3 @@
   DebugLib

   IoLib

   PcdLib

-