From patchwork Wed Apr 6 16:15:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 65200 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1147165lbc; Wed, 6 Apr 2016 09:16:05 -0700 (PDT) X-Received: by 10.98.34.216 with SMTP id p85mr39403569pfj.45.1459959363393; Wed, 06 Apr 2016 09:16:03 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id h85si5490912pfj.72.2016.04.06.09.16.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 06 Apr 2016 09:16:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8899E1A1FBD; Wed, 6 Apr 2016 09:15:49 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x234.google.com (mail-wm0-x234.google.com [IPv6:2a00:1450:400c:c09::234]) (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 184AC1A1FD5 for ; Wed, 6 Apr 2016 09:15:48 -0700 (PDT) Received: by mail-wm0-x234.google.com with SMTP id 191so63900193wmq.0 for ; Wed, 06 Apr 2016 09:15:48 -0700 (PDT) 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=Zb8nQGubI0rbE0mO9e8mrGfNu78usX2m4JLxjXlTGis=; b=HA9uF1j9FKyOveAfXngbccDm1w3wpYq8YV9S8xEzFgs+1KW5Xxxu5bGHny0tv1IM/k R6nzYd8pgH/vgBBQ9KarQqulp+p6lCWHUlYaZQ5EwlfPjKaYx04XCe7cPv3RrdE1X36h IKFwVlBIxLXbptkTY2ZO4gU7lyco8+XmH4X/Q= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Zb8nQGubI0rbE0mO9e8mrGfNu78usX2m4JLxjXlTGis=; b=Hsjh7YiPjFIY0MNr8/5pe5yTVgmVptDbFiM639NVwmCYr77bxiQrlFNKRkf2fJyPkJ 4QFyFjcFZlLxTmiwpZfFO4bjx6dyQwCvIIzqsTQAP2ylM8aYBj/ZzMdPHmpaLrMf1Zjd ZUUUcv5JAsKcf1xnopNoHVTMOTRpTrBoRokEXujoS/2XAUFITUBfJsxumrjCuj0DjNlb 5iGgNisgBKPCD68+bWtoP20UHP2FToQixo3gRFjR0QHsXwNkkYy5nfAyn7OO+fRNiucD iVO4mFSL6ILtlDp6TGTxrf1NyxpUD3Pk55eRs2aC02Vkx7N8LcBDhLTamT6Yaavw/we3 SIqA== X-Gm-Message-State: AD7BkJIkpPfXcrvX/0rG/P0+hSXIXapz66EAK9z287Z4elAwCa8oXQc8eEhKZM4lL+78ZOSH X-Received: by 10.28.182.194 with SMTP id g185mr25369968wmf.41.1459959346799; Wed, 06 Apr 2016 09:15:46 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id om6sm3961219wjc.40.2016.04.06.09.15.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Apr 2016 09:15:46 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Date: Wed, 6 Apr 2016 18:15:09 +0200 Message-Id: <1459959319-19293-12-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1459959319-19293-1-git-send-email-ard.biesheuvel@linaro.org> References: <1459959319-19293-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH 11/21] ArmVirtPkg: move TimerDxe to FDT client library X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Move to the new dedicated to ArmVirtTimerFdtClientLib to populate the various timer related PCDs at driver load time rather than relying on VirtFdtDxe to do it. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirtQemu.dsc | 5 ++++- ArmVirtPkg/ArmVirtQemuKernel.dsc | 5 ++++- ArmVirtPkg/ArmVirtXen.dsc | 5 ++++- ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf | 3 +++ 4 files changed, 15 insertions(+), 3 deletions(-) -- 2.5.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index dac37c90f96b..ee9d37c2d660 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -313,7 +313,10 @@ [Components.common] MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf ArmPkg/Drivers/ArmGic/ArmGicDxe.inf - ArmPkg/Drivers/TimerDxe/TimerDxe.inf + ArmPkg/Drivers/TimerDxe/TimerDxe.inf { + + NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf + } !if $(SECURE_BOOT_ENABLE) == TRUE ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf !else diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 6d0946776f76..f41dd19da583 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -291,7 +291,10 @@ [Components.common] MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf ArmPkg/Drivers/ArmGic/ArmGicDxe.inf - ArmPkg/Drivers/TimerDxe/TimerDxe.inf + ArmPkg/Drivers/TimerDxe/TimerDxe.inf { + + NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf + } !if $(SECURE_BOOT_ENABLE) == TRUE ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashAuthenticatedDxe.inf !else diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc index 9cf51d5554ea..7ea46514dad3 100644 --- a/ArmVirtPkg/ArmVirtXen.dsc +++ b/ArmVirtPkg/ArmVirtXen.dsc @@ -202,7 +202,10 @@ [Components.common] MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf ArmPkg/Drivers/ArmGic/ArmGicDxe.inf - ArmPkg/Drivers/TimerDxe/TimerDxe.inf + ArmPkg/Drivers/TimerDxe/TimerDxe.inf { + + NULL|ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf + } MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf # diff --git a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf index b694c5c817a5..50af25f691e2 100644 --- a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf +++ b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf @@ -45,3 +45,6 @@ [Pcd] gArmTokenSpaceGuid.PcdArmArchTimerIntrNum gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum + +[Depex] + gFdtClientProtocolGuid