From nobody Thu Mar 28 09:42:38 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+40774+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40774+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557994706; cv=none; d=zoho.com; s=zohoarc; b=I97bixDwzK0aaxgT2lVTwZqUN1w6C6X2Xat9yd6KrSmood4pRmgMHyPTTqGhgch/wLKx2D2U9r+utqP9IaKs7lQ9U9o5EaRNzmU58KHM+oYL4oa1qCbjB+paN3xLNtCVo+mL8jj0MzMqc7Bh0DKqxvYOuLXuhhhETFcQeAVz32Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557994706; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=rsNb0kvgzgts6shdnlcjLtFJFEQjKL5oEZrKpa0RoEA=; b=UL4Vj01qiczdC4gwlcKRRhrXstznBIaRTHuwActOmgEoGJl4VR5ebQps12j43joIwwtFFpG2IeKP3XJNOIRN5blVxk2WxXkwznQpqPgteZSSFDj2cCFBe8c0D3uG5bWb9zK0uO029a2rJ0X9WwvKwWbKPR3P9rCyKc85IvtaJGw= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+40774+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1557994706622909.6791480537048; Thu, 16 May 2019 01:18:26 -0700 (PDT) Return-Path: X-Received: from mga09.intel.com (mga09.intel.com []) by groups.io with SMTP; Thu, 16 May 2019 01:18:25 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 16 May 2019 01:18:25 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga001.jf.intel.com with ESMTP; 16 May 2019 01:18:23 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Fu Siyuan , Laszlo Ersek , Ard Biesheuvel , Julien Grall Subject: [edk2-devel] [PATCH v2 3/4] ArmVirtPkg: Update DSC/FDF to use NetworkPkg's include fragment file. Date: Thu, 16 May 2019 16:18:09 +0800 Message-Id: <20190516081810.27840-4-shenglei.zhang@intel.com> In-Reply-To: <20190516081810.27840-1-shenglei.zhang@intel.com> References: <20190516081810.27840-1-shenglei.zhang@intel.com> Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,shenglei.zhang@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1557994706; bh=VBvPt3w5V+ScPzuVue3uISBpzgSEXQuVicB0o+wtoGQ=; h=Cc:Date:From:Reply-To:Subject:To; b=GJitWv6Juro+qqJmDJmL75s7l7W+BDbFo7GzpzBQg+SIH5OYux3ViEJB2lDs7pVeddz FUGwe76X4aLZQ6BCnfQZRqAQRkP/u4qLBN5r53w4/InTjPk1+/DOs2j8o/4ID4kw50XeF TrfsD8h8IFky+mgxw0Re/sF4CA6ziJ1rmTs= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Fu Siyuan 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 Cc: Ard Biesheuvel Cc: Julien Grall Signed-off-by: Shenglei Zhang Reviewed-by: Laszlo Ersek --- 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 =20 # 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) =3D=3D TRUE - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf -!endif +!include NetworkPkg/NetworkLibs.dsc.inc + =20 # # 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=3DVALUE # - DEFINE TTY_TERMINAL =3D FALSE - DEFINE SECURE_BOOT_ENABLE =3D FALSE - DEFINE NETWORK_IP6_ENABLE =3D FALSE - DEFINE HTTP_BOOT_ENABLE =3D FALSE + DEFINE TTY_TERMINAL =3D FALSE + DEFINE SECURE_BOOT_ENABLE =3D FALSE + + # + # Network definition + # + DEFINE NETWORK_IP6_ENABLE =3D FALSE + DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE + DEFINE NETWORK_SNP_ENABLE =3D FALSE + DEFINE NETWORK_TLS_ENABLE =3D FALSE + DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS =3D TRUE + +!if $(NETWORK_SNP_ENABLE) =3D=3D TRUE + !error"NETWORK_SNP_ENABLE should be FALSE here." +!endif + +!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE + !error"NETWORK_TLS_ENABLE should be FALSE here." +!endif + +!include NetworkPkg/NetworkDefines.dsc.inc =20 !include ArmVirtPkg/ArmVirt.dsc.inc =20 @@ -122,9 +139,10 @@ [PcdsFixedAtBuild.common] # gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0 =20 -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE -!endif + # + # Network Pcds + # +!include NetworkPkg/NetworkPcds.dsc.inc =20 # 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) =3D=3D TRUE - NetworkPkg/Ip6Dxe/Ip6Dxe.inf - NetworkPkg/Udp6Dxe/Udp6Dxe.inf - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf -!endif -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpBootDxe/HttpBootDxe.inf -!endif +!include NetworkPkg/NetworkComponents.dsc.inc =20 # # SCSI Bus and Disk Driver diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuF= vMain.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) =3D=3D 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) =3D=3D 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 + =20 # # SCSI Bus and Disk Driver diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKerne= l.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=3DVALUE # - DEFINE TTY_TERMINAL =3D FALSE - DEFINE SECURE_BOOT_ENABLE =3D FALSE - DEFINE NETWORK_IP6_ENABLE =3D FALSE - DEFINE HTTP_BOOT_ENABLE =3D FALSE + DEFINE TTY_TERMINAL =3D FALSE + DEFINE SECURE_BOOT_ENABLE =3D FALSE + + # + # Network definition + # + DEFINE NETWORK_IP6_ENABLE =3D FALSE + DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE + DEFINE NETWORK_SNP_ENABLE =3D FALSE + DEFINE NETWORK_TLS_ENABLE =3D FALSE + DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS =3D TRUE + +!if $(NETWORK_SNP_ENABLE) =3D=3D TRUE + !error"NETWORK_SNP_ENABLE should be FALSE here." +!endif + +!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE + !error"NETWORK_TLS_ENABLE should be FALSE here." +!endif + +!include NetworkPkg/NetworkDefines.dsc.inc =20 !include ArmVirtPkg/ArmVirt.dsc.inc =20 @@ -127,9 +144,10 @@ [PcdsFixedAtBuild.common] # gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0 =20 -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE -!endif + # + # Network Pcds + # +!include NetworkPkg/NetworkPcds.dsc.inc =20 gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FAL= SE gEfiMdeModulePkgTokenSpaceGuid.PcdBootManagerMenuFile|{ 0x21, 0xaa, 0x2c= , 0x46, 0x14, 0x76, 0x03, 0x45, 0x83, 0x6e, 0x8a, 0xb6, 0xf4, 0x66, 0x23, 0= x31 } @@ -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) =3D=3D TRUE - NetworkPkg/Ip6Dxe/Ip6Dxe.inf - NetworkPkg/Udp6Dxe/Udp6Dxe.inf - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf -!endif -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpBootDxe/HttpBootDxe.inf -!endif +!include NetworkPkg/NetworkComponents.dsc.inc =20 # # SCSI Bus and Disk Driver --=20 2.18.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40774): https://edk2.groups.io/g/devel/message/40774 Mute This Topic: https://groups.io/mt/31638579/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-