ArmPlatformPkg/ArmRealViewEbPkg: Use PL390 GIC on RTSM

ArmRealViewEb model (RTSM) use the PL390 Generic Interrupt Controller
as interrupt controller.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11732 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
index 89d6c1a02e0e0d7f5adc89dc99e8a3c9974fff7f..edd23569e0d01fc2dfb570f68860ce399fafb4ca 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
@@ -351,6 +351,7 @@
   #\r
   gArmTokenSpaceGuid.PcdGicDistributorBase|0x10041000\r
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x10040000\r
+  gArmTokenSpaceGuid.PcdGicNumInterrupts|96\r
 \r
   #\r
   # ARM OS Loader\r
@@ -426,7 +427,7 @@
   EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf\r
 \r
   ArmPlatformPkg/ArmRealViewEbPkg/FvbDxe/FvbDxe.inf\r
-  ArmPlatformPkg/ArmRealViewEbPkg/InterruptDxe/InterruptDxe.inf\r
+  ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf\r
   ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf\r
 \r
   #\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
index 9e996e197ce37c010ebccc150f629ea8ff67fc63..537bc95730e718f123b34f1ec07d760f04dcd930 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
@@ -355,6 +355,7 @@
   #
   gArmTokenSpaceGuid.PcdGicDistributorBase|0x10041000
   gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase|0x10040000
+  gArmTokenSpaceGuid.PcdGicNumInterrupts|96
 
   #
   # ARM OS Loader
@@ -437,7 +438,7 @@
   EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf
 
   ArmPlatformPkg/ArmRealViewEbPkg/FvbDxe/FvbDxe.inf
-  ArmPlatformPkg/ArmRealViewEbPkg/InterruptDxe/InterruptDxe.inf
+  ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf
   ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf
 
   #

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
index 2873c562a97441ac4b3301bf39b980879d18ebff..01eb8d69f809e71f6f1094359c5831864a9f63a1 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-MPCore.fdf
@@ -161,7 +161,7 @@ READ_LOCK_STATUS   = TRUE
    
   INF EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf
   
-  INF ArmPlatformPkg/ArmRealViewEbPkg/InterruptDxe/InterruptDxe.inf
+  INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf
   INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf
 
   #

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
index 9b61e08c53104bb20e622d0d894ef02db4fac8bf..29c8e7e2712ced24f7d3998f9584161addd03c04 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-UniCore.fdf
@@ -161,7 +161,7 @@ READ_LOCK_STATUS   = TRUE
    \r
   INF EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf\r
   \r
-  INF ArmPlatformPkg/ArmRealViewEbPkg/InterruptDxe/InterruptDxe.inf\r
+  INF ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf\r
   INF ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf\r
 \r
   #\r