ArmPlatformPkg/SP804TimerDxe: Replaced Interrupt number #define by a PCD

The PcdSP804Timer0InterruptNum defines the interrupt number attached to SP804 Timer0.

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

diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec
index 1f83f43f3394535f7023893790bbe69de4151965..1d9c05a2336063c97178d0718976520edf666c96 100644 (file)
--- a/ArmPlatformPkg/ArmPlatformPkg.dec
+++ b/ArmPlatformPkg/ArmPlatformPkg.dec
@@ -69,4 +69,5 @@
   # ARM Primecells
   #
   gArmPlatformTokenSpaceGuid.PcdSP804FrequencyInMHz|1|UINT32|0x0000001D
+  gArmPlatformTokenSpaceGuid.PcdSP804Timer0InterruptNum|0|UINT32|0x0000001E
 

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
index dbe00dffce9e40aa0e75ec2df384af11f2e8f332..47b4d25f47a8e60fc0582cf6217e31fad8596487 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc
@@ -353,6 +353,7 @@
   \r
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|1000000\r
   gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000        # expressed in 100ns units, 100,000 x 100 ns = 10,000,000 ns = 10 ms\r
+  gArmPlatformTokenSpaceGuid.PcdSP804Timer0InterruptNum|36\r
   \r
   #\r
   # ARM Pcds\r

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
index faa79aaf5b321b9b4c548d4add91446a948137ee..b6c3acde18cf3740ed657cd0396b5e2d8f204b3d 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc
@@ -357,6 +357,7 @@
   
   gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|1000000
   gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000        # expressed in 100ns units, 100,000 x 100 ns = 10,000,000 ns = 10 ms
+  gArmPlatformTokenSpaceGuid.PcdSP804Timer0InterruptNum|33
   
   #
   # ARM Pcds

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform/ArmPlatform.h b/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform/ArmPlatform.h
index 18f8a66502b5098b07c64b48cc96bff8b991fef7..f053bdd9cc0e8a2cd53d1bcfbdeee43f3d52da08 100644 (file)
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform/ArmPlatform.h
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform/ArmPlatform.h
@@ -119,15 +119,6 @@
 //#define ARM_EB_L2x0_CTLR_BASE                   0x1E00A000*/\r
 \r
 \r
-/*******************************************\r
-// Interrupt Map\r
-*******************************************/\r
-\r
-// Timer Interrupts\r
-#define TIMER01_INTERRUPT_NUM                34\r
-#define TIMER23_INTERRUPT_NUM                35\r
-\r
-\r
 /*******************************************\r
 // EFI Memory Map in Permanent Memory (DRAM)\r
 *******************************************/\r

diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
index 0d6a028ebdab9b0ff56962866cdc65fdf4437ed3..08c6c62f930d8705fc503f28e2e180a1ab46f516 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
+++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc
@@ -381,6 +381,7 @@
   gArmTokenSpaceGuid.PcdSystemMemorySize|0x40000000
     
   gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000        # expressed in 100ns units, 100,000 x 100 ns = 10,000,000 ns = 10 ms
+  gArmPlatformTokenSpaceGuid.PcdSP804Timer0InterruptNum|34
   
   #
   # ARM Pcds

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h
index 1b64392b2eb3609e5f9bfbb2697d6362123f30f0..f66ff3396ac6c2661948e422108621335966d5d7 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h
+++ b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h
@@ -130,15 +130,6 @@
 // PL111 Lcd\r
 #define PL111_CLCD_CORE_TILE_VIDEO_MODE_OSC_ID  1\r
 \r
-/***********************************************************************************\r
-// Interrupt Map\r
-************************************************************************************/\r
-\r
-// Timer Interrupts\r
-#define TIMER01_INTERRUPT_NUM                   34\r
-#define TIMER23_INTERRUPT_NUM                   35\r
-\r
-\r
 /***********************************************************************************\r
 // EFI Memory Map in Permanent Memory (DRAM)\r
 ************************************************************************************/\r

diff --git a/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804Timer.c b/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804Timer.c
index 7e47891981adf0d21516ffc2543ac916c7c482a3..e74b7e1382db785ee642c6454e457782a1b65a50 100644 (file)
--- a/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804Timer.c
+++ b/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804Timer.c
@@ -379,7 +379,7 @@ TimerInitialize (
   ASSERT_EFI_ERROR (Status);
 
   // Install interrupt handler
-  gVector = TIMER01_INTERRUPT_NUM;
+  gVector = PcdGet32(PcdSP804Timer0InterruptNum);
   Status = gInterrupt->RegisterInterruptSource (gInterrupt, gVector, TimerInterruptHandler);
   ASSERT_EFI_ERROR (Status);
 

diff --git a/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf b/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf
index a1765cc78c2a341981aa1b0f3aed1900392a314c..017277ad710e9f7a2d3a406fc4aa408376c6d6e5 100644 (file)
--- a/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf
+++ b/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf
@@ -49,6 +49,7 @@
 
 [Pcd.common]
   gArmPlatformTokenSpaceGuid.PcdSP804FrequencyInMHz
+  gArmPlatformTokenSpaceGuid.PcdSP804Timer0InterruptNum
   gEmbeddedTokenSpaceGuid.PcdTimerPeriod
 
 [Depex]