From patchwork Fri Dec 14 11:22:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 153813 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp1939902ljp; Fri, 14 Dec 2018 03:23:01 -0800 (PST) X-Google-Smtp-Source: AFSGD/Xw2Pwktf1Sjyyv2Aymop/HZ/795c74gSdWYd0L7GcRCtgtM4/xCDN5vl2ZkDy/DgLQX6lx X-Received: by 2002:a62:5e41:: with SMTP id s62mr2425394pfb.232.1544786581786; Fri, 14 Dec 2018 03:23:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544786581; cv=none; d=google.com; s=arc-20160816; b=tmMhnXBQE1dvWtztfTrdyeqpfOYGDyMX3Z2xlvG+SDCZfVyGIc1YIVFbWxx3WXrPwk ucYVaJGwcB36twFSl3FJFHmXhPi9ak4OUElEUCAclVkVnXHLOkO2AjpPbM9hLQW82oxq BYcWAu277udKadeChXo86InpRrK88lz2XGKKEq30eAow3rSckbUxjcDMT4NhqXJYToGq VZ6ltt3RHQyiO0MEGIu+GicftRQYsGzZWaf/K7oJPeNiaDxHvCh/2o5yyvBH+ku3OSu/ 2KOYsqKT6TvKjDMG6155foWR4HSDyOCb5PcZwvHx0EoQybpo1+yKHOtzAr0ip/NToJBa NkxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:message-id:date:to:from:dkim-signature :delivered-to; bh=U7T5mExP9p6lwJgnukOsL4bS7y8dDw7mVkbUtxeh1XI=; b=Qxe5MaGabjDollR25LsmwlWsyXmoMt1mRhfH6C6gFcdOeC3ZnFoiInI5SyKi5NDNE5 u4WYZhIJegXIJpq9PdFeGiEEZcW7HUtLc2jP4rULqowaqUbDZgvCCsMPQI3qly8aXf3I J0ElSOVzUe/XRXXFB8/V7xJdKPPTCUqMIUE2rQR8ZD9kLbjeXZwBk2ORYgvKgVqjvyk3 OBe2AcBA3DA8XB3nE3RC0svYFkURtvAdiiyBVDa65tEJTs601Pv/UcLtcfQNlW86hL5p kPeE+r2/KVWe5c0Aypd2UackIeG16hHweQUnsWiihAy1cKHB0sUiTrKUNibMbYM8JB0Y qibA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Wjh78SUK; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id bg9si3763453plb.317.2018.12.14.03.23.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Dec 2018 03:23:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Wjh78SUK; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 5F3CC211A43B7; Fri, 14 Dec 2018 03:23:01 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::341; helo=mail-wm1-x341.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x341.google.com (mail-wm1-x341.google.com [IPv6:2a00:1450:4864:20::341]) (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 447A3211A43AB for ; Fri, 14 Dec 2018 03:23:00 -0800 (PST) Received: by mail-wm1-x341.google.com with SMTP id m22so5443308wml.3 for ; Fri, 14 Dec 2018 03:23:00 -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; bh=zJG3fQFJ68348nJtc2O/dZ8O7OXtazNzUaois+o+xSk=; b=Wjh78SUKMm9XNKEKm0Sm5FReqHW4msq91z5AcPDntPqyrWW2C/56WwfmxMgAsNDxY/ YQv1Ue/jhKACnnrzpTBWFqZDgEytbRxTyp9rqZU0F5ZTTHKatuT27lJIlv4Iwwevrnn7 4ICnCfFgup0uRCuNb64LD0otoH+aveAZWFt9o= 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; bh=zJG3fQFJ68348nJtc2O/dZ8O7OXtazNzUaois+o+xSk=; b=iSDzreIoHkxyJ2J/N7dYESpurFtoXK9YqV8tqSG5d3uQOPs9cAPWKUpXUSyBNRQtUs HShQjyBzmPnl0T+8NvNq+YBykGjlN4lsr2jzOw7wZuXpgSYPfO1um6fnyleK/NUr9/jg qkz6jmhO82xLeYrydCacRqGtB5My+OlaEbNTnuUlvhFf7Ynt8DoNEguKUkej3sorMYMJ 4/Pit4DgyrYYoPjDr/um1/+R+sYHjLU6vaWqiLvukxBK8ibpNoKJicCMEEv4vZuxUa4M k9YdQSAQc6mWSsyJopLUQ/BDQ9A1bvy+fuC2gj556bGQRYcDUHTuZuZKOp+yvb0tL76B H/BA== X-Gm-Message-State: AA+aEWZ6AOFg/lwTtjJwOq5IxRsKcWCCN0GFIA08fdd0IAd1PWOxvbl/ i6rSt5g6HhZ0Pp4fNGHTtDi4p/82nUyDxA== X-Received: by 2002:a1c:b53:: with SMTP id 80mr2675407wml.121.1544786578337; Fri, 14 Dec 2018 03:22:58 -0800 (PST) Received: from mba13.nice.aeroport.fr (68.21.90.92.rev.sfr.net. [92.90.21.68]) by smtp.gmail.com with ESMTPSA id v132sm5472712wme.20.2018.12.14.03.22.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Dec 2018 03:22:57 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Fri, 14 Dec 2018 12:22:53 +0100 Message-Id: <20181214112253.10372-1-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 Subject: [edk2] [PATCH] ArmVirtPkg/ArmVirt.dsc.inc: define TcpIoLib resolution unconditionally X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: siyuan.fu@intel.com, lersek@redhat.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Commit 9a67ba261fe9 ("ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF") failed to take into account that the now unconditionally included IScsiDxe.inf from NetworkPkg requires a resolution for TcpIoLib. Since specifying such a resolution is harmless for platforms that have no networking enabled, let's just fix things by dropping the conditionals around it. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- ArmVirtPkg/ArmVirt.dsc.inc | 2 -- 1 file changed, 2 deletions(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Laszlo Ersek diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index c3549c84d4c6..89c2db074711 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -80,9 +80,7 @@ DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf -!if $(NETWORK_IP6_ENABLE) == TRUE TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf -!endif !if $(HTTP_BOOT_ENABLE) == TRUE HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf !endif