From patchwork Thu Apr 9 11:28:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 46938 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id BB10A21416 for ; Thu, 9 Apr 2015 11:29:24 +0000 (UTC) Received: by lbcne10 with SMTP id ne10sf26058228lbc.1 for ; Thu, 09 Apr 2015 04:29:23 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:subject:precedence:reply-to:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:x-original-sender :x-original-authentication-results:mailing-list; bh=GVlel6tk6pD99Nfiwn81vbkg5F10OlPBl/MOeD/Lfiw=; b=lor/uVX2VWCkZElZOhAPSbTEKgiRis9ahc0gNA5rnY/ejD1NvrSOe+1NLcDypEmByU edL+HPJ9409s+o8DmuJgeSrKCYwokwjYgtq3jNRTqIhdP3ARd07e3k4MQ4TjF8K3oZEq 2jYcQL0PU89IG12WxnqEW+JD3qgJ/Ob/WgosAxxkn/YiTxdlqTTSEqDLnP1lU71cTxNr EloOPxqv4t4t2UF9Fb+CI+/etBFYdqytEwAvWUCLM8xJoznoeMg7tqpPoGYXSv+F9Htw g1Qwu5Hdwog8yrzyMN5vtiQ1wIA42PXHPGsX08pMG9JEm0/ahtOVuPr0l69AVHDnTKTi YekQ== X-Gm-Message-State: ALoCoQl30QwTQ4PSyTNJGMnRRf9qHNNhum4ZmsLp3/Oe+hMFPitMPPNZZXUOtlHxyUagk8kgLP/T X-Received: by 10.152.23.7 with SMTP id i7mr299442laf.1.1428578963677; Thu, 09 Apr 2015 04:29:23 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.66 with SMTP id i2ls316434lah.19.gmail; Thu, 09 Apr 2015 04:29:23 -0700 (PDT) X-Received: by 10.152.5.170 with SMTP id t10mr4236601lat.43.1428578963530; Thu, 09 Apr 2015 04:29:23 -0700 (PDT) Received: from mail-lb0-f169.google.com (mail-lb0-f169.google.com. [209.85.217.169]) by mx.google.com with ESMTPS id jc5si4455376lbc.127.2015.04.09.04.29.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Apr 2015 04:29:23 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) client-ip=209.85.217.169; Received: by lbbqq2 with SMTP id qq2so79919933lbb.3 for ; Thu, 09 Apr 2015 04:29:23 -0700 (PDT) X-Received: by 10.152.26.34 with SMTP id i2mr4162615lag.117.1428578963216; Thu, 09 Apr 2015 04:29:23 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.67.65 with SMTP id l1csp411701lbt; Thu, 9 Apr 2015 04:29:22 -0700 (PDT) X-Received: by 10.42.27.14 with SMTP id h14mr37799528icc.19.1428578961697; Thu, 09 Apr 2015 04:29:21 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id s6si2223445igh.30.2015.04.09.04.29.20 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 09 Apr 2015 04:29:21 -0700 (PDT) Received-SPF: pass (google.com: domain of edk2-devel-bounces@lists.sourceforge.net designates 216.34.181.88 as permitted sender) client-ip=216.34.181.88; Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YgAe1-000302-FI; Thu, 09 Apr 2015 11:29:13 +0000 Received: from sog-mx-4.v43.ch3.sourceforge.com ([172.29.43.194] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YgAe0-0002zx-Jv for edk2-devel@lists.sourceforge.net; Thu, 09 Apr 2015 11:29:12 +0000 Received-SPF: pass (sog-mx-4.v43.ch3.sourceforge.com: domain of linaro.org designates 74.125.82.47 as permitted sender) client-ip=74.125.82.47; envelope-from=ard.biesheuvel@linaro.org; helo=mail-wg0-f47.google.com; Received: from mail-wg0-f47.google.com ([74.125.82.47]) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1YgAdy-0006l6-QW for edk2-devel@lists.sourceforge.net; Thu, 09 Apr 2015 11:29:12 +0000 Received: by wgso17 with SMTP id o17so4921542wgs.1 for ; Thu, 09 Apr 2015 04:29:04 -0700 (PDT) X-Received: by 10.180.93.166 with SMTP id cv6mr5251972wib.89.1428578944785; Thu, 09 Apr 2015 04:29:04 -0700 (PDT) Received: from ards-macbook-pro.local ([90.174.5.113]) by mx.google.com with ESMTPSA id l10sm19692348wje.15.2015.04.09.04.29.02 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 09 Apr 2015 04:29:04 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.sourceforge.net, lersek@redhat.com, olivier.martin@arm.com Date: Thu, 9 Apr 2015 13:28:48 +0200 Message-Id: <1428578932-24079-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1428578932-24079-1-git-send-email-ard.biesheuvel@linaro.org> References: <1428578932-24079-1-git-send-email-ard.biesheuvel@linaro.org> X-Spam-Score: -1.5 (-) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 SPF_PASS SPF: sender matches SPF record X-Headers-End: 1YgAdy-0006l6-QW Subject: [edk2] [PATCH v4 1/5] ArmVirtualizationPkg: make ArmVirtualizationMemoryInitPeiLib the default X-BeenThere: edk2-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list Reply-To: edk2-devel@lists.sourceforge.net List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.sourceforge.net X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.169 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 This updates ArmVirtualization.dsc.inc to use the MemoryInitPeiLib implementation for virt targets. The only difference between that one and the original one is that the original one removes memory from the available list if it overlaps the FD region (which may be the case when shadowing NOR flash with system RAM). This is never the case for the Qemu target, which is the only platform affected by this change, since the Xen target already uses this library explicitly. This allows us to remove the Xen-specific declaration of this library dependency. For the Qemu target, this change will not take effect until after the MemoryInitPeim<->MemoryInitPeiLib dependency resolution is fixed in a subsequent patch. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc | 1 + ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc index 51c163286d1f..59a08640aec8 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc +++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc @@ -77,6 +77,7 @@ ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerVirtCounterLib/ArmGenericTimerVirtCounterLib.inf PlatformPeiLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformPeiLib/PlatformPeiLib.inf + MemoryInitPeiLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationMemoryInitPeiLib/ArmVirtualizationMemoryInitPeiLib.inf EfiResetSystemLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.inf # ARM PL031 RTC Driver diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc index d01b3e9c8494..83e37ab90f76 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc +++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationXen.dsc @@ -163,7 +163,6 @@ PrePiLib|EmbeddedPkg/Library/PrePiLib/PrePiLib.inf HobLib|EmbeddedPkg/Library/PrePiHobLib/PrePiHobLib.inf PrePiHobListPointerLib|ArmPlatformPkg/Library/PrePiHobListPointerLib/PrePiHobListPointerLib.inf - MemoryInitPeiLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationMemoryInitPeiLib/ArmVirtualizationMemoryInitPeiLib.inf ArmLib|ArmPkg/Library/ArmLib/AArch64/AArch64LibPrePi.inf MemoryAllocationLib|EmbeddedPkg/Library/PrePiMemoryAllocationLib/PrePiMemoryAllocationLib.inf ArmPlatformGlobalVariableLib|ArmPlatformPkg/Library/ArmPlatformGlobalVariableLib/PrePi/PrePiArmPlatformGlobalVariableLib.inf