From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: edk2-devel@lists.01.org, leif.lindholm@linaro.org
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Subject: [PATCH edk2-platforms v2 07/13] Platform/ARM: remove outdated SP804 TimerLib reference
Date: Thu, 16 Nov 2017 17:58:37 +0000 [thread overview]
Message-ID: <20171116175839.30012-8-ard.biesheuvel@linaro.org> (raw)
In-Reply-To: <20171116175839.30012-1-ard.biesheuvel@linaro.org>
ArmVExpress.dsc.inc declares a TimerLib dependency and resolves it
using ArmPlatformPkg/Library/SP804TimerLib/SP804TimerLib.inf, but
all users of the include file supersede it with ArmArchTimerLib.inf
so let's just use that instead.
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
Platform/ARM/JunoPkg/ArmJuno.dsc | 1 -
Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 1 -
Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 --
Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 3 +--
4 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc b/Platform/ARM/JunoPkg/ArmJuno.dsc
index 187c9f5602e5..80a5ef631ce9 100644
--- a/Platform/ARM/JunoPkg/ArmJuno.dsc
+++ b/Platform/ARM/JunoPkg/ArmJuno.dsc
@@ -41,7 +41,6 @@ [LibraryClasses.common]
NorFlashPlatformLib|Platform/ARM/JunoPkg/Library/NorFlashJunoLib/NorFlashJunoLib.inf
- TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf
CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/CustomizedDisplayLib.inf
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
index 51da85fe8bc0..4a55dac7a4a4 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc
@@ -51,7 +51,6 @@ [LibraryClasses.common]
LcdPlatformLib|Platform/ARM/VExpressPkg/Library/HdLcdArmVExpressLib/HdLcdArmVExpressLib.inf
- TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf
[LibraryClasses.common.DXE_RUNTIME_DRIVER]
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
index df6951900ed8..829854963b30 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc
@@ -49,8 +49,6 @@ [LibraryClasses.common]
LcdPlatformLib|Platform/ARM/VExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf
!endif
- TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
-
# Virtio Support
VirtioLib|OvmfPkg/Library/VirtioLib/VirtioLib.inf
VirtioMmioDeviceLib|OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDeviceLib.inf
diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
index 40e1c868fcb2..269636878977 100644
--- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
+++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
@@ -93,8 +93,7 @@ [LibraryClasses.common]
# ARM PL011 UART Driver
PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf
SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.inf
- # ARM SP804 Dual Timer Driver
- TimerLib|ArmPlatformPkg/Library/SP804TimerLib/SP804TimerLib.inf
+ TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
# EBL Related Libraries
EblCmdLib|ArmPlatformPkg/Library/EblCmdLib/EblCmdLib.inf
--
2.11.0
next prev parent reply other threads:[~2017-11-16 17:54 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-16 17:58 [PATCH edk2-platforms v2 00/13] Move ArmPlatformPkg stuff into edk2-platforms Ard Biesheuvel
2017-11-16 17:58 ` [PATCH edk2-platforms v2 01/13] Platform: remove bogus ArmPlatformSecExtraActionLib references Ard Biesheuvel
2017-11-16 17:58 ` [PATCH edk2-platforms v2 02/13] Platform: remove bogus ArmTrustedMonitorLib references Ard Biesheuvel
2017-11-16 17:58 ` [PATCH edk2-platforms v2 03/13] Platform/ArmVExpress-FVP: remove bogus ArmPlatformSecLib reference Ard Biesheuvel
2017-11-16 17:58 ` [PATCH edk2-platforms v2 04/13] Platform/Hisilicon: remove bogus VExpress dependencies Ard Biesheuvel
2017-11-16 17:58 ` [PATCH edk2-platforms v2 05/13] Platform/ARM/Juno: import ArmJunoPkg from EDK2 Ard Biesheuvel
2017-11-16 17:58 ` [PATCH edk2-platforms v2 06/13] Platform/ARM/VExpress: import VExpressPkg " Ard Biesheuvel
2017-11-16 17:58 ` Ard Biesheuvel [this message]
2017-11-16 17:58 ` [PATCH edk2-platforms v2 08/13] Platform/Hisilicon: remove SP804 PCD definitions Ard Biesheuvel
2017-11-16 17:58 ` [PATCH edk2-platforms v2 09/13] Platform: remove references to EBL libraries Ard Biesheuvel
2017-11-16 18:00 ` [PATCH edk2-platforms v2 10/13] Platform: remove stale PL35xSmcLib references Ard Biesheuvel
2017-11-16 18:00 ` [PATCH edk2-platforms v2 11/13] Platform/ARM: import BootMonFs and ArmShellCmdRunAxf from EDK2 Ard Biesheuvel
2017-11-16 18:00 ` [PATCH edk2-platforms v2 12/13] Platform: remove stale EBL related PCD setting Ard Biesheuvel
2017-11-16 18:00 ` [PATCH edk2-platforms v2 13/13] Platform: switch to new PL011UartLib Ard Biesheuvel
2017-11-25 12:12 ` [PATCH edk2-platforms v2 00/13] Move ArmPlatformPkg stuff into edk2-platforms Leif Lindholm
2017-11-26 10:36 ` Ard Biesheuvel
2017-12-04 17:23 ` Leif Lindholm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171116175839.30012-8-ard.biesheuvel@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox