From patchwork Fri Apr 8 09:44:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 65373 Delivered-To: patch@linaro.org Received: by 10.112.43.237 with SMTP id z13csp569227lbl; Fri, 8 Apr 2016 02:45:45 -0700 (PDT) X-Received: by 10.98.76.22 with SMTP id z22mr11404938pfa.78.1460108741866; Fri, 08 Apr 2016 02:45:41 -0700 (PDT) Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id gj3si22321pac.243.2016.04.08.02.45.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 08 Apr 2016 02:45:41 -0700 (PDT) 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; 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 dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 938641A1FC5; Fri, 8 Apr 2016 02:45:35 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x232.google.com (mail-wm0-x232.google.com [IPv6:2a00:1450:400c:c09::232]) (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 B71521A1FC5 for ; Fri, 8 Apr 2016 02:45:33 -0700 (PDT) Received: by mail-wm0-x232.google.com with SMTP id u206so15474929wme.1 for ; Fri, 08 Apr 2016 02:45:33 -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=2gkbMe3Gjp0WbHchq3LLxcdFIPc8Sb9lLzDt3MrSN6s=; b=YH7Z3508YfZyYPmkahrwPhWq5EhG6OCTaf7B93G7DZLGQac0F8fpgWh94xqR5o2IMl AHP+6kVmRb2jZJolZJY/O2jClkfrgKXpH/4X6O6Fbet6kBVvnQrTubSA4ekN2W+nIWp4 R1Pw2DAoBvrqOhWGUBgcxTvpuEEjIP1kgZo7U= 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=2gkbMe3Gjp0WbHchq3LLxcdFIPc8Sb9lLzDt3MrSN6s=; b=bmkSFee9p3v/f+1QdsjoOuxeg95i2jn+CjdQT0oWM/2MVKa8O3w3k54jfImaeIKFz3 ZElQjR/q9vDONkbn9l9ebiCuFd4WchAOVzdcJYut+z2Q+HPGOmZOY1BWKDSWCws0SPEo NCl1ls3bkpSx7BNoUwEgkQuuSYPw05LOrNZUDix0zvLaHoubnTRZ2prUh8jlAp0DdJUl S4gxlFyKOK83RFx7DJkcoY2OEdqiJyu7W0LFhFp9L3jhM+R7Tq0AJ/Y26Yu64gy2Ybgv NK6/jRhNbTONj6geWZITYosYRl9U9GtmEQy3PdzE4OXZHMJWPfhaIvVYCnxzqIBptnXb b4oQ== X-Gm-Message-State: AD7BkJLPzxnFtBumntCBBeC2Skiggfqs0qmwve4qm5MPbwLorHOYxkiI9s2GhqahVIJTYjhT X-Received: by 10.28.138.196 with SMTP id m187mr2594379wmd.61.1460108732448; Fri, 08 Apr 2016 02:45:32 -0700 (PDT) Received: from localhost.localdomain ([195.55.142.58]) by smtp.gmail.com with ESMTPSA id s10sm9710681wjp.3.2016.04.08.02.45.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Apr 2016 02:45:31 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.01.org, lersek@redhat.com Date: Fri, 8 Apr 2016 11:44:56 +0200 Message-Id: <1460108711-12122-10-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1460108711-12122-1-git-send-email-ard.biesheuvel@linaro.org> References: <1460108711-12122-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH v2 09/24] 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. Since ArmPkg/TimerDxe is the only consumer of these PCDs, which is the DXE driver ArmVirtTimerFdtClientLib is intended to complement, this conversion is guaranteed to be safe. 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 Reviewed-by: Laszlo Ersek diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index d0ecea4616a6..7743d912d21c 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 fde5688c2102..a30557d8c306 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 e54c401b305e..040339c882e6 100644 --- a/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf +++ b/ArmVirtPkg/Library/ArmVirtTimerFdtClientLib/ArmVirtTimerFdtClientLib.inf @@ -43,3 +43,6 @@ [Pcd] gArmTokenSpaceGuid.PcdArmArchTimerIntrNum gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum + +[Depex] + gFdtClientProtocolGuid