From patchwork Thu Jan 15 17:21:47 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 43219 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f200.google.com (mail-we0-f200.google.com [74.125.82.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EFA8E20D60 for ; Thu, 15 Jan 2015 17:21:48 +0000 (UTC) Received: by mail-we0-f200.google.com with SMTP id u56sf8630026wes.3 for ; Thu, 15 Jan 2015 09:21:48 -0800 (PST) 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=DM6eoPhInDQbDjW/n+TXv5TDq5punTuS0fk0DVdSUIo=; b=aeIiTGGWJnM2AXMejwvp9/wQhADQgF1WXMLn3ryCXPBInTu65d8uDLnZsRaNHdRLfx 8ZX/eoZF9eWWaIikPbLBpO7oWwRkfVAv4A+G/kXBUssFW31+ITRtSDSfn/J8fJ/Hp7TV smj8/+znsAExqDoh3bMTLpLvh56l/kUngwKeRQtiCLsIOufXi5mM+cDOthyE4WSQhdOt Gsn+B6zl/YDfgZfLL802CR+D6y89NH+48PsZgWHg9CureGbPk+uCROkJoWm8Pbr2meKP /HEIWBAzNtotBdB9QFBz+nA0NTJiAm5zeSHFbehfZkiS+wR8NNaNGNNsG0x8Tmzw0GRq 2W8g== X-Gm-Message-State: ALoCoQlMd29Pt8Kgau4MRZSyf9TI8Ic0zCIQmWPgNVXLKPRVHDYXPdfjvDLkHCxVDGRMMUSm8/Bz X-Received: by 10.194.78.42 with SMTP id y10mr482780wjw.4.1421342508306; Thu, 15 Jan 2015 09:21:48 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.43.1 with SMTP id s1ls271439lal.23.gmail; Thu, 15 Jan 2015 09:21:48 -0800 (PST) X-Received: by 10.112.140.196 with SMTP id ri4mr11024463lbb.55.1421342508142; Thu, 15 Jan 2015 09:21:48 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id u9si575340lbw.113.2015.01.15.09.21.48 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 09:21:48 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id ms9so14784942lab.10 for ; Thu, 15 Jan 2015 09:21:48 -0800 (PST) X-Received: by 10.112.26.135 with SMTP id l7mr10908543lbg.56.1421342508053; Thu, 15 Jan 2015 09:21:48 -0800 (PST) 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.9.200 with SMTP id c8csp51141lbb; Thu, 15 Jan 2015 09:21:47 -0800 (PST) X-Received: by 10.50.103.41 with SMTP id ft9mr11604750igb.6.1421342498503; Thu, 15 Jan 2015 09:21:38 -0800 (PST) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id q15si4324825ics.106.2015.01.15.09.21.37 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 15 Jan 2015 09:21:38 -0800 (PST) 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-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YBo6s-0005d9-Ap; Thu, 15 Jan 2015 17:21:30 +0000 Received: from sog-mx-1.v43.ch3.sourceforge.com ([172.29.43.191] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YBo6r-0005d2-9M for edk2-devel@lists.sourceforge.net; Thu, 15 Jan 2015 17:21:29 +0000 Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of linaro.org designates 74.125.82.53 as permitted sender) client-ip=74.125.82.53; envelope-from=leif.lindholm@linaro.org; helo=mail-wg0-f53.google.com; Received: from mail-wg0-f53.google.com ([74.125.82.53]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1YBo6q-0005pn-BN for edk2-devel@lists.sourceforge.net; Thu, 15 Jan 2015 17:21:29 +0000 Received: by mail-wg0-f53.google.com with SMTP id x13so16194012wgg.12 for ; Thu, 15 Jan 2015 09:21:22 -0800 (PST) X-Received: by 10.194.90.10 with SMTP id bs10mr20528650wjb.43.1421342482357; Thu, 15 Jan 2015 09:21:22 -0800 (PST) Received: from mohikan.mushroom.smurfnet.nu (cpc4-cmbg17-2-0-cust71.5-4.cable.virginm.net. [86.14.224.72]) by mx.google.com with ESMTPSA id gf9sm2883968wjc.0.2015.01.15.09.21.21 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Jan 2015 09:21:21 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.sourceforge.net, linaro-uefi@lists.linaro.org Date: Thu, 15 Jan 2015 17:21:47 +0000 Message-Id: <1421342508-13347-5-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1421342508-13347-1-git-send-email-leif.lindholm@linaro.org> References: <1421342508-13347-1-git-send-email-leif.lindholm@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: 1YBo6q-0005pn-BN Subject: [edk2] [PATCH v2 4/5] ArmVirtualizationPkg: don't use BdsLib with PlatformIntelBdsLib and INTEL_BDS 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: leif.lindholm@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.215.51 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 With the Intel Bds, the built-in LinuxLoader is no longer accessible (or required). Use the new ArmBdsHelperLib instead of the whole of BdsLib, since the former contains the bits we need. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm --- ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc | 2 ++ ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc | 1 + .../Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc index b05f1ec..230a6fc 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc +++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualization.dsc.inc @@ -96,7 +96,9 @@ DebugAgentTimerLib|EmbeddedPkg/Library/DebugAgentTimerLibNull/DebugAgentTimerLibNull.inf # BDS Libraries +!ifndef INTEL_BDS BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf +!endif FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf [LibraryClasses.common.SEC] diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc index dff4e25..5f09665 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc +++ b/ArmPlatformPkg/ArmVirtualizationPkg/ArmVirtualizationQemu.dsc @@ -49,6 +49,7 @@ TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf + ArmBdsHelperLib|ArmPkg/Library/ArmBdsHelperLib/ArmBdsHelperLib.inf !ifdef INTEL_BDS CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLib.inf diff --git a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf index 8db2ad5..499a3b5 100644 --- a/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf +++ b/ArmPlatformPkg/ArmVirtualizationPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf @@ -44,9 +44,9 @@ OvmfPkg/OvmfPkg.dec [LibraryClasses] + ArmBdsHelperLib BaseLib BaseMemoryLib - BdsLib DebugLib DevicePathLib MemoryAllocationLib