From patchwork Tue Oct 25 17:15:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 79251 Delivered-To: patch@linaro.org Received: by 10.140.97.247 with SMTP id m110csp3230053qge; Tue, 25 Oct 2016 10:16:59 -0700 (PDT) X-Received: by 10.107.38.209 with SMTP id m200mr17659299iom.126.1477415819051; Tue, 25 Oct 2016 10:16:59 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id f190si1879910itc.100.2016.10.25.10.16.54; Tue, 25 Oct 2016 10:16:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linaro-uefi-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=linaro-uefi-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C41D06175F; Tue, 25 Oct 2016 17:16:54 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id B46B76176B; Tue, 25 Oct 2016 17:16:16 +0000 (UTC) X-Original-To: linaro-uefi@lists.linaro.org Delivered-To: linaro-uefi@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id ACA7760EE9; Tue, 25 Oct 2016 17:16:10 +0000 (UTC) Received: from mail-wm0-f42.google.com (mail-wm0-f42.google.com [74.125.82.42]) by lists.linaro.org (Postfix) with ESMTPS id ECBB4616F9 for ; Tue, 25 Oct 2016 17:15:55 +0000 (UTC) Received: by mail-wm0-f42.google.com with SMTP id c78so175072064wme.0 for ; Tue, 25 Oct 2016 10:15:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wXf7nYv2EOLuXK0ixS/ey+Tv+G4hBu2/v4BJOuzrPCI=; b=HpCVFn0E7pH9myXx7Tm3XLkjTA9EhlEL+DYmryDeyoE2C11Aa9GhNa289Ed5B0XKL3 JxVmlS9htrg2fJOmkCxTkreu15wYEZeFLHEPrJzyLDxooFeH+fkboxm87c6Vka9ACE9z XT+8GxFoDY6lPonSWC8F+2+c4C06s7d0jsQV5PHFVuUnoxnslE39UFbyUYVQRbcyFcAl gvam53OyBwZOOWzf4/m3eF5osAFhG6T94oGl1Zh2qlh3QiraBTUaGDN4YRk6uCrR39tR upnJpTHJwMZsWaj1uiimOTUK4Mh8UGt9sMD92bxkR4rm2h4xq3kkYPM6ovw6hSxYuETl HnMg== X-Gm-Message-State: ABUngvfWyORs96roTRkiDpFKp/e0BNM1u/U4pLzF7p3j15GGwCmXZhZ+biOh9VGd2H3AIQkVw4o= X-Received: by 10.194.170.163 with SMTP id an3mr17994788wjc.73.1477415754789; Tue, 25 Oct 2016 10:15:54 -0700 (PDT) Received: from localhost.localdomain ([105.129.136.43]) by smtp.gmail.com with ESMTPSA id w65sm4683022wmd.23.2016.10.25.10.15.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 25 Oct 2016 10:15:54 -0700 (PDT) From: Ard Biesheuvel To: linaro-uefi@lists.linaro.org Date: Tue, 25 Oct 2016 18:15:33 +0100 Message-Id: <1477415736-11265-3-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477415736-11265-1-git-send-email-ard.biesheuvel@linaro.org> References: <1477415736-11265-1-git-send-email-ard.biesheuvel@linaro.org> Subject: [Linaro-uefi] [PATCH 2/5] Platforms/ARM/VExpress: make BdsLib dependencies explicit X-BeenThere: linaro-uefi@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linaro-uefi-bounces@lists.linaro.org Sender: "Linaro-uefi" Before moving to the generic BDS, copy the global BdsLib resolution to the respective clients so we can drop it later. That way, no new code will inadvertently bind to it, and it is more obvious which modules still need to be brought into the 21st century. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel Reviewed-by: Leif Lindholm --- Platforms/ARM/Juno/ArmJuno.dsc | 5 ++++- Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc | 5 ++++- Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc | 5 ++++- Platforms/ARM/VExpress/ArmVExpress.dsc.inc | 15 ++++++++++++--- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Platforms/ARM/Juno/ArmJuno.dsc b/Platforms/ARM/Juno/ArmJuno.dsc index 69a2e4392c1c..d5f06c2b4211 100644 --- a/Platforms/ARM/Juno/ArmJuno.dsc +++ b/Platforms/ARM/Juno/ArmJuno.dsc @@ -313,7 +313,10 @@ # # Juno platform driver # - ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf + ArmPlatformPkg/ArmJunoPkg/Drivers/ArmJunoDxe/ArmJunoDxe.inf { + + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + } SecurityPkg/RandomNumberGenerator/RngDxe/RngDxe.inf { # DO NOT USE THIS LIBRARY FOR PRODUCTION DEVICES diff --git a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc index e95a3c1cd1bc..1a0fba9e6e2a 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc +++ b/Platforms/ARM/VExpress/ArmVExpress-CTA15-A7.dsc @@ -257,7 +257,10 @@ # # Platform # - ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf + ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmHwDxe.inf { + + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + } # # Filesystems diff --git a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc index 60df45dca276..d019b09f6456 100644 --- a/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc +++ b/Platforms/ARM/VExpress/ArmVExpress-FVP-AArch64.dsc @@ -298,7 +298,10 @@ # # Platform Driver # - ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf + ArmPlatformPkg/ArmVExpressPkg/ArmVExpressDxe/ArmFvpDxe.inf { + + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + } OvmfPkg/VirtioBlkDxe/VirtioBlk.inf # diff --git a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc index 3526da121c43..a78046d016e0 100644 --- a/Platforms/ARM/VExpress/ArmVExpress.dsc.inc +++ b/Platforms/ARM/VExpress/ArmVExpress.dsc.inc @@ -479,7 +479,10 @@ # # Android Fastboot # - EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf + EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf { + + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + } EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf ArmPlatformPkg/ArmVExpressPkg/ArmVExpressFastBootDxe/ArmVExpressFastBootDxe.inf @@ -489,7 +492,10 @@ # # FDT installation # - EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf + EmbeddedPkg/Drivers/FdtPlatformDxe/FdtPlatformDxe.inf { + + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + } # # UEFI application (Shell Embedded Boot Loader) @@ -512,4 +518,7 @@ [Components.ARM] # Legacy Linux Loader - ArmPkg/Application/LinuxLoader/LinuxLoader.inf + ArmPkg/Application/LinuxLoader/LinuxLoader.inf { + + BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf + }