From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: ray.ni@intel.com) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Tue, 14 May 2019 05:45:03 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 May 2019 05:45:03 -0700 X-ExtLoop1: 1 Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga006.fm.intel.com with ESMTP; 14 May 2019 05:45:03 -0700 Received: from fmsmsx155.amr.corp.intel.com (10.18.116.71) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 14 May 2019 05:45:01 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by FMSMSX155.amr.corp.intel.com (10.18.116.71) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 14 May 2019 05:45:01 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.33]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.70]) with mapi id 14.03.0415.000; Tue, 14 May 2019 20:45:00 +0800 From: "Ni, Ray" To: "Zhang, Shenglei" , "devel@edk2.groups.io" CC: "Wu, Hao A" Subject: Re: [PATCH 2/4] Nt32Pkg: Update DSC/FDF to use NetworkPkg's include fragment file. Thread-Topic: [PATCH 2/4] Nt32Pkg: Update DSC/FDF to use NetworkPkg's include fragment file. Thread-Index: AQHVCig05oZJ4Kcqg0a9AmJj3D0e0KZqkQYQ Date: Tue, 14 May 2019 12:44:59 +0000 Deferred-Delivery: Tue, 14 May 2019 12:44:00 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C13F641@SHSMSX104.ccr.corp.intel.com> References: <20190514073938.21528-1-shenglei.zhang@intel.com> <20190514073938.21528-3-shenglei.zhang@intel.com> In-Reply-To: <20190514073938.21528-3-shenglei.zhang@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZGRlODMwZjYtYWRkMy00ZmYyLThjMTQtYmU5NzIxYTEwMzVlIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiOGFKMk5LU3pyY2w2c2tYRlg4dmtuNk85TWZybUlkbU5nZ2NiSTMyaGhHWGhGQkx3UVwvNVQ4U1FuaWJGb2d1QXEifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: ray.ni@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ray Ni > -----Original Message----- > From: Zhang, Shenglei > Sent: Tuesday, May 14, 2019 3:40 PM > To: devel@edk2.groups.io > Cc: Ni, Ray ; Wu, Hao A > Subject: [PATCH 2/4] Nt32Pkg: Update DSC/FDF to use NetworkPkg's include > fragment file. >=20 > 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 th= e > NetworkPkg's terms, and the value have been overridden with the original > default value on this platform. >=20 > Cc: Ruiyu Ni > Cc: Hao Wu > Signed-off-by: Shenglei Zhang > --- > Nt32Pkg/Nt32Pkg.dsc | 75 +++++---------------------------------------- > Nt32Pkg/Nt32Pkg.fdf | 27 ++-------------- > 2 files changed, 10 insertions(+), 92 deletions(-) >=20 > 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 > building first. > # > DEFINE SECURE_BOOT_ENABLE =3D FALSE > - > - # > - # This flag is to enable or disable TLS feature. > - # These can be changed on the command line. > - # -D FLAG=3DVALUE > - # > - # Note: TLS feature highly depends on the OpenSSL building. To enable = this > - # feature, please follow the instructions found in the file "Pat= ch- > HOWTO.txt" > - # located in CryptoPkg\Library\OpensslLib to enable the OpenSSL > building first. > - # > - DEFINE TLS_ENABLE =3D FALSE > - > - # > - # Indicates whether HTTP connections (i.e., unsecured) are permitted o= r > not. > - # -D FLAG=3DVALUE > - # > - # Note: If ALLOW_HTTP_CONNECTIONS is TRUE, HTTP connections are > allowed. Both > - # the "https://" and "http://" URI schemes are permitted. Otherw= ise, > HTTP > - # connections are denied. Only the "https://" URI scheme is perm= itted. > - # > - 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 >=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 >=20 > OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNu > ll/OemHookStatusCodeLibNull.inf >=20 > GenericBdsLib|IntelFrameworkModulePkg/Library/GenericBdsLib/GenericBd > sLib.inf >=20 > CustomizedDisplayLib|MdeModulePkg/Library/CustomizedDisplayLib/Custo > mizedDisplayLib.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 @@ >=20 > gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationCh > ange|FALSE > 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 a= ll > sources are verified in secure boot >=20 > 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), plea= se > 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 > - > -!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/WinNtSimpleFileSystemDxe.inf > INF > MdeModulePkg/Universal/PlatformDriOverrideDxe/PlatformDriOverrideDxe.i > nf > 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