From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: Fu Siyuan <siyuan.fu@intel.com>
Cc: "edk2-devel@lists.01.org" <edk2-devel@lists.01.org>,
Laszlo Ersek <lersek@redhat.com>,
Julien Grall <julien.grall@linaro.org>
Subject: Re: [PATCH v3 1/1] ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF.
Date: Tue, 6 Nov 2018 13:32:07 +0100 [thread overview]
Message-ID: <CAKv+Gu-gSPTGjzwqkJ4A6mJz9xy4c3uqz=xEzSY-XwPpVEovhA@mail.gmail.com> (raw)
In-Reply-To: <20181106012403.84760-2-siyuan.fu@intel.com>
On 6 November 2018 at 02:24, Fu Siyuan <siyuan.fu@intel.com> 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 <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Julien Grall <julien.grall@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Fu Siyuan <siyuan.fu@intel.com>
> ---
... here ...
The patch looks fine to me
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
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
>
next prev parent reply other threads:[~2018-11-06 12:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-06 1:24 [PATCH v3 0/1] Delete TCP, PXE, iSCSI driver in MdeModulePkg Fu Siyuan
2018-11-06 1:24 ` [PATCH v3 1/1] ArmVirtPkg: Replace obsoleted network drivers from platform DSC/FDF Fu Siyuan
2018-11-06 12:32 ` Ard Biesheuvel [this message]
2018-11-06 15:24 ` Laszlo Ersek
2018-11-06 16:39 ` Ard Biesheuvel
2018-11-07 0:58 ` Fu, Siyuan
2018-12-14 6:11 ` Fu, Siyuan
2018-12-14 7:22 ` Ard Biesheuvel
2018-11-06 15:18 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAKv+Gu-gSPTGjzwqkJ4A6mJz9xy4c3uqz=xEzSY-XwPpVEovhA@mail.gmail.com' \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox