From patchwork Wed Apr 8 07:10:57 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 46866 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F1908218CB for ; Wed, 8 Apr 2015 07:11:41 +0000 (UTC) Received: by wiaa2 with SMTP id a2sf8121102wia.1 for ; Wed, 08 Apr 2015 00:11:41 -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=sb0VyyP0tEtfkeF2EsuejDDEuXP0oYt15Sw5c3o4eb0=; b=LEjVPwUkjGoWPpkulRCOa6cnvPR+3CI+4T2K1GXR4aQX1PNhO7bCkORUjEKhTBkXlb T05s27Cr8Wa4c8egJiZsY5QXf1qDjfGfes5cFev05wWxGwM5pdG49rZXzpxcs8RGPdcJ hq0AE+XZqreRFXb6xCfO8GD6JgqhH8SjyhoFyZdJTi+HRzPugX/zLvs1JGoHd6IlkD2C 5wkciYBPzB5y2L/kY3Q7R8Rdl4Q0YiQVgahEccdOVdTOY2bPDgpQNynuId7cRVpbZtVq xHLQYvchXk28nobutn0B3HGTiQOdC7QHp9gDPiLTQYga0dBMves+1yPP5ckbSdIKUFt3 T56Q== X-Gm-Message-State: ALoCoQnFAJKcFftYgAms7PdHOo0gDIeSAr9VKd05Ufk7Zn6IVNI2SsIqtCC5PG+e7DmhHczPTtYy X-Received: by 10.112.130.71 with SMTP id oc7mr2928928lbb.23.1428477101258; Wed, 08 Apr 2015 00:11:41 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.115.211 with SMTP id jq19ls159723lab.32.gmail; Wed, 08 Apr 2015 00:11:40 -0700 (PDT) X-Received: by 10.112.98.201 with SMTP id ek9mr21790029lbb.68.1428477100911; Wed, 08 Apr 2015 00:11:40 -0700 (PDT) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com. [209.85.217.181]) by mx.google.com with ESMTPS id ps10si8018565lbb.26.2015.04.08.00.11.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 08 Apr 2015 00:11:40 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.181 as permitted sender) client-ip=209.85.217.181; Received: by lbbzk7 with SMTP id zk7so60050533lbb.0 for ; Wed, 08 Apr 2015 00:11:40 -0700 (PDT) X-Received: by 10.112.8.101 with SMTP id q5mr21933569lba.19.1428477100479; Wed, 08 Apr 2015 00:11:40 -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 l1csp878070lbt; Wed, 8 Apr 2015 00:11:39 -0700 (PDT) X-Received: by 10.42.100.211 with SMTP id b19mr31197010ico.5.1428477098837; Wed, 08 Apr 2015 00:11:38 -0700 (PDT) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id fx3si8797345igd.3.2015.04.08.00.11.38 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 08 Apr 2015 00:11:38 -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 1Yfk93-0003WG-6s; Wed, 08 Apr 2015 07:11:29 +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 1Yfk92-0003WB-Io for edk2-devel@lists.sourceforge.net; Wed, 08 Apr 2015 07:11:28 +0000 Received-SPF: pass (sog-mx-4.v43.ch3.sourceforge.com: domain of linaro.org designates 74.125.82.48 as permitted sender) client-ip=74.125.82.48; envelope-from=ard.biesheuvel@linaro.org; helo=mail-wg0-f48.google.com; Received: from mail-wg0-f48.google.com ([74.125.82.48]) by sog-mx-4.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1Yfk91-0005vI-Md for edk2-devel@lists.sourceforge.net; Wed, 08 Apr 2015 07:11:28 +0000 Received: by wgsk9 with SMTP id k9so55771748wgs.3 for ; Wed, 08 Apr 2015 00:11:21 -0700 (PDT) X-Received: by 10.194.3.77 with SMTP id a13mr32492657wja.104.1428477081713; Wed, 08 Apr 2015 00:11:21 -0700 (PDT) Received: from ards-macbook-pro.local ([90.174.5.65]) by mx.google.com with ESMTPSA id wo10sm14210001wjb.35.2015.04.08.00.11.19 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 Apr 2015 00:11:20 -0700 (PDT) From: Ard Biesheuvel To: edk2-devel@lists.sourceforge.net, lersek@redhat.com, olivier.martin@arm.com Date: Wed, 8 Apr 2015 09:10:57 +0200 Message-Id: <1428477061-1768-2-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1428477061-1768-1-git-send-email-ard.biesheuvel@linaro.org> References: <1428477061-1768-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: 1Yfk91-0005vI-Md Subject: [edk2] [PATCH v3 1/5] ArmPlatformPkg: do not fulfil MemoryInitPeiLib dependency directly via .c file 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.181 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 MemoryInitPeim short-circuits its MemoryInitPeiLib dependency by including the .c file directly. This prevents us from having a special implementation for ArmVirtualizationPkg that performs additional cache maintenance before enabling the MMU. So instead, make it depend on the library class. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc | 1 + ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf | 2 +- ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc index 51c163286d1f..b03616842f81 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/MemoryInitPei/MemoryInitPeiLib.inf EfiResetSystemLib|ArmPlatformPkg/ArmVirtualizationPkg/Library/ArmVirtualizationPsciResetSystemLib/ArmVirtualizationPsciResetSystemLib.inf # ARM PL031 RTC Driver diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf index 1e5b93e8a507..7f1976d60c31 100755 --- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf +++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeiLib.inf @@ -17,7 +17,7 @@ FILE_GUID = 55ddb6e0-70b5-11e0-b33e-0002a5d5c51b MODULE_TYPE = SEC VERSION_STRING = 1.0 - LIBRARY_CLASS = PlatformPeiLib + LIBRARY_CLASS = MemoryInitPeiLib [Sources] MemoryInitPeiLib.c diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf index 6374b63f8524..2c14a9c826ff 100755 --- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf +++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.inf @@ -28,7 +28,6 @@ [Sources] MemoryInitPeim.c - MemoryInitPeiLib.c [Packages] MdePkg/MdePkg.dec @@ -43,6 +42,7 @@ HobLib ArmLib ArmPlatformLib + MemoryInitPeiLib [Guids] gEfiMemoryTypeInformationGuid