From nobody Thu Apr 25 10:59:29 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+40585+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+40585+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1557819586; cv=none; d=zoho.com; s=zohoarc; b=Gesr8Kfhmi3kKpIiU8b1Fs6ThfDoFZjf0Ffo7lvN4lhrroc9hPccc034aciYFE0VjdUSxXwx+mGdELTFenHQvAgpUQnrch1IgcDImzGQth9eXMHoNQNeJLivYF6jnKmtUg90ponRu14Fp+gUF9kkPIouVTcL8wpi1uT4g/PRDWY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557819586; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=kyakOVCrAvSUzpw5eQk9qiQ22q+yS5sms7F1I1vmQXo=; b=HZh5wng0ObYKP6Hg3RvaxFDA5rmJKAph6MXX55OW5iFglE19bAwgAHMvci7GSD0hmxYSouijoNSTbLrmar5sAwTKY/SIiLDht5xzLIcfaWeHa9EDeCn+0lV3cLuDCu+ZUjhHABzcQgOFGHSD4dD1xqWdybkWbrzTrIrTqoNdKHw= 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+40585+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 1557819586053742.1104493190903; Tue, 14 May 2019 00:39:46 -0700 (PDT) Return-Path: X-Received: from mga02.intel.com (mga02.intel.com []) by groups.io with SMTP; Tue, 14 May 2019 00:39:45 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 May 2019 00:39:45 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga002.jf.intel.com with ESMTP; 14 May 2019 00:39:43 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Ruiyu Ni , Hao Wu Subject: [edk2-devel] [PATCH 2/4] Nt32Pkg: Update DSC/FDF to use NetworkPkg's include fragment file. Date: Tue, 14 May 2019 15:39:36 +0800 Message-Id: <20190514073938.21528-3-shenglei.zhang@intel.com> In-Reply-To: <20190514073938.21528-1-shenglei.zhang@intel.com> References: <20190514073938.21528-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=1557819585; bh=3esNRFgmi7qqNImLuGjIyi1ASvwxUg8LswL+5tbt57A=; h=Cc:Date:From:Reply-To:Subject:To; b=c5vRBbaOd9pcSZCrCwzqEt89EwzbGAAk5M9/U/x2nLfjHKTOzcuWepNjPxYMbNY+XtG goSLklQgURbrc7qBrWcBhNNuV0hhFfJQb2Z0q33+oRpqV5/RTX9m4iyZlY2ahZp1Huko+ rwkYbEZ6iXIN7bZJvleE2VcJ2VYUSB5Wj/Q= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 be updated to use the NetworkPkg's terms, and the value have been overridden with the original default value on this platform. Cc: Ruiyu Ni Cc: Hao Wu Signed-off-by: Shenglei Zhang Reviewed-by: Ray Ni --- Nt32Pkg/Nt32Pkg.dsc | 75 +++++---------------------------------------- Nt32Pkg/Nt32Pkg.fdf | 27 ++-------------- 2 files changed, 10 insertions(+), 92 deletions(-) diff --git a/Nt32Pkg/Nt32Pkg.dsc b/Nt32Pkg/Nt32Pkg.dsc index 306b7c7a2d..ed25fff12e 100644 --- a/Nt32Pkg/Nt32Pkg.dsc +++ b/Nt32Pkg/Nt32Pkg.dsc @@ -43,34 +43,14 @@ # located in CryptoPkg\Library\OpensslLib to enable the OpenSSL bu= ilding first. # DEFINE SECURE_BOOT_ENABLE =3D FALSE - =20 - # - # This flag is to enable or disable TLS feature. =20 - # These can be changed on the command line. - # -D FLAG=3DVALUE - # - # Note: TLS feature highly depends on the OpenSSL building. To enable th= is=20 - # feature, please follow the instructions found in the file "Patch= -HOWTO.txt"=20 - # located in CryptoPkg\Library\OpensslLib to enable the OpenSSL bu= ilding first. - # - DEFINE TLS_ENABLE =3D FALSE - =20 - # - # Indicates whether HTTP connections (i.e., unsecured) are permitted or = not. - # -D FLAG=3DVALUE - # - # Note: If ALLOW_HTTP_CONNECTIONS is TRUE, HTTP connections are allowed.= Both=20 - # the "https://" and "http://" URI schemes are permitted. Otherwis= e, HTTP=20 - # connections are denied. Only the "https://" URI scheme is permit= ted. - # - DEFINE ALLOW_HTTP_CONNECTIONS =3D TRUE =20 # - # This flag is to enable or disable IPv6 network stack. - # These can be changed on the command line. - # -D FLAG=3DVALUE + # SnpNt32Dxe.inf will be used. # - DEFINE NETWORK_IP6_ENABLE =3D FALSE + DEFINE NETWORK_TLS_ENABLE =3D FALSE + DEFINE NETWORK_IP6_ENABLE =3D FALSE + DEFINE NETWORK_SNP_ENABLE =3D FALSE + DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS =3D TRUE =20 ##########################################################################= ###### # @@ -133,12 +113,6 @@ # UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHo= okStatusCodeLibNull.inf GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBdsLi= b.inf CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Customize= dDisplayLib.inf @@ -162,7 +136,7 @@ LockBoxLib|MdeModulePkg/Library/LockBoxNullLib/LockBoxNullLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf ResetSystemLib|Nt32Pkg/Library/ResetSystemLib/ResetSystemLib.inf -!if $(TLS_ENABLE) =3D=3D TRUE +!if $(NETWORK_TLS_ENABLE) =3D=3D TRUE OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf !else OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf @@ -270,11 +244,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|FAL= SE gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 =20 -!if $(ALLOW_HTTP_CONNECTIONS) =3D=3D TRUE - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE -!endif - - !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE # override the default values from SecurityPkg to ensure images from all= sources are verified in secure boot gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04 @@ -448,39 +417,11 @@ MdeModulePkg/Application/HelloWorld/HelloWorld.inf =20 # - # Network stack drivers + # Network SNP drivers # To test network drivers, need network Io driver(SnpNt32Io.dll), please= refer to NETWORK-IO Subproject. # - 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/UefiPxeBcDxe/UefiPxeBcDxe.inf - NetworkPkg/TcpDxe/TcpDxe.inf - NetworkPkg/IScsiDxe/IScsiDxe.inf +!include NetworkPkg/Network.dsc.inc Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf - -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE - NetworkPkg/Ip6Dxe/Ip6Dxe.inf - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - NetworkPkg/Udp6Dxe/Udp6Dxe.inf - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf -!endif - - NetworkPkg/HttpBootDxe/HttpBootDxe.inf - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - =20 -!if $(TLS_ENABLE) =3D=3D TRUE - NetworkPkg/TlsDxe/TlsDxe.inf - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf -!endif - MdeModulePkg/Universal/BdsDxe/BdsDxe.inf MdeModulePkg/Application/UiApp/UiApp.inf{ diff --git a/Nt32Pkg/Nt32Pkg.fdf b/Nt32Pkg/Nt32Pkg.fdf index 3a3e8fae23..7798d17923 100644 --- a/Nt32Pkg/Nt32Pkg.fdf +++ b/Nt32Pkg/Nt32Pkg.fdf @@ -243,32 +243,9 @@ INF Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileS= ystemDxe.inf INF MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.= inf INF MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf =20 -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/UefiPxeBcDxe/UefiPxeBcDxe.inf -INF NetworkPkg/TcpDxe/TcpDxe.inf -INF NetworkPkg/IScsiDxe/IScsiDxe.inf INF Nt32Pkg/SnpNt32Dxe/SnpNt32Dxe.inf -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE -INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf -INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf -INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf -INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf -!endif -INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf -INF NetworkPkg/DnsDxe/DnsDxe.inf -INF NetworkPkg/HttpDxe/HttpDxe.inf -INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf -!if $(TLS_ENABLE) =3D=3D TRUE -INF NetworkPkg/TlsDxe/TlsDxe.inf -INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf -!endif +!include NetworkPkg/Network.fdf.inc + INF MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenuApp.inf ##########################################################################= ###### # --=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 (#40585): https://edk2.groups.io/g/devel/message/40585 Mute This Topic: https://groups.io/mt/31616137/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-