From: "Laszlo Ersek" <lersek@redhat.com>
To: devel@edk2.groups.io, shenglei.zhang@intel.com
Cc: Fu Siyuan <siyuan.fu@intel.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Julien Grall <julien.grall@linaro.org>
Subject: Re: [edk2-devel] [PATCH v2 3/4] ArmVirtPkg: Update DSC/FDF to use NetworkPkg's include fragment file.
Date: Thu, 16 May 2019 16:43:16 +0200 [thread overview]
Message-ID: <fc90cebf-640a-2329-fb9d-17589e197f96@redhat.com> (raw)
In-Reply-To: <20190516081810.27840-4-shenglei.zhang@intel.com>
On 05/16/19 10:18, Zhang, Shenglei wrote:
> From: Fu Siyuan <siyuan.fu@intel.com>
>
> This patch updates the platform DSC/FDF files to use the include fragment
> files provided by NetworkPkg.
> The feature enabling flags in [Defines] section have been updated to use
> the NetworkPkg's terms, and the value has been overridden with the original
> default value on this platform.
>
> v2:Add check for NETWORK_SNP_ENABLE and NETWORK_TLS_ENABLE.
>
> Cc: Laszlo Ersek <lersek@redhat.com>
> Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: Julien Grall <julien.grall@linaro.org>
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
> ---
> ArmVirtPkg/ArmVirt.dsc.inc | 10 +----
> ArmVirtPkg/ArmVirtQemu.dsc | 56 +++++++++++++---------------
> ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 25 +------------
> ArmVirtPkg/ArmVirtQemuKernel.dsc | 56 +++++++++++++---------------
> 4 files changed, 56 insertions(+), 91 deletions(-)
>
> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
> index 1848d20531ab..20bf011617a1 100644
> --- a/ArmVirtPkg/ArmVirt.dsc.inc
> +++ b/ArmVirtPkg/ArmVirt.dsc.inc
> @@ -70,14 +70,8 @@ [LibraryClasses.common]
> BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
>
> # Networking Requirements
> - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf
> - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf
> - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf
> - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf
> - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf
> -!if $(HTTP_BOOT_ENABLE) == TRUE
> - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf
> -!endif
> +!include NetworkPkg/NetworkLibs.dsc.inc
> +
>
> #
> # It is not possible to prevent the ARM compiler from inserting calls to intrinsic functions.
> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> index 28c8fd551344..114a924f8bcb 100644
> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> @@ -27,10 +27,27 @@ [Defines]
> # Defines for default states. These can be changed on the command line.
> # -D FLAG=VALUE
> #
> - DEFINE TTY_TERMINAL = FALSE
> - DEFINE SECURE_BOOT_ENABLE = FALSE
> - DEFINE NETWORK_IP6_ENABLE = FALSE
> - DEFINE HTTP_BOOT_ENABLE = FALSE
> + DEFINE TTY_TERMINAL = FALSE
> + DEFINE SECURE_BOOT_ENABLE = FALSE
(1) This small issue remains from v1 (1), namely that the DEFINEs
unrelated to NetworkPkg should not be re-indented.
But, I will undo this unjustified whitespace change for you.
> +
> + #
> + # Network definition
> + #
> + DEFINE NETWORK_IP6_ENABLE = FALSE
> + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
> + DEFINE NETWORK_SNP_ENABLE = FALSE
> + DEFINE NETWORK_TLS_ENABLE = FALSE
> + DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
> +
> +!if $(NETWORK_SNP_ENABLE) == TRUE
> + !error"NETWORK_SNP_ENABLE should be FALSE here."
> +!endif
> +
> +!if $(NETWORK_TLS_ENABLE) == TRUE
> + !error"NETWORK_TLS_ENABLE should be FALSE here."
> +!endif
(2) Also hinting back at v1 (3) and (4), the error messages should be
better: SNP is IA32/X64/EBC only; and for TLS, I asked that we please
reference TianoCore#1089.
I'll fix these up for you, as well.
With those changes:
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
(I'm going to build-test & push the series soon.)
Thanks,
Laszlo
> +
> +!include NetworkPkg/NetworkDefines.dsc.inc
>
> !include ArmVirtPkg/ArmVirt.dsc.inc
>
> @@ -122,9 +139,10 @@ [PcdsFixedAtBuild.common]
> #
> gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0
>
> -!if $(HTTP_BOOT_ENABLE) == TRUE
> - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
> -!endif
> + #
> + # Network Pcds
> + #
> +!include NetworkPkg/NetworkPcds.dsc.inc
>
> # System Memory Base -- fixed at 0x4000_0000
> gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000
> @@ -353,29 +371,7 @@ [Components.common]
> #
> # Networking stack
> #
> - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> - 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/Udp6Dxe/Udp6Dxe.inf
> - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> -!endif
> -!if $(HTTP_BOOT_ENABLE) == TRUE
> - NetworkPkg/DnsDxe/DnsDxe.inf
> - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> - NetworkPkg/HttpDxe/HttpDxe.inf
> - NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> -!endif
> +!include NetworkPkg/NetworkComponents.dsc.inc
>
> #
> # SCSI Bus and Disk Driver
> diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> index a9a980aefc3e..31f615a9d0f9 100644
> --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc
> @@ -117,29 +117,8 @@ [FV.FvMain]
> #
> # Networking stack
> #
> - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> - INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf
> - INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf
> - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf
> - INF NetworkPkg/TcpDxe/TcpDxe.inf
> - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf
> - INF NetworkPkg/IScsiDxe/IScsiDxe.inf
> -!if $(NETWORK_IP6_ENABLE) == TRUE
> - INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf
> - INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf
> - INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> - INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> -!endif
> -!if $(HTTP_BOOT_ENABLE) == TRUE
> - INF NetworkPkg/DnsDxe/DnsDxe.inf
> - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> - INF NetworkPkg/HttpDxe/HttpDxe.inf
> - INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> -!endif
> +!include NetworkPkg/Network.fdf.inc
> +
>
> #
> # SCSI Bus and Disk Driver
> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> index 2a83c7469424..74987cb855fb 100644
> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> @@ -27,10 +27,27 @@ [Defines]
> # Defines for default states. These can be changed on the command line.
> # -D FLAG=VALUE
> #
> - DEFINE TTY_TERMINAL = FALSE
> - DEFINE SECURE_BOOT_ENABLE = FALSE
> - DEFINE NETWORK_IP6_ENABLE = FALSE
> - DEFINE HTTP_BOOT_ENABLE = FALSE
> + DEFINE TTY_TERMINAL = FALSE
> + DEFINE SECURE_BOOT_ENABLE = FALSE
> +
> + #
> + # Network definition
> + #
> + DEFINE NETWORK_IP6_ENABLE = FALSE
> + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
> + DEFINE NETWORK_SNP_ENABLE = FALSE
> + DEFINE NETWORK_TLS_ENABLE = FALSE
> + DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
> +
> +!if $(NETWORK_SNP_ENABLE) == TRUE
> + !error"NETWORK_SNP_ENABLE should be FALSE here."
> +!endif
> +
> +!if $(NETWORK_TLS_ENABLE) == TRUE
> + !error"NETWORK_TLS_ENABLE should be FALSE here."
> +!endif
> +
> +!include NetworkPkg/NetworkDefines.dsc.inc
>
> !include ArmVirtPkg/ArmVirt.dsc.inc
>
> @@ -127,9 +144,10 @@ [PcdsFixedAtBuild.common]
> #
> gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0
>
> -!if $(HTTP_BOOT_ENABLE) == TRUE
> - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE
> -!endif
> + #
> + # Network Pcds
> + #
> +!include NetworkPkg/NetworkPcds.dsc.inc
>
> gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FALSE
> gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c, 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0x31 }
> @@ -337,29 +355,7 @@ [Components.common]
> #
> # Networking stack
> #
> - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf
> - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf
> - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf
> - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf
> - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf
> - 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/Udp6Dxe/Udp6Dxe.inf
> - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf
> - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf
> -!endif
> -!if $(HTTP_BOOT_ENABLE) == TRUE
> - NetworkPkg/DnsDxe/DnsDxe.inf
> - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf
> - NetworkPkg/HttpDxe/HttpDxe.inf
> - NetworkPkg/HttpBootDxe/HttpBootDxe.inf
> -!endif
> +!include NetworkPkg/NetworkComponents.dsc.inc
>
> #
> # SCSI Bus and Disk Driver
>
next prev parent reply other threads:[~2019-05-16 14:43 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-16 8:18 [PATCH v2 0/4] Add Network's include segment files in DSC/FDF Zhang, Shenglei
2019-05-16 8:18 ` [PATCH v2 1/4] OvmfPkg: Update DSC/FDF to use NetworkPkg's include fragment file Zhang, Shenglei
2019-05-16 14:21 ` [edk2-devel] " Laszlo Ersek
2019-05-16 8:18 ` [PATCH v2 2/4] Nt32Pkg: " Zhang, Shenglei
2019-05-16 8:18 ` [PATCH v2 3/4] ArmVirtPkg: " Zhang, Shenglei
2019-05-16 14:43 ` Laszlo Ersek [this message]
2019-05-16 8:18 ` [PATCH v2 4/4] EmulatorPkg: " Zhang, Shenglei
2019-05-16 15:02 ` [edk2-devel] [PATCH v2 0/4] Add Network's include segment files in DSC/FDF 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=fc90cebf-640a-2329-fb9d-17589e197f96@redhat.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