ARM Packages: Renamed PL390Gic driver into ArmGic driver

The aim is to make this driver follows the ARM GIC specifications and
be implementation independent.

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@14810 6f19259b-4bc3-4df7-8a09-765794883524

32 files changed, 58 insertions, 58 deletions

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index 0f094c12a2..1d6231c678 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 eb9791c582..661453c295 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 8a10d113f7..8a10d113f7 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 111ce14438..111ce14438 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 cf0b8f3fe6..9dc557a037 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 d0cac02034..dab29b99c2 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 55ff56e797..55ff56e797 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 bae76e441b..bae76e441b 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 205e503427..bb7f242517 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 429f8ade12..3280cf8eeb 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

diff --git a/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc b/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
index b8b439555b..c6cef797b1 100644
--- a/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
+++ b/ArmPlatformPkg/ArmPlatformPkg-2ndstage.dsc
@@ -77,7 +77,7 @@
   CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf

   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf

   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf

-  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

+  ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf

   ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf

   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf

 

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatformPkg.dsc
index c353e6f902..2221b88f33 100644
--- a/ArmPlatformPkg/ArmPlatformPkg.dsc
+++ b/ArmPlatformPkg/ArmPlatformPkg.dsc
@@ -77,7 +77,7 @@
   CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf

   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf

   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf

-  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

+  ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf

   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf

 

   SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf

@@ -353,7 +353,7 @@
   ArmPlatformPkg/Sec/Sec.inf {

     <LibraryClasses>

       # Use the implementation which set the Secure bits

-      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+      ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf

   }

   

   #

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
index c4a1df5a0d..998b826291 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
@@ -123,7 +123,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x10009000

   

   #

-  # ARM PL390 General Interrupt Controller

+  # ARM General Interrupt Controller

   #

   gArmTokenSpaceGuid.PcdGicDistributorBase|0x10041000

   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x10040000

@@ -142,7 +142,7 @@
   ArmPlatformPkg/Sec/Sec.inf {

     <LibraryClasses>

       # Use the implementation which set the Secure bits

-      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+      ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf

   }

   

   #

@@ -211,7 +211,7 @@
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

   EmbeddedPkg/SerialDxe/SerialDxe.inf

 

-  ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf

   

   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
index 2686df4eef..36bd1ab3e5 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
@@ -122,7 +122,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x10009000

   

   #

-  # ARM PL390 General Interrupt Controller

+  # ARM General Interrupt Controller

   #

   gArmTokenSpaceGuid.PcdGicDistributorBase|0x1F001000

   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x1F000100

@@ -145,7 +145,7 @@
   ArmPlatformPkg/Sec/Sec.inf {

     <LibraryClasses>

       # Use the implementation which set the Secure bits

-      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+      ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf

   }

   

   #

@@ -211,7 +211,7 @@
   MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

   EmbeddedPkg/SerialDxe/SerialDxe.inf

 

-  ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf

   

   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
index babadd87e9..7b96b0e059 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
@@ -138,7 +138,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

   INF EmbeddedPkg/SerialDxe/SerialDxe.inf

   

-  INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf

   

   INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
index 2e8ae2f500..705e21802b 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
@@ -139,7 +139,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

   INF EmbeddedPkg/SerialDxe/SerialDxe.inf

   

-  INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf

   

   INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
index bc4807f3f1..97ee9123a1 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb.dsc.inc
@@ -60,7 +60,7 @@
   CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf

   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf

   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf

-  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

+  ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf

   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf

 

   # RealView Emulation Board Specific Libraries

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
index 0cc4434165..cb1c87f540 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -39,8 +39,8 @@
 

   #DebugAgentTimerLib|ArmPlatformPkg/ArmVExpressPkg/Library/DebugAgentTimerLib/DebugAgentTimerLib.inf

 

-  # ARM PL390 General Interrupt Driver in Secure and Non-secure

-  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

+  # ARM General Interrupt Driver in Secure and Non-secure

+  ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf

 

   LcdPlatformLib|ArmPlatformPkg/ArmVExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf

   

@@ -163,7 +163,7 @@
   

   

   #

-  # ARM PL390 General Interrupt Controller

+  # ARM General Interrupt Controller

   #

   gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C001000

   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C002000

@@ -242,7 +242,7 @@
 

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 

-  ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

   #ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf

   ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/HdLcdGraphicsOutputDxe.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
index 290e04830c..465b88a800 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA15-A7.fdf
@@ -92,7 +92,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

   INF EmbeddedPkg/SerialDxe/SerialDxe.inf

 

-  INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf

   INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

   #INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index 42a5119e74..64fcb3d4f9 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -167,7 +167,7 @@
   gArmPlatformTokenSpaceGuid.PcdPL180MciBaseAddress|0x10005000

   

   #

-  # ARM PL390 General Interrupt Controller

+  # ARM General Interrupt Controller

   #

   gArmTokenSpaceGuid.PcdGicDistributorBase|0x1e001000

   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x1e000100

@@ -204,7 +204,7 @@
   ArmPlatformPkg/Sec/Sec.inf {

     <LibraryClasses>

       # Use the implementation which set the Secure bits

-      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+      ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf

   }

   

   #

@@ -270,7 +270,7 @@
   

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 

-  ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

   ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf

   ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
index 34b9d250a1..cd44c51645 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf
@@ -166,7 +166,7 @@ READ_LOCK_STATUS   = TRUE
 

   INF MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 

-  INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf

   INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

   INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
index 2d12f4ba85..b1ce4584d1 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.dsc
@@ -132,7 +132,7 @@
   gArmPlatformTokenSpaceGuid.PcdPL180MciBaseAddress|0x1C050000

   

   #

-  # ARM PL390 General Interrupt Controller

+  # ARM General Interrupt Controller

   #

   gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C001000

   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C002000

@@ -171,7 +171,7 @@
   ArmPlatformPkg/Sec/Sec.inf {

     <LibraryClasses>

       # Use the implementation which set the Secure bits

-      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+      ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf

   }

   

   #

@@ -237,7 +237,7 @@
 

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 

-  ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

   ArmPkg/Drivers/TimerDxe/TimerDxe.inf

   ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
index af42aefa9a..a15a0f082e 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15.fdf
@@ -138,7 +138,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

   INF EmbeddedPkg/SerialDxe/SerialDxe.inf

 

-  INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf

   INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

   INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
index efd80ab0a7..440ff9a294 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.dsc
@@ -134,7 +134,7 @@
   gArmPlatformTokenSpaceGuid.PcdPL180MciBaseAddress|0x1C050000

   

   #

-  # ARM PL390 General Interrupt Controller

+  # ARM General Interrupt Controller

   #

   gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C001000

   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C002000

@@ -173,7 +173,7 @@
   ArmPlatformPkg/Sec/Sec.inf {

     <LibraryClasses>

       # Use the implementation which set the Secure bits

-      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+      ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf

   }

   

   #

@@ -239,7 +239,7 @@
 

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 

-  ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

   ArmPkg/Drivers/TimerDxe/TimerDxe.inf

   ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
index 24e55751d5..6b5d516d3d 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A15_MPCore.fdf
@@ -138,7 +138,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

   INF EmbeddedPkg/SerialDxe/SerialDxe.inf

 

-  INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf

   INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

   INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
index b6355026a3..f04f780116 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.dsc
@@ -144,7 +144,7 @@
   gArmPlatformTokenSpaceGuid.PcdPL180MciBaseAddress|0x1C050000

   

   #

-  # ARM PL390 General Interrupt Controller

+  # ARM General Interrupt Controller

   #

   gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C001000

   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C000100

@@ -182,7 +182,7 @@
   ArmPlatformPkg/Sec/Sec.inf {

     <LibraryClasses>

       # Use the implementation which set the Secure bits

-      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+      ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf

   }

   

   #

@@ -248,7 +248,7 @@
 

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 

-  ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

   ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf

   ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
index 728eb78504..346a90e216 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-A9x4.fdf
@@ -137,7 +137,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

   INF EmbeddedPkg/SerialDxe/SerialDxe.inf

 

-  INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf

   INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

   INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.dsc
index 4ba827b288..f4aeee8e21 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.dsc
@@ -111,7 +111,7 @@
   gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|38400

 

   #

-  # ARM PL390 General Interrupt Controller

+  # ARM General Interrupt Controller

   #

   gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C001000

   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C002000

@@ -149,7 +149,7 @@
   ArmPlatformPkg/Sec/Sec.inf {

     <LibraryClasses>

       # Use the implementation which set the Secure bits

-      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+      ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf

   }

 

   #

@@ -215,7 +215,7 @@
 

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 

-  ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   ArmPkg/Drivers/TimerDxe/TimerDxe.inf

   MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

 

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
index a358b061d3..7763b67818 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4-foundation.fdf
@@ -137,7 +137,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

   INF EmbeddedPkg/SerialDxe/SerialDxe.inf

 

-  INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf

   INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf

 

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc
index 9c4d0bdb22..eb1a988948 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.dsc
@@ -133,7 +133,7 @@
   gArmPlatformTokenSpaceGuid.PcdPL180MciBaseAddress|0x1C050000

  

   #

-  # ARM PL390 General Interrupt Controller

+  # ARM General Interrupt Controller

   #

   gArmTokenSpaceGuid.PcdGicDistributorBase|0x2C001000

   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x2C002000

@@ -171,7 +171,7 @@
   ArmPlatformPkg/Sec/Sec.inf {

     <LibraryClasses>

       # Use the implementation which set the Secure bits

-      ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicSecLib.inf

+      ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf

   }

  

   #

@@ -237,7 +237,7 @@
 

   MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf

 

-  ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

   ArmPkg/Drivers/TimerDxe/TimerDxe.inf

   ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
index c732442b22..26e0828b44 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-RTSM-AEMv8Ax4.fdf
@@ -139,7 +139,7 @@ READ_LOCK_STATUS   = TRUE
   INF MdeModulePkg/Universal/Console/TerminalDxe/TerminalDxe.inf

   INF EmbeddedPkg/SerialDxe/SerialDxe.inf

 

-  INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf

+  INF ArmPkg/Drivers/ArmGic/ArmGicDxe.inf

   INF ArmPkg/Drivers/TimerDxe/TimerDxe.inf

   INF ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.inf

   INF ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
index dee39aa8e2..93e541239c 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc
@@ -60,7 +60,7 @@
   CpuExceptionHandlerLib|MdeModulePkg/Library/CpuExceptionHandlerLibNull/CpuExceptionHandlerLibNull.inf

   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf

   DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf

-  ArmGicLib|ArmPkg/Drivers/PL390Gic/PL390GicLib.inf

+  ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf

   ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf

   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf