diff options
author | Wei Xu <xuwei5@hisilicon.com> | 2014-07-17 16:50:56 +0800 |
---|---|---|
committer | Wei Xu <xuwei5@huawei.com> | 2014-10-10 17:26:21 +0800 |
commit | ea135bd56641b34fcde4eed53e058c4ac8c76802 (patch) | |
tree | 4c46d904f2eef9338980eae12bf8cd7878286e69 | |
parent | b1caff5a30e3a8893d12b717a4f0811c60839a60 (diff) |
HisiPkg: use ARM GIC Lib to avoid compile error issue
Signed-off-by: Wei Xu <xuwei5@huawei.com>
-rw-r--r-- | HisiPkg/D01BoardPkg/D01BoardPkg.dsc | 4 | ||||
-rw-r--r-- | HisiPkg/D01BoardPkg/D01BoardPkg.dsc.inc | 4 | ||||
-rw-r--r-- | HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01Gic.c | 30 |
3 files changed, 4 insertions, 34 deletions
diff --git a/HisiPkg/D01BoardPkg/D01BoardPkg.dsc b/HisiPkg/D01BoardPkg/D01BoardPkg.dsc index 8bd0f15de..fcf09d0a6 100644 --- a/HisiPkg/D01BoardPkg/D01BoardPkg.dsc +++ b/HisiPkg/D01BoardPkg/D01BoardPkg.dsc @@ -190,8 +190,8 @@ HisiPkg/D01BoardPkg/Sec/Sec/Sec.inf {
<LibraryClasses>
# Use the implementation which set the Secure bits
- ArmGicLib|HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicSecLib.inf
- #ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf
+ #ArmGicLib|HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicSecLib.inf
+ ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf
}
#
diff --git a/HisiPkg/D01BoardPkg/D01BoardPkg.dsc.inc b/HisiPkg/D01BoardPkg/D01BoardPkg.dsc.inc index 9c006c37b..3a23a44c4 100644 --- a/HisiPkg/D01BoardPkg/D01BoardPkg.dsc.inc +++ b/HisiPkg/D01BoardPkg/D01BoardPkg.dsc.inc @@ -59,8 +59,8 @@ ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf
DmaLib|ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf
- ArmGicLib|HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicLib.inf
- #ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf
+ #ArmGicLib|HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01GicLib.inf
+ ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf
ArmPlatformStackLib|ArmPlatformPkg/Library/ArmPlatformStackLib/ArmPlatformStackLib.inf
diff --git a/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01Gic.c b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01Gic.c index da5e437b3..5f9025057 100644 --- a/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01Gic.c +++ b/HisiPkg/Drivers/HisiliconD01Gic/HisiliconD01Gic.c @@ -39,33 +39,3 @@ ArmGicSendSgiTo ( MmioWrite32 (GicDistributorBase + ARM_GIC_ICDSGIR, ((TargetListFilter & 0x3) << 24) | ((CPUTargetList & 0xFF) << 16) | SgiId);
}
-RETURN_STATUS
-EFIAPI
-ArmGicAcknowledgeInterrupt (
- IN UINTN GicDistributorBase,
- IN UINTN GicInterruptInterfaceBase,
- OUT UINTN *CoreId,
- OUT UINTN *InterruptId
- )
-{
- UINT32 Interrupt;
-
- // Read the Interrupt Acknowledge Register
- Interrupt = MmioRead32 (GicInterruptInterfaceBase + ARM_GIC_ICCIAR);
-
- // Check if it is a valid interrupt ID
- if ((Interrupt & 0x3FF) < ArmGicGetMaxNumInterrupts (GicDistributorBase)) {
- // Got a valid SGI number hence signal End of Interrupt by writing to ICCEOIR
- MmioWrite32 (GicInterruptInterfaceBase + ARM_GIC_ICCEIOR, Interrupt);
-
- if (CoreId) {
- *CoreId = (Interrupt >> 10) & 0x7;
- }
- if (InterruptId) {
- *InterruptId = Interrupt & 0x3FF;
- }
- return RETURN_SUCCESS;
- } else {
- return RETURN_INVALID_PARAMETER;
- }
-}
|