From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::242; helo=mail-wm0-x242.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A269A21A10971 for ; Sat, 25 Nov 2017 05:23:22 -0800 (PST) Received: by mail-wm0-x242.google.com with SMTP id x63so26925418wmf.4 for ; Sat, 25 Nov 2017 05:27:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=k/nTPOYssoahUBNl9SVVTMdcg3doirWI7ZNZP9UwETQ=; b=h+ZAIEvkaxcFtoO11TnJJiCQ3i2lLfmbOVIqLhAzNqPlK8LiG+jDMlcTqT7tx9+iRb aQb3F0llpaPdoRDtbPTUcuUQJ3lkf3V4SAANE+DdAmCtQiQltHmWIl9zH+vCMAUTY9VL B16K300pc+nhMlIErh8Hy9vcGaWYRmnfNtG0M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=k/nTPOYssoahUBNl9SVVTMdcg3doirWI7ZNZP9UwETQ=; b=rNP5X4+XbXNWXwn4VzqOYVA/j52OQAkF7qdZT1TvN8eOgWxzSpFuv0VHG6CftpyAc9 Hd/DAj1Ky2VVNM+qWMujIwCPz6qlKpZFq/DxS/l6VhFF5Jcs+I+T4R0OJk1Faju/Awn7 gLk3mFm9qbHMo0LZAP8Xpv1HATGPW7ecWy7P5KmdqWOUofPC+5X+0AbZ/++/g768xcbM fPNg3Z0Esh+2Ei2a/ThUCFiH6kfozgpXAeIjp3O6Djv3Rb6RgD+lu0Ld4YmBbxRnaI2M OALG2AXDsSAU0lQvjLoxZDxowNTgXXVB9js63UQ84eLp8RtNp6UPYxpVliTBYkr95X9E PTgA== X-Gm-Message-State: AJaThX4JtyJRLRwUFYtwUDXGabev6yOozPTwRkaKDNWH8kf/jTByEitL AfX/OrNb4TZdt9e9Eev9EBdtXiDsotI= X-Google-Smtp-Source: AGs4zMZig6qC+GmDGP3kaUQfG5lJo7o1U+mGVbj4X8OGr7+vwwmmhV3V76FwYaus4aA6kugaW0RbZQ== X-Received: by 10.28.88.65 with SMTP id m62mr12331855wmb.111.1511616460862; Sat, 25 Nov 2017 05:27:40 -0800 (PST) Received: from vanye.hemma.eciton.net (cpc92316-cmbg19-2-0-cust118.5-4.cable.virginm.net. [82.12.0.119]) by smtp.gmail.com with ESMTPSA id c2sm7420176wrg.57.2017.11.25.05.27.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 25 Nov 2017 05:27:39 -0800 (PST) From: Leif Lindholm To: edk2-devel@lists.01.org Cc: ard.biesheuvel@linaro.org Date: Sat, 25 Nov 2017 13:27:35 +0000 Message-Id: <20171125132735.3507-3-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171125132735.3507-1-leif.lindholm@linaro.org> References: <20171125132735.3507-1-leif.lindholm@linaro.org> Subject: [PATCH 2/2] EmbeddedPkg: get rid of BdsLib dependency from Android*Boot X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Nov 2017 13:23:23 -0000 The sum use these applications made of BdsLib was one invocation of the IS_DEVICE_PATH_NODE macro, and (incorrectly) being able to leave out a dependency on gEfiLoadedImageProtocolGuid. So expand the macro in place and add the missing dependency. Then clean up the .dsc, .inf and #includes accordingly. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.c | 4 ++-- EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf | 1 - EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c | 1 - EmbeddedPkg/EmbeddedPkg.dsc | 6 +----- EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.inf | 1 + 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.c b/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.c index 977167da40..e1e45e8146 100644 --- a/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.c +++ b/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.c @@ -15,7 +15,6 @@ #include #include -#include #include #include #include @@ -35,7 +34,8 @@ ValidateAndroidMediaDevicePath ( NextNode = DevicePath; while (NextNode != NULL) { Node = NextNode; - if (IS_DEVICE_PATH_NODE (Node, MEDIA_DEVICE_PATH, MEDIA_HARDDRIVE_DP)) { + if (Node->Type == MEDIA_DEVICE_PATH && + Node->SubType == MEDIA_HARDDRIVE_DP) { return EFI_SUCCESS; } NextNode = NextDevicePathNode (Node); diff --git a/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf b/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf index f1ee0bdc82..c2bc68e733 100644 --- a/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf +++ b/EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf @@ -28,7 +28,6 @@ [LibraryClasses] AndroidBootImgLib BaseLib BaseMemoryLib - BdsLib DebugLib DevicePathLib DxeServicesTableLib diff --git a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c index 1d9024b1ce..404aa68a05 100644 --- a/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c +++ b/EmbeddedPkg/Application/AndroidFastboot/Arm/BootAndroidBootImg.c @@ -17,7 +17,6 @@ #include #include -#include #include #include #include diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc index d0af235f99..5b20176eed 100644 --- a/EmbeddedPkg/EmbeddedPkg.dsc +++ b/EmbeddedPkg/EmbeddedPkg.dsc @@ -288,11 +288,7 @@ [Components.ARM] [Components.ARM, Components.AARCH64] EmbeddedPkg/Application/AndroidBoot/AndroidBootApp.inf - EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf { - - # It depends on BdsLib that depends on TimerLib - TimerLib|MdePkg/Library/BaseTimerLibNullTemplate/BaseTimerLibNullTemplate.inf - } + EmbeddedPkg/Application/AndroidFastboot/AndroidFastbootApp.inf EmbeddedPkg/Drivers/AndroidFastbootTransportUsbDxe/FastbootTransportUsbDxe.inf EmbeddedPkg/Drivers/AndroidFastbootTransportTcpDxe/FastbootTransportTcpDxe.inf diff --git a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.inf b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.inf index c92bac04f2..226b8b2324 100644 --- a/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.inf +++ b/EmbeddedPkg/Library/AndroidBootImgLib/AndroidBootImgLib.inf @@ -43,6 +43,7 @@ [Packages] [Protocols] gAndroidBootImgProtocolGuid + gEfiLoadedImageProtocolGuid [Guids] gFdtTableGuid -- 2.11.0