From patchwork Wed Jan 14 17:51:12 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 43126 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3BFF5240B9 for ; Wed, 14 Jan 2015 17:51:09 +0000 (UTC) Received: by mail-la0-f71.google.com with SMTP id q1sf5631841lam.2 for ; Wed, 14 Jan 2015 09:51:08 -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:cc: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=9JqKDlx2nIftyr4TjKgJmBByeve2Lyf1YnH+xmilRA4=; b=UE6EC4s0QVIYNpV0HF6fR55AsRfCJXPTI542itKLse9dFTG3xPUOifxVKP3FCvC/iK ImDSaBezgGi7Nwyb/hWR7vjhyVxp1EeyWYAMDspCYAX7QokxtoSqnXAoUU58CK39rhS6 ZnI6PfZ1RRBeAuMRUc0zg+QCfO+E2X1X+rY4xuGKL8HNN6ZO/8CS0QTuR1w7v8jf4/br rpN4t/HijQYfO+ZIMRMc7K9+UZVLtok+MxgpqBAzUxmzSk5OC6ei7eQ77tZSpdDshYcy FuxNuLJjxm3YfsUe/RjGALgLn+hrXGCMpus5s3mwEY97JYZhx3uJjL9J7BgBbAOfj5AU 5s1g== X-Gm-Message-State: ALoCoQkcMBxIdE0WS23D+S98Iyr0a1bIjr8fvIkC56I+slZ/6uuqcMQr/bNDEQawXdS5i7rxHTzI X-Received: by 10.180.105.97 with SMTP id gl1mr3781884wib.7.1421257868035; Wed, 14 Jan 2015 09:51:08 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.234.228 with SMTP id uh4ls148802lac.108.gmail; Wed, 14 Jan 2015 09:51:07 -0800 (PST) X-Received: by 10.112.150.194 with SMTP id uk2mr5369641lbb.84.1421257867868; Wed, 14 Jan 2015 09:51:07 -0800 (PST) Received: from mail-la0-f46.google.com (mail-la0-f46.google.com. [209.85.215.46]) by mx.google.com with ESMTPS id la2si27864933lbc.110.2015.01.14.09.51.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 14 Jan 2015 09:51:07 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.46 as permitted sender) client-ip=209.85.215.46; Received: by mail-la0-f46.google.com with SMTP id q1so9504559lam.5 for ; Wed, 14 Jan 2015 09:51:07 -0800 (PST) X-Received: by 10.152.6.132 with SMTP id b4mr5325526laa.59.1421257867720; Wed, 14 Jan 2015 09:51:07 -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 c8csp1774904lbb; Wed, 14 Jan 2015 09:51:06 -0800 (PST) X-Received: by 10.50.61.238 with SMTP id t14mr5806882igr.34.1421257866142; Wed, 14 Jan 2015 09:51:06 -0800 (PST) Received: from lists.sourceforge.net (lists.sourceforge.net. [216.34.181.88]) by mx.google.com with ESMTPS id sb10si1437550igb.35.2015.01.14.09.51.05 (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 14 Jan 2015 09:51:06 -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-4.v29.ch3.sourceforge.com) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YBS5p-0002TM-Bn; Wed, 14 Jan 2015 17:50:57 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-4.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YBS5o-0002TA-BR for edk2-devel@lists.sourceforge.net; Wed, 14 Jan 2015 17:50:56 +0000 Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of linaro.org designates 74.125.82.170 as permitted sender) client-ip=74.125.82.170; envelope-from=leif.lindholm@linaro.org; helo=mail-we0-f170.google.com; Received: from mail-we0-f170.google.com ([74.125.82.170]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1YBS5m-0000kf-AG for edk2-devel@lists.sourceforge.net; Wed, 14 Jan 2015 17:50:56 +0000 Received: by mail-we0-f170.google.com with SMTP id w61so10255057wes.1 for ; Wed, 14 Jan 2015 09:50:48 -0800 (PST) X-Received: by 10.180.103.40 with SMTP id ft8mr51559458wib.68.1421257848311; Wed, 14 Jan 2015 09:50:48 -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 dp8sm19547211wib.20.2015.01.14.09.50.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 14 Jan 2015 09:50:47 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.sourceforge.net Date: Wed, 14 Jan 2015 17:51:12 +0000 Message-Id: <1421257873-31317-3-git-send-email-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.1.3 In-Reply-To: <1421257873-31317-1-git-send-email-leif.lindholm@linaro.org> References: <1421257873-31317-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: 1YBS5m-0000kf-AG Cc: linaro-uefi@lists.linaro.org Subject: [edk2] [PATCH 2/3] ArmPkg/ArmPlatformPkg: remove components when using 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.215.46 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 BdsLib to be included when building with -D INTEL_BDS, so conditionalise its inclusion in various places. Also drop Android Fastboot components, which have some hard dependencies on BdsLib. 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 | 4 ++++ ArmPlatformPkg/Library/PlatformIntelBdsLib/IntelBdsPlatform.c | 1 + ArmPlatformPkg/Library/PlatformIntelBdsLib/PlatformIntelBdsLib.inf | 2 +- 5 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index be5126c..7287231 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 f8b7511..07f4e8b 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 @@ -399,9 +401,11 @@ # ISP1761 USB OTG Controller EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf +!ifndef INTEL_BDS # # Android Fastboot # EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf +!endif 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