From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::d42; helo=mail-io1-xd42.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-io1-xd42.google.com (mail-io1-xd42.google.com [IPv6:2607:f8b0:4864:20::d42]) (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 4132F2117FD47 for ; Tue, 6 Nov 2018 04:32:08 -0800 (PST) Received: by mail-io1-xd42.google.com with SMTP id p83-v6so9046518iod.12 for ; Tue, 06 Nov 2018 04:32:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=kw7aJomYm0O/+dgmjLSO2jbxOi9uEHymThhFdepRoAA=; b=RoWJmSGfsIzUx1S8Erc82Cem7eWl11TkwnYWOd/LDYEswXVfF5t5eveBVz7umBsu8M CHIQUbgZLrZoune/YBxRkwCNKATv18lzurKeZ7W4M1JDVnZFPfUM8VQdV3LP57OUOfOg HqUCh7HAwrWURSZLUsxVHAh1hpt2R+cew6RwE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=kw7aJomYm0O/+dgmjLSO2jbxOi9uEHymThhFdepRoAA=; b=U/NpbutzX5O7qGEkozp/BxZE7EHBXzpHadvJU2wCNtsStIjfuQjhRFVQU7UIF4k2AS v4EwSGtLQBPEfMhBIb+Y8N49+aBJyYrrBg0rNUAPMKwd9gq0SsdpZjf+WzHkAx9WKyzB T4s5C7knmVRKYsySp8QfZANiAfyY0QTz9pJPKfFAfnYCODtsZ1PlhnCYCIaK6RJ0P+QA 6bXGxhqut4/mLZjpH0f/rdl4jENeKg5z6BpiIqjPtg9oQ9/BDyJTCSwgLc7QhuzlmGjB +76srsAL7H4ydGkRRA5s14zg6vv5R1mRwEjZOZNejUUAYpeLU5PsE6xvfnnSu1G9sP3Z U3Xw== X-Gm-Message-State: AGRZ1gLlne2aTtEF1qxjkaR7gFN9ltmpfOQQcEEZYpHb1DJFcrgLzD3E 8HLxN490mP6HBybo+sIpMutSLk2GW0AGL68dOvMajQ== X-Google-Smtp-Source: AJdET5cNZy/EY1vQww92CfffrY0/+GYqys6rv7WevxbWq9ox+tqUtB8vZJW50cd163Hky1BtBdmdq34YCdyIblb2QmQ= X-Received: by 2002:a6b:37c2:: with SMTP id e185-v6mr21335756ioa.173.1541507527945; Tue, 06 Nov 2018 04:32:07 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a6b:4f16:0:0:0:0:0 with HTTP; Tue, 6 Nov 2018 04:32:07 -0800 (PST) In-Reply-To: <20181106012403.84760-2-siyuan.fu@intel.com> References: <20181106012403.84760-1-siyuan.fu@intel.com> <20181106012403.84760-2-siyuan.fu@intel.com> From: Ard Biesheuvel Date: Tue, 6 Nov 2018 13:32:07 +0100 Message-ID: To: Fu Siyuan Cc: "edk2-devel@lists.01.org" , Laszlo Ersek , Julien Grall Subject: Re: [PATCH v3 1/1] ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF. 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: , X-List-Received-Date: Tue, 06 Nov 2018 12:32:09 -0000 Content-Type: text/plain; charset="UTF-8" On 6 November 2018 at 02:24, Fu Siyuan wrote: > V3: > Remove duplicate library added in v2 patch, since ArmVirtPkg.dsc.inc > already have them. Just remove the if...end there is enough. > > V2: > Add missing library instance for NetworkPkg iSCSI driver. > Please don't put the patch revision history in the commit log. Put it below the --- > This patch replaces the MdeModulePkg TCP, PXE and iSCSI driver with those > ones in NetworkPkg. These 3 drivers in MdeModulePkg are not being actively > maintained and will be removed from edk2 master soon. > > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > Cc: Julien Grall > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Fu Siyuan > --- ... here ... The patch looks fine to me Reviewed-by: Ard Biesheuvel but please don't merge it until after the next stable tag has been created > ArmVirtPkg/ArmVirt.dsc.inc | 2 -- > ArmVirtPkg/ArmVirtQemu.dsc | 10 +++------- > ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 10 +++------- > ArmVirtPkg/ArmVirtQemuKernel.dsc | 13 ++++++------- > 4 files changed, 12 insertions(+), 23 deletions(-) > > diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc > index 70a0ac4d786c..ebabf3f47ec9 100644 > --- a/ArmVirtPkg/ArmVirt.dsc.inc > +++ b/ArmVirtPkg/ArmVirt.dsc.inc > @@ -149,11 +149,9 @@ [LibraryClasses.common] > # > # CryptoPkg libraries needed by multiple firmware features > # > -!if ($(SECURE_BOOT_ENABLE) == TRUE) || ($(NETWORK_IP6_ENABLE) == TRUE) > IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf > BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > -!endif > > # > # Secure Boot dependencies > diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc > index 885c6b14b844..b3f1b23e3890 100644 > --- a/ArmVirtPkg/ArmVirtQemu.dsc > +++ b/ArmVirtPkg/ArmVirtQemu.dsc > @@ -346,18 +346,14 @@ [Components.common] > MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > + NetworkPkg/TcpDxe/TcpDxe.inf > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > + NetworkPkg/IScsiDxe/IScsiDxe.inf > !if $(NETWORK_IP6_ENABLE) == TRUE > NetworkPkg/Ip6Dxe/Ip6Dxe.inf > - NetworkPkg/TcpDxe/TcpDxe.inf > NetworkPkg/Udp6Dxe/Udp6Dxe.inf > NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > - NetworkPkg/IScsiDxe/IScsiDxe.inf > -!else > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > !endif > !if $(HTTP_BOOT_ENABLE) == TRUE > NetworkPkg/DnsDxe/DnsDxe.inf > diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > index a6390bd4b841..3316f982695f 100644 > --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc > @@ -126,18 +126,14 @@ [FV.FvMain] > INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > + INF NetworkPkg/IScsiDxe/IScsiDxe.inf > + INF NetworkPkg/TcpDxe/TcpDxe.inf > !if $(NETWORK_IP6_ENABLE) == TRUE > INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf > - INF NetworkPkg/TcpDxe/TcpDxe.inf > INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf > INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > - INF NetworkPkg/IScsiDxe/IScsiDxe.inf > -!else > - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > !endif > !if $(HTTP_BOOT_ENABLE) == TRUE > INF NetworkPkg/DnsDxe/DnsDxe.inf > diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc > index 434d6861a56f..4920a66f2fdb 100644 > --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc > +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc > @@ -67,6 +67,9 @@ [LibraryClasses.common] > > [LibraryClasses.common.UEFI_DRIVER] > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf > + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf > + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf > > [BuildOptions.ARM.EDKII.SEC, BuildOptions.ARM.EDKII.BASE] > # Avoid MOVT/MOVW instruction pairs in code that may end up in the PIE > @@ -335,18 +338,14 @@ [Components.common] > MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > + NetworkPkg/TcpDxe/TcpDxe.inf > + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > + NetworkPkg/IScsiDxe/IScsiDxe.inf > !if $(NETWORK_IP6_ENABLE) == TRUE > NetworkPkg/Ip6Dxe/Ip6Dxe.inf > - NetworkPkg/TcpDxe/TcpDxe.inf > NetworkPkg/Udp6Dxe/Udp6Dxe.inf > NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > - NetworkPkg/IScsiDxe/IScsiDxe.inf > -!else > - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf > - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf > - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf > !endif > !if $(HTTP_BOOT_ENABLE) == TRUE > NetworkPkg/DnsDxe/DnsDxe.inf > -- > 2.19.1.windows.1 >