From patchwork Thu Jan 15 17:21:46 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 43218 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 8D5E420D60 for ; Thu, 15 Jan 2015 17:21:46 +0000 (UTC) Received: by mail-we0-f200.google.com with SMTP id u56sf8629660wes.3 for ; Thu, 15 Jan 2015 09:21:45 -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=mDp1a46h5snmU401ODYUQiCv1cH0qGa0zZBVNzds5Fc=; b=QHpMQRknMkmTSFENcPAdRGDm0jv4wHzanq30+TGETAXR9HY/14bOFnueD+8DUTf0Nt ZNxxiga/zbNPH86B7yQRhEz2DulzElaKWfuB5V23DN8nLlgVixAHn2ssBFr5P47a/27i BFhN6ioq2BRDGnuDrd4SEF8b0TlJ0cyvwYRZ1z7SwvsbyUjpU0zjsZaY9pQ9H1q3AFVs kYVHElZaFFiCJrfBMR6rkBprGm1zz0kyvYSIi3KbqMh0WjzuynLzkL8QqwxPqNVGsVl/ YIRFWFcH8fo3vYAbHD83rzLud1MfqLx7Lyc9fOOT33PcfvKZLijbVz4KjcBWz8c5N8FR J35w== X-Gm-Message-State: ALoCoQkZBTsAMdHwhlZgfDT3JR8xX5fR1MT3zk8wQSt3bopaTKKlkQCVblo8Sz1ZKZUzJMTI7cXC X-Received: by 10.194.78.42 with SMTP id y10mr482762wjw.4.1421342505802; Thu, 15 Jan 2015 09:21:45 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.39 with SMTP id x7ls277226lax.92.gmail; Thu, 15 Jan 2015 09:21:45 -0800 (PST) X-Received: by 10.152.88.4 with SMTP id bc4mr11251321lab.5.1421342505633; Thu, 15 Jan 2015 09:21:45 -0800 (PST) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id x8si1988287lax.116.2015.01.15.09.21.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 09:21:45 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by mail-lb0-f177.google.com with SMTP id b6so14386993lbj.8 for ; Thu, 15 Jan 2015 09:21:45 -0800 (PST) X-Received: by 10.112.14.6 with SMTP id l6mr11158144lbc.91.1421342505489; Thu, 15 Jan 2015 09:21:45 -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 c8csp51127lbb; Thu, 15 Jan 2015 09:21:44 -0800 (PST) X-Received: by 10.50.143.44 with SMTP id sb12mr1506721igb.3.1421342497873; Thu, 15 Jan 2015 09:21:37 -0800 (PST) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id w141si1661250iod.69.2015.01.15.09.21.37 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 15 Jan 2015 09:21:37 -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 1YBo6r-0005cw-0C; Thu, 15 Jan 2015 17:21:29 +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 1YBo6q-0005cr-AC for edk2-devel@lists.sourceforge.net; Thu, 15 Jan 2015 17:21:28 +0000 Received-SPF: pass (sog-mx-1.v43.ch3.sourceforge.com: domain of linaro.org designates 74.125.82.177 as permitted sender) client-ip=74.125.82.177; envelope-from=leif.lindholm@linaro.org; helo=mail-we0-f177.google.com; Received: from mail-we0-f177.google.com ([74.125.82.177]) by sog-mx-1.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1YBo6p-0005pl-BX for edk2-devel@lists.sourceforge.net; Thu, 15 Jan 2015 17:21:28 +0000 Received: by mail-we0-f177.google.com with SMTP id q59so15940041wes.8 for ; Thu, 15 Jan 2015 09:21:21 -0800 (PST) X-Received: by 10.194.94.164 with SMTP id dd4mr20917847wjb.56.1421342481292; Thu, 15 Jan 2015 09:21:21 -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.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Jan 2015 09:21:20 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.sourceforge.net, linaro-uefi@lists.linaro.org Date: Thu, 15 Jan 2015 17:21:46 +0000 Message-Id: <1421342508-13347-4-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 -0.0 AWL AWL: Adjusted score from AWL reputation of From: address X-Headers-End: 1YBo6p-0005pl-BX Subject: [edk2] [PATCH v2 3/5] ArmPkg/ArmPlatformPkg: don't use BdsLib with PlatformIntelBdsLib 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.217.177 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 There is no longer a requirement for the whole of BdsLib to be included when building with -D INTEL_BDS, so conditionalise its inclusion in various places, and use ArmBdsHelperLib instead in PlatformIntelBdsLib. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm --- ArmPkg/ArmPkg.dsc | 4 ++++ ArmPlatformPkg/ArmPlatformPkg.dsc | 2 ++ ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc | 2 ++ ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c | 1 + ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf | 2 +- 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index ec70a3d..a90dea2 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -75,7 +75,9 @@ PerformanceLib|MdePkg/Library/BasePerformanceLibNull/BasePerformanceLibNull.inf SerialPortLib|MdePkg/Library/BaseSerialPortLibNull/BaseSerialPortLibNull.inf +!ifndef INTEL_BDS BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf +!endif FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf @@ -108,7 +110,9 @@ ArmPkg/Library/ArmDmaLib/ArmDmaLib.inf ArmPkg/Library/ArmLib/Null/NullArmLib.inf ArmPkg/Library/BaseMemoryLibStm/BaseMemoryLibStm.inf +!ifndef INTEL_BDS ArmPkg/Library/BdsLib/BdsLib.inf +!endif ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf ArmPkg/Library/DebugAgentSymbolsBaseLib/DebugAgentSymbolsBaseLib.inf ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatformPkg.dsc index 81402da..dfc8430 100644 --- a/ArmPlatformPkg/ArmPlatformPkg.dsc +++ b/ArmPlatformPkg/ArmPlatformPkg.dsc @@ -110,7 +110,9 @@ SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf # BDS Libraries +!ifndef INTEL_BDS BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf +!endif FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf [LibraryClasses.ARM] diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc index a17aab9..8bb8b71 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc @@ -112,7 +112,9 @@ SemihostLib|ArmPkg/Library/SemihostLib/SemihostLib.inf # BDS Libraries +!ifndef INTEL_BDS BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf +!endif FdtLib|EmbeddedPkg/Library/FdtLib/FdtLib.inf # RunAxf support via Dynamic Shell Command protocol diff --git a/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c b/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c index c07fc0f..2d02f38 100644 --- a/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c +++ b/ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c @@ -14,6 +14,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ #include "IntelBdsPlatform.h" +#include /// /// Predefined platform default time out value diff --git a/ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf b/ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf index 235589a..95b9f15 100644 --- a/ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf +++ b/ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf @@ -42,9 +42,9 @@ IntelFrameworkModulePkg/IntelFrameworkModulePkg.dec [LibraryClasses] + ArmBdsHelperLib BaseLib BaseMemoryLib - BdsLib DebugLib DevicePathLib MemoryAllocationLib