From patchwork Thu Jan 15 17:21:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 43217 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f70.google.com (mail-la0-f70.google.com [209.85.215.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CB6FC20D60 for ; Thu, 15 Jan 2015 17:21:41 +0000 (UTC) Received: by mail-la0-f70.google.com with SMTP id hs14sf8683715lab.1 for ; Thu, 15 Jan 2015 09:21:40 -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=PonF36j0xKGs4HvRoH1MsUA1scEt5drH5DFC32EUeIk=; b=KaLbpaOi27VjwhaGfJllTtRkbElRQWvoGmCNDUwJKJ0eda7NRx9zhycxhl28GhNsk7 wYczSVErWifGrauVDg1dT6RORaKJddAcs8QUi0NngSNucMSomdO+2rFqUPjt7AVDXKFh 6YQZaZ8r0SBJTZUbv3K7rSLGh5GZNKU0Lkg3AWseP2MpBsAR5jdFG6acnXm1lKCsbRcm a6V3gV4yfOO0PsxGkNKzDaSjXJb261niN2VQnOdECevip3YXbzeBbPeOk1q489c+uHvq AnuUNeVRJZUmbcTQheF0wRCLhS+8Pf/4M1QhNNtXZFFqO82hdJfGC7x5MZSW3PXhodS7 LRxQ== X-Gm-Message-State: ALoCoQkeB/YaN4yt9TN4GJV/2L5Sp+NWrNxwzcbhHoerzewibqDu5SiGslRI1z8QWNWQlT5yPJOX X-Received: by 10.180.228.38 with SMTP id sf6mr4493078wic.5.1421342500799; Thu, 15 Jan 2015 09:21:40 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.100 with SMTP id p4ls285478laj.24.gmail; Thu, 15 Jan 2015 09:21:40 -0800 (PST) X-Received: by 10.112.164.102 with SMTP id yp6mr10898665lbb.15.1421342500624; Thu, 15 Jan 2015 09:21:40 -0800 (PST) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id xu5si2076516lab.9.2015.01.15.09.21.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 15 Jan 2015 09:21:40 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by mail-la0-f52.google.com with SMTP id hs14so14820046lab.11 for ; Thu, 15 Jan 2015 09:21:40 -0800 (PST) X-Received: by 10.152.115.146 with SMTP id jo18mr11320380lab.9.1421342500444; Thu, 15 Jan 2015 09:21:40 -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 c8csp51101lbb; Thu, 15 Jan 2015 09:21:39 -0800 (PST) X-Received: by 10.42.12.147 with SMTP id y19mr10728162icy.80.1421342497353; 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 l10si4544989icc.81.2015.01.15.09.21.36 (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-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YBo6p-00019i-97; Thu, 15 Jan 2015 17:21:27 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1YBo6o-00019d-KN for edk2-devel@lists.sourceforge.net; Thu, 15 Jan 2015 17:21:26 +0000 Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of linaro.org designates 74.125.82.182 as permitted sender) client-ip=74.125.82.182; envelope-from=leif.lindholm@linaro.org; helo=mail-we0-f182.google.com; Received: from mail-we0-f182.google.com ([74.125.82.182]) by sog-mx-2.v43.ch3.sourceforge.com with esmtps (TLSv1:RC4-SHA:128) (Exim 4.76) id 1YBo6m-0003fG-Ld for edk2-devel@lists.sourceforge.net; Thu, 15 Jan 2015 17:21:26 +0000 Received: by mail-we0-f182.google.com with SMTP id w62so15904309wes.13 for ; Thu, 15 Jan 2015 09:21:18 -0800 (PST) X-Received: by 10.180.98.162 with SMTP id ej2mr20939796wib.39.1421342478617; Thu, 15 Jan 2015 09:21:18 -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.17 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 15 Jan 2015 09:21:18 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.sourceforge.net, linaro-uefi@lists.linaro.org Date: Thu, 15 Jan 2015 17:21:44 +0000 Message-Id: <1421342508-13347-2-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: 1YBo6m-0003fG-Ld Subject: [edk2] [PATCH v2 1/5] ARM: conditionalise inclusion of LinuxLoader/AndroidFastboot 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.52 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 When booting Linux using the UEFI stub loader, there is no need for the built-in LinuxLoader. So make its inclusion conditional. This requires also conditionalising the AndroidFastBoot support, which on ARM depends on the LinuxLoader. Since conditionalising something currently always included, invert the logic and use a NO_LINUX_LOADER option to remove these components. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Leif Lindholm --- ArmPkg/ArmPkg.dsc | 4 ++++ ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc | 4 ++++ EmbeddedPkg/EmbeddedPkg.dsc | 2 ++ 3 files changed, 10 insertions(+) diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index be5126c..ec70a3d 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -138,7 +138,9 @@ ArmPkg/Filesystem/SemihostFs/SemihostFs.inf +!ifndef NO_LINUX_LOADER ArmPkg/Application/LinuxLoader/LinuxFdtLoader.inf +!endif [Components.ARM] ArmPkg/Library/BaseMemoryLibVstm/BaseMemoryLibVstm.inf @@ -154,7 +156,9 @@ ArmPkg/Library/ArmLib/ArmV7/ArmV7LibSec.inf ArmPkg/Library/ArmLib/ArmV7/ArmV7LibPrePi.inf +!ifndef NO_LINUX_LOADER ArmPkg/Application/LinuxLoader/LinuxAtagLoader.inf +!endif [Components.AARCH64] ArmPkg/Drivers/ArmCpuLib/ArmCortexAEMv8Lib/ArmCortexAEMv8Lib.inf diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc index f8b7511..a17aab9 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress.dsc.inc @@ -336,9 +336,11 @@ gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0 +!ifndef NO_LINUX_LOADER # Device path of block device on which Android Fastboot should flash # partitions. We just use the SD card on VExpress. gArmVExpressTokenSpaceGuid.PcdAndroidFastbootNvmDevicePath|L"VenHw(09831032-6FA3-4484-AF4F-0A000A8D3A82)" +!endif # # ARM Pcds @@ -399,9 +401,11 @@ # ISP1761 USB OTG Controller EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf +!ifndef NO_LINUX_LOADER # # Android Fastboot # EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf +!endif diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc index b13693c..c69c4d7 100644 --- a/EmbeddedPkg/EmbeddedPkg.dsc +++ b/EmbeddedPkg/EmbeddedPkg.dsc @@ -266,9 +266,11 @@ # FDT Support EmbeddedPkg/Library/FdtLoadLib/FdtLoadLib.inf +!ifndef NO_LINUX_LOADER EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf +!endif # Drivers EmbeddedPkg/Drivers/Isp1761UsbDxe/Isp1761UsbDxe.inf