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.126, mailfrom: michael.a.kubacki@intel.com) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Fri, 17 May 2019 00:26:15 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 May 2019 00:26:14 -0700 X-ExtLoop1: 1 Received: from orsmsx109.amr.corp.intel.com ([10.22.240.7]) by FMSMGA003.fm.intel.com with ESMTP; 17 May 2019 00:26:14 -0700 Received: from orsmsx121.amr.corp.intel.com ([169.254.10.47]) by ORSMSX109.amr.corp.intel.com ([169.254.11.251]) with mapi id 14.03.0415.000; Fri, 17 May 2019 00:26:14 -0700 From: "Kubacki, Michael A" To: "Zhang, Shenglei" , "devel@edk2.groups.io" CC: "Yao, Jiewen" , "Lu, Shifei A" , "Zhou, Bowen" Subject: Re: [PATCH edk2-platforms V2 16/16] Platform/PurleyOpenBoardPkg: Update DSC/FDF to use NetworkPkg's fragment file. Thread-Topic: [PATCH edk2-platforms V2 16/16] Platform/PurleyOpenBoardPkg: Update DSC/FDF to use NetworkPkg's fragment file. Thread-Index: AQHVDH/c/Znx/qbg00KTN+DZWteGXqZu50jw Date: Fri, 17 May 2019 07:26:13 +0000 Message-ID: <49AB4ACB9627B8468F29D589A27B7455889458BB@ORSMSX121.amr.corp.intel.com> References: <20190517071027.24780-1-shenglei.zhang@intel.com> <20190517071027.24780-17-shenglei.zhang@intel.com> In-Reply-To: <20190517071027.24780-17-shenglei.zhang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZmIyMDVmNGEtOWE4OS00NWMyLWIxMWUtOTA1NDA1MGY4NjBlIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoid3ZCeWk5dU1tb2tqT3Z4NW9YMk9IODV6Z2d0RkhxYjFORnpwemlFd1J0dmF6QllyN1pcL1IranJjbHV4cWcxREwifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.22.254.140] MIME-Version: 1.0 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable This looks like a good improvement. --- * This is touching three packages though the patch only calls out PurleyOpe= nBoardPkg. * AdvancedFeaturePkg * MinPlatformPkg * Purley OpenBoardPkg --- * Copyright years in files modified are not updated. --- There's some PatchCheck.py errors, please check and fix those. Thanks, Michael > -----Original Message----- > From: Zhang, Shenglei > Sent: Friday, May 17, 2019 12:10 AM > To: devel@edk2.groups.io > Cc: Kubacki, Michael A ; Yao, Jiewen > ; Lu, Shifei A ; Zhou, Bowen > > Subject: [PATCH edk2-platforms V2 16/16] Platform/PurleyOpenBoardPkg: > Update DSC/FDF to use NetworkPkg's fragment file. >=20 > This patch updates the platform DSC/FDF files to use the include fragment > files provided by NetworkPkg.And add network related definition in Purley > PlatformPkg.dsc. >=20 > Cc: Michael A Kubacki > Cc: Jiewen Yao > cc: Shifei A Lu > cc: Xiaohu Zhou > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Shenglei Zhang > --- > .../Include/Dsc/CoreAdvancedDxeInclude.dsc | 26 +------------------ > .../Include/Fdf/CoreAdvancedLateInclude.fdf | 26 +------------------ > .../Include/Dsc/CoreCommonLib.dsc | 11 ++++---- > .../BoardMtOlympus/PlatformPkg.dsc | 6 +++++ > 4 files changed, 14 insertions(+), 55 deletions(-) >=20 > diff --git > a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud > e.dsc > b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud > e.dsc > index 6764d46131..0c44c52582 100644 > --- > a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclud > e.dsc > +++ > b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclu > +++ de.dsc > @@ -17,31 +17,7 @@ > # > # UEFI network modules > # > -!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable =3D=3D TRUE > - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf > - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf > - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf > - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf > - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > - MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > - > - NetworkPkg/Ip6Dxe/Ip6Dxe.inf > - NetworkPkg/TcpDxe/TcpDxe.inf > - NetworkPkg/Udp6Dxe/Udp6Dxe.inf > - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > - > - NetworkPkg/DnsDxe/DnsDxe.inf > - NetworkPkg/HttpDxe/HttpDxe.inf > - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > - NetworkPkg/HttpBootDxe/HttpBootDxe.inf > - > - NetworkPkg/IScsiDxe/IScsiDxe.inf > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > -!endif > + !include NetworkPkg/NetworkComponents.dsc.inc >=20 > !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable =3D=3D TRUE > MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > diff --git > a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud > e.fdf > b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud > e.fdf > index 64f1dd5872..97706f7805 100644 > --- > a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclud > e.fdf > +++ > b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateIncl > +++ ude.fdf > @@ -17,31 +17,7 @@ > # > # UEFI network modules > # > -!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable =3D=3D TRUE -INF > MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf > -INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf > -INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > -INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.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/Mtftp4Dxe/Mtftp4Dxe.inf > -INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > - > -INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf > -INF NetworkPkg/TcpDxe/TcpDxe.inf > -INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf > -INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf > -INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf > - > -INF NetworkPkg/DnsDxe/DnsDxe.inf > -INF NetworkPkg/HttpDxe/HttpDxe.inf > -INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf > -INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf > - > -INF NetworkPkg/IScsiDxe/IScsiDxe.inf > -INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > -!endif > +!include NetworkPkg/Network.fdf.inc >=20 > !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable =3D=3D TRUE INF > MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf > diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc > b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc > index dd0173a1af..e8f4760395 100644 > --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc > +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc > @@ -78,11 +78,12 @@ > # > 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 > - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf > + > + # > + # Network libraries > + # > +!include NetworkPkg/NetworkLibs.dsc.inc > + >=20 > OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibN > ull/OemHookStatusCodeLibNull.inf >=20 > CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.in > f >=20 > diff --git > a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc > b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc > index ded1201a86..c549936299 100644 > --- > a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc > +++ > b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc > @@ -36,6 +36,12 @@ > BUILD_TARGETS =3D DEBUG|RELEASE > SKUID_IDENTIFIER =3D DEFAULT >=20 > + !if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable =3D=3D TRUE > + DEFINE NETWORK_TLS_ENABLE =3D FALSE > + !else > + DEFINE NETWORK_ENABLE =3D FALSE > + !endif > + > # > # Set the global variables > # > -- > 2.18.0.windows.1