From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.65, mailfrom: ray.ni@intel.com) Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by groups.io with SMTP; Tue, 14 May 2019 05:45:10 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 May 2019 05:45:02 -0700 X-ExtLoop1: 1 Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga007.jf.intel.com with ESMTP; 14 May 2019 05:45:02 -0700 Received: from fmsmsx111.amr.corp.intel.com (10.18.116.5) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 14 May 2019 05:45:01 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx111.amr.corp.intel.com (10.18.116.5) 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 SHSMSX152.ccr.corp.intel.com ([169.254.6.18]) with mapi id 14.03.0415.000; Tue, 14 May 2019 20:44:59 +0800 From: "Ni, Ray" To: "devel@edk2.groups.io" , "Zhang, Shenglei" CC: "Justen, Jordan L" , Andrew Fish Subject: Re: [edk2-devel] [PATCH 4/4] EmulatorPkg: Update DSC/FDF to use NetworkPkg's include fragment file. Thread-Topic: [edk2-devel] [PATCH 4/4] EmulatorPkg: Update DSC/FDF to use NetworkPkg's include fragment file. Thread-Index: AQHVCihA51KxaWmm1EWOmSZaUdnMV6ZqkRQg Date: Tue, 14 May 2019 12:44:59 +0000 Deferred-Delivery: Tue, 14 May 2019 12:44:00 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C13F646@SHSMSX104.ccr.corp.intel.com> References: <20190514073938.21528-1-shenglei.zhang@intel.com> <20190514073938.21528-5-shenglei.zhang@intel.com> In-Reply-To: <20190514073938.21528-5-shenglei.zhang@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMmM0MTNiZmQtMTg1ZS00NDhhLTljZjctMTU1MWFkYzA1ZDA3IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiWnc3VDM4Q0ZpdWhjbnpJTzZJXC9EM2pJakhIdGErZWhhMXVGUUc0MEd5ZnJVRStHWFRBZE1EMXFkR3Q2WE9QcU0ifQ== 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: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Zhang, Shenglei > Sent: Tuesday, May 14, 2019 3:40 PM > To: devel@edk2.groups.io > Cc: Justen, Jordan L ; Andrew Fish > ; Ni, Ray > Subject: [edk2-devel] [PATCH 4/4] EmulatorPkg: Update DSC/FDF to use > NetworkPkg's include fragment file. >=20 > This patch updates the platform DSC/FDF files to use the include fragmen= t > 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. >=20 > Cc: Jordan Justen > Cc: Andrew Fish > Cc: Ruiyu Ni > Signed-off-by: Shenglei Zhang > --- > EmulatorPkg/EmulatorPkg.dsc | 32 +++++++++++++++----------------- > EmulatorPkg/EmulatorPkg.fdf | 10 +--------- > 2 files changed, 16 insertions(+), 26 deletions(-) >=20 > diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc > index de20f81046..f63e7166a4 100644 > --- a/EmulatorPkg/EmulatorPkg.dsc > +++ b/EmulatorPkg/EmulatorPkg.dsc > @@ -23,6 +23,19 @@ > SKUID_IDENTIFIER =3D DEFAULT > FLASH_DEFINITION =3D EmulatorPkg/EmulatorPkg.fdf >=20 > + # > + # Network stack drivers > + # > + > + # > + # EmuSnpDxe.inf will be used. > + # > + DEFINE NETWORK_SNP_ENABLE =3D FALSE > + DEFINE NETWORK_IP6_ENABLE =3D FALSE > + DEFINE NETWORK_TLS_ENABLE =3D FALSE > + DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE > + DEFINE NETWORK_ISCSI_ENABLE =3D FALSE > + > [SkuIds] > 0|DEFAULT >=20 > @@ -68,10 +81,6 @@ > # Generic Modules > # > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf > - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf > - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf > - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf >=20 > OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNu > ll/OemHookStatusCodeLibNull.inf > BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf > FileExplorerLib|MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.= inf > @@ -357,19 +366,6 @@ >=20 > MdeModulePkg/Application/HelloWorld/HelloWorld.inf >=20 > - # > - # Network stack drivers > - # > - 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 > - > MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > MdeModulePkg/Universal/HiiDatabaseDxe/HiiDatabaseDxe.inf > MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > @@ -412,6 +408,8 @@ >=20 > !endif >=20 > +!include NetworkPkg/Network.dsc.inc > + > [BuildOptions] > MSFT:DEBUG_*_*_CC_FLAGS =3D /Od /Oy- > MSFT:NOOPT_*_*_CC_FLAGS =3D /Od /Oy- > diff --git a/EmulatorPkg/EmulatorPkg.fdf b/EmulatorPkg/EmulatorPkg.fdf > index 94a060c999..ec411e82b4 100644 > --- a/EmulatorPkg/EmulatorPkg.fdf > +++ b/EmulatorPkg/EmulatorPkg.fdf > @@ -190,15 +190,7 @@ INF > MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf > !if $(NETWORK_SUPPORT) > INF EmulatorPkg/EmuSnpDxe/EmuSnpDxe.inf > !endif > -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 NetworkPkg/TcpDxe/TcpDxe.inf > -INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > +!include NetworkPkg/Network.fdf.inc >=20 > INF FatPkg/EnhancedFatDxe/Fat.inf >=20 > -- > 2.18.0.windows.1 >=20 >=20 >=20