From patchwork Thu Nov 16 17:58:37 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 119068 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp5012310edl; Thu, 16 Nov 2017 09:59:11 -0800 (PST) X-Google-Smtp-Source: AGs4zMZp9/4Uf63UMInOw0yYyAX/M+PR22nocw82sOQtmehO4x8eXupqbDClZjgXOaw5Ivq8OJH6 X-Received: by 10.159.231.22 with SMTP id w22mr2488616plq.45.1510855151046; Thu, 16 Nov 2017 09:59:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510855151; cv=none; d=google.com; s=arc-20160816; b=A7TbMDUeZFfuWQ12w2mJh2UNmEwrySBuTcHkUDHyCnv39uYMgBhbrt2LYEbl4tQ8PX ZeJUuQ7WTopvRQWuVw4DVzBlZEHpACwiSUeWTjXKWz9eZ2Wz905Brtpnhj6TLiV/2umx omW/EWe8rhPgFItyei9cAe8F2t+mDXErzvKFw4xRfR/T2snUVirS+sz7BCh7Su7/6pIk ka8PWmttgN8NlolCHdJGhM/dtOZpnUDB/ucRH1hAN8V4qmucjX8oYGvAMZ4xcg+rQYcR SgPJp7tEpIJju4y9Jwrl96E1WuM0B5jwTb9LY4UYjvuyeaywA2NZG3gnjXbbioDDtWa+ CTow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=lgrC67ogYA5FaTPWKxO6Fz5Z17vv6d6da9NJHxXBiMI=; b=IbJEq2z9ylYXI6rZ23o0FKe5MJZygb7O/oNnPN83r3H58sqtVq8iBY8xfLwntK8fxL S6n5mBPePh7ZgpBO7bUtQCDQ4c1CcT6w3zPqQ6BLv0eBj2iAiepOv+NOvY2YkXoh1PPS DnfvVVfBX8UBTwfw7B+Fo3+C0Kf9ePTVwHKeTb/Fucl1vhqtAK/0vCJBY/ObVcb8n1J0 Iv5ljwBlek3Q9pgtF5P8539AnwIzxPG31EMRT1j9UA6deEwzQ1URtf99W+Kjut5k2uU5 4zJERUsK1GSlI11GLCYoGD6NRrHYz8VMXioSkhyhAm3tpnqnKZcPO+4YeIas46VH+ZS5 FwoA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=giJH+fyT; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id 1si1235786pli.449.2017.11.16.09.59.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Nov 2017 09:59:11 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=giJH+fyT; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5A7602035BB1A; Thu, 16 Nov 2017 09:54:56 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c0c::241; helo=mail-wr0-x241.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 733232035BB03 for ; Thu, 16 Nov 2017 09:54:55 -0800 (PST) Received: by mail-wr0-x241.google.com with SMTP id 4so23635941wrt.0 for ; Thu, 16 Nov 2017 09:59:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NW0M/NX3beRUJevGBzHz1sx87P1JNNBYE4xjIH/Tegw=; b=giJH+fyTnN9d92zqNYOGq2iwF24dsxAluOKDX0KdJ5wmfK5HGY98DCxx7Rpa3zfOy7 hP2jA9pq0EGwB+yi7F3E+DJxjbROMzD0DelWekPbgEWujtiLIQa/qbroQRKH49Ibx8/p m3x7b1ZQ7e3lgk/+LyqP1w8SfBgkIMfPEmwsM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NW0M/NX3beRUJevGBzHz1sx87P1JNNBYE4xjIH/Tegw=; b=LlC+QypsEJjYSSjnExC0I9UMMSdxtMdSOIbz48Y75ujisKqb6m8Msw8WwhvnHT0QSg ZAa+PtDE8SL+I5FJt18eRaE7WAplKqFCd1WkITRzOS0Jw5hPnckGPpQJy3iSA6+cCrtU c6BNOGFmSw2UpZJVALRVcx6Jk5kY+JT2NBYOMu0Cf8SdTb3ifkuLVdoVNr9g31pRNC0s sLy5OEy++M7iwd2YEcg9fls5vf+YdHVd6cHnQ9ESsDb9CmLRfXF3Mg/K6znmYhzY7cuH A69Pf6oPLfKRGw4481/EquT6wWdZHf2w63llx2a5bnTV5j2rbE0LQRBOUE+jmDhssdjP P74w== X-Gm-Message-State: AJaThX722New8MsTCkOwi8rjFNnnyaSIXZ4eOkgVKqO4auJI7X05AW4b +4dRFOR+y7wsiWFUgXqo4IkGAQiWoBs= X-Received: by 10.223.157.204 with SMTP id q12mr2357743wre.241.1510855143666; Thu, 16 Nov 2017 09:59:03 -0800 (PST) Received: from localhost.localdomain ([160.167.170.128]) by smtp.gmail.com with ESMTPSA id k13sm1638610wrd.95.2017.11.16.09.59.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Nov 2017 09:59:02 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org, leif.lindholm@linaro.org Date: Thu, 16 Nov 2017 17:58:37 +0000 Message-Id: <20171116175839.30012-8-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171116175839.30012-1-ard.biesheuvel@linaro.org> References: <20171116175839.30012-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-platforms v2 07/13] Platform/ARM: remove outdated SP804 TimerLib reference X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" 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 --- 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(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel 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