diff options
Diffstat (limited to 'ArmPkg')
| -rw-r--r-- | ArmPkg/ArmPkg.dec | 2 | ||||
| -rw-r--r-- | ArmPkg/ArmPkg.dsc | 8 | ||||
| -rw-r--r-- | ArmPkg/Drivers/ArmGic/ArmGic.c (renamed from ArmPkg/Drivers/PL390Gic/PL390Gic.c) | 0 | ||||
| -rw-r--r-- | ArmPkg/Drivers/ArmGic/ArmGicDxe.c (renamed from ArmPkg/Drivers/PL390Gic/PL390GicDxe.c) | 0 | ||||
| -rw-r--r-- | ArmPkg/Drivers/ArmGic/ArmGicDxe.inf (renamed from ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf) | 6 | ||||
| -rw-r--r-- | ArmPkg/Drivers/ArmGic/ArmGicLib.inf (renamed from ArmPkg/Drivers/PL390Gic/PL390GicLib.inf) | 6 | ||||
| -rw-r--r-- | ArmPkg/Drivers/ArmGic/ArmGicNonSec.c (renamed from ArmPkg/Drivers/PL390Gic/PL390GicNonSec.c) | 0 | ||||
| -rw-r--r-- | ArmPkg/Drivers/ArmGic/ArmGicSec.c (renamed from ArmPkg/Drivers/PL390Gic/PL390GicSec.c) | 0 | ||||
| -rw-r--r-- | ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf (renamed from ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf) | 6 | ||||
| -rw-r--r-- | ArmPkg/Include/Library/ArmGicLib.h | 4 |
10 files changed, 16 insertions, 16 deletions
diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 0f094c1..1d6231c 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -81,7 +81,7 @@ gArmTokenSpaceGuid.PcdCpuResetAddress|0x00000000|UINT32|0x00000005
#
- # ARM PL390 General Interrupt Controller
+ # ARM General Interrupt Controller
#
gArmTokenSpaceGuid.PcdGicDistributorBase|0|UINT32|0x0000000C
gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0|UINT32|0x0000000D
diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index eb9791c..661453c 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -62,7 +62,7 @@ DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf
CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf
- ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf
+ ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf
ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf
DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
@@ -119,9 +119,9 @@ ArmPkg/Drivers/CpuDxe/CpuDxe.inf
ArmPkg/Drivers/CpuPei/CpuPei.inf
- ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf
- ArmPkg/Drivers/PL390Gic/PL390GicLib.inf
- ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf
+ ArmPkg/Drivers/ArmGic/ArmGicDxe.inf
+ ArmPkg/Drivers/ArmGic/ArmGicLib.inf
+ ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf
ArmPkg/Drivers/TimerDxe/TimerDxe.inf
ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
diff --git a/ArmPkg/Drivers/PL390Gic/PL390Gic.c b/ArmPkg/Drivers/ArmGic/ArmGic.c index 8a10d11..8a10d11 100644 --- a/ArmPkg/Drivers/PL390Gic/PL390Gic.c +++ b/ArmPkg/Drivers/ArmGic/ArmGic.c diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c b/ArmPkg/Drivers/ArmGic/ArmGicDxe.c index 111ce14..111ce14 100644 --- a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.c +++ b/ArmPkg/Drivers/ArmGic/ArmGicDxe.c diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf b/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf index cf0b8f3..9dc557a 100644 --- a/ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf +++ b/ArmPkg/Drivers/ArmGic/ArmGicDxe.inf @@ -15,7 +15,7 @@ [Defines]
INF_VERSION = 0x00010005
- BASE_NAME = PL390GicDxe
+ BASE_NAME = ArmGicDxe
FILE_GUID = DE371F7C-DEC4-4D21-ADF1-593ABCC15882
MODULE_TYPE = DXE_DRIVER
VERSION_STRING = 1.0
@@ -24,8 +24,8 @@ [Sources.common]
- PL390Gic.c
- PL390GicDxe.c
+ ArmGic.c
+ ArmGicDxe.c
[Packages]
MdePkg/MdePkg.dec
diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicLib.inf b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf index d0cac02..dab29b9 100644 --- a/ArmPkg/Drivers/PL390Gic/PL390GicLib.inf +++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf @@ -13,15 +13,15 @@ [Defines]
INF_VERSION = 0x00010005
- BASE_NAME = PL390GicLib
+ BASE_NAME = ArmGicLib
FILE_GUID = 03d05ee4-cdeb-458c-9dfc-993f09bdf405
MODULE_TYPE = SEC
VERSION_STRING = 1.0
LIBRARY_CLASS = ArmGicLib
[Sources]
- PL390Gic.c
- PL390GicNonSec.c
+ ArmGic.c
+ ArmGicNonSec.c
[LibraryClasses]
IoLib
diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicNonSec.c b/ArmPkg/Drivers/ArmGic/ArmGicNonSec.c index 55ff56e..55ff56e 100644 --- a/ArmPkg/Drivers/PL390Gic/PL390GicNonSec.c +++ b/ArmPkg/Drivers/ArmGic/ArmGicNonSec.c diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicSec.c b/ArmPkg/Drivers/ArmGic/ArmGicSec.c index bae76e4..bae76e4 100644 --- a/ArmPkg/Drivers/PL390Gic/PL390GicSec.c +++ b/ArmPkg/Drivers/ArmGic/ArmGicSec.c diff --git a/ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf b/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf index 205e503..bb7f242 100644 --- a/ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf +++ b/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf @@ -13,15 +13,15 @@ [Defines]
INF_VERSION = 0x00010005
- BASE_NAME = PL390GicSecLib
+ BASE_NAME = ArmGicSecLib
FILE_GUID = 85f3cf80-b5f4-11df-9855-0002a5d5c51b
MODULE_TYPE = SEC
VERSION_STRING = 1.0
LIBRARY_CLASS = ArmGicLib
[Sources]
- PL390Gic.c
- PL390GicSec.c
+ ArmGic.c
+ ArmGicSec.c
[Packages]
ArmPkg/ArmPkg.dec
diff --git a/ArmPkg/Include/Library/ArmGicLib.h b/ArmPkg/Include/Library/ArmGicLib.h index 429f8ad..3280cf8 100644 --- a/ArmPkg/Include/Library/ArmGicLib.h +++ b/ArmPkg/Include/Library/ArmGicLib.h @@ -12,8 +12,8 @@ *
**/
-#ifndef __PL390GIC_H
-#define __PL390GIC_H
+#ifndef __ARMGIC_H
+#define __ARMGIC_H
//
// GIC definitions
|