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.31, mailfrom: zailiang.sun@intel.com) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by groups.io with SMTP; Mon, 20 May 2019 19:49:07 -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 orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 19:49:06 -0700 X-ExtLoop1: 1 Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga007.jf.intel.com with ESMTP; 20 May 2019 19:49:05 -0700 Received: from fmsmsx118.amr.corp.intel.com (10.18.116.18) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 20 May 2019 19:49:05 -0700 Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by fmsmsx118.amr.corp.intel.com (10.18.116.18) with Microsoft SMTP Server (TLS) id 14.3.408.0; Mon, 20 May 2019 19:49:05 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.33]) by SHSMSX106.ccr.corp.intel.com ([169.254.10.213]) with mapi id 14.03.0415.000; Tue, 21 May 2019 10:49:03 +0800 From: "Sun, Zailiang" To: "Zhang, Shenglei" , "devel@edk2.groups.io" CC: "Qian, Yi" Subject: Re: [PATCH edk2-platforms V3 15/18] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg DSC/FDF. Thread-Topic: [PATCH edk2-platforms V3 15/18] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg DSC/FDF. Thread-Index: AQHVDtrC8k85KOzFXkGyPTa/9DPyQ6Z04bBw Date: Tue, 21 May 2019 02:49:03 +0000 Message-ID: <7CB7EF03E15B5D48981329A508747A9850C65BE8@SHSMSX104.ccr.corp.intel.com> References: <20190520070729.30812-1-shenglei.zhang@intel.com> <20190520070729.30812-16-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-16-shenglei.zhang@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zailiang.sun@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Zailiang Sun > -----Original Message----- > From: Zhang, Shenglei > Sent: Monday, May 20, 2019 3:07 PM > To: devel@edk2.groups.io > Cc: Sun, Zailiang ; Qian, Yi > Subject: [PATCH edk2-platforms V3 15/18] Platform/Vlv2TbltDevicePkg: > Update DSC/FDF to use NetworkPkg DSC/FDF. >=20 > This patch updates the platform DSC/FDF files to use the include fragment > files provided by NetworkPkg. >=20 > Cc: Zailiang Sun > Cc: Yi Qian > Signed-off-by: Shenglei Zhang > --- > .../Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 24 +---------- > .../Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 6 +++ > .../Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 24 +---------- > .../Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 43 +++---------------- > .../Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 39 +++-------------- > .../Vlv2TbltDevicePkg/PlatformPkgX64.dsc | 42 +++--------------- > 6 files changed, 28 insertions(+), 150 deletions(-) >=20 > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf > b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf > index 098602b9d8..5827386977 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf > +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf > @@ -714,33 +714,13 @@ FILE FREEFORM =3D 878AC2CC-5343-46F2-B563- > 51F89DAF56BA { # # Network Modules # > +!include NetworkPkg/Network.fdf.inc > + > !if $(NETWORK_ENABLE) =3D=3D TRUE > FILE DRIVER =3D 22DE1691-D65D-456a-993E-A253DD1F308C { > SECTION PE32 =3D > Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi > SECTION UI =3D "UNDI" > } > - INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf > - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf > - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf > - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf > - INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > - INF NetworkPkg/TcpDxe/TcpDxe.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 > - !if $(NETWORK_VLAN_ENABLE) =3D=3D TRUE > - INF > MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > - !endif > - !if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE > - INF NetworkPkg/IScsiDxe/IScsiDxe.inf > - !endif > !endif >=20 > !if $(CAPSULE_ENABLE) > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc > b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc > index 6d556c1be2..61eca30be1 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc > +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc > @@ -76,10 +76,16 @@ DEFINE ENBDT_S3_SUPPORT =3D TRUE >=20 > DEFINE LZMA_ENABLE =3D TRUE > DEFINE S4_ENABLE =3D TRUE > + > +# > +# Network definition > +# > DEFINE NETWORK_ENABLE =3D TRUE > DEFINE NETWORK_IP6_ENABLE =3D TRUE > DEFINE NETWORK_ISCSI_ENABLE =3D FALSE > DEFINE NETWORK_VLAN_ENABLE =3D FALSE > +DEFINE NETWORK_TLS_ENABLE =3D FALSE > +DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE >=20 > DEFINE SATA_ENABLE =3D TRUE > DEFINE PCIESC_ENABLE =3D TRUE > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf > b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf > index 1ba6124a69..a6859d3b6d 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf > +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf > @@ -670,33 +670,13 @@ FILE FREEFORM =3D 878AC2CC-5343-46F2-B563- > 51F89DAF56BA { # # Network Modules # > +!include NetworkPkg/Network.fdf.inc > + > !if $(NETWORK_ENABLE) =3D=3D TRUE > FILE DRIVER =3D 22DE1691-D65D-456a-993E-A253DD1F308C { > SECTION PE32 =3D > Vlv2SocBinPkg/UNDI/RtkUndiDxe/$(DXE_ARCHITECTURE)/RtkUndiDxe.efi > SECTION UI =3D "UNDI" > } > - INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf > - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf > - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf > - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf > - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf > - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf > - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf > - INF MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf > - INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > - INF NetworkPkg/TcpDxe/TcpDxe.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 > - !if $(NETWORK_VLAN_ENABLE) =3D=3D TRUE > - INF > MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > - !endif > - !if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE > - INF NetworkPkg/IScsiDxe/IScsiDxe.inf > - !endif > !endif >=20 > !if $(CAPSULE_ENABLE) > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > index 3a3d3e29e7..b9c4739e09 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc > @@ -50,6 +50,8 @@ > !include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt > !include $(PLATFORM_PACKAGE)/PlatformPkgConfig.dsc >=20 > + DEFINE PLATFORMX64_ENABLE =3D TRUE > + > !if $(X64_CONFIG) =3D=3D TRUE > DEFINE DXE_ARCHITECTURE =3D X64 > DEFINE EDK_DXE_ARCHITECTURE =3D X64 > @@ -167,13 +169,7 @@ > !if $(SCSI_ENABLE) =3D=3D TRUE > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > !endif > -!if $(NETWORK_ENABLE) =3D=3D TRUE > - 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 > -!endif > + > !if $(S3_ENABLE) =3D=3D TRUE > S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf > !endif > @@ -1451,42 +1447,17 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fT > PMInitPeim.inf > } >=20 >=20 > + # > + # Network Stacks > + # > +!include NetworkPkg/Network.dsc.inc >=20 > !if $(NETWORK_ENABLE) =3D=3D TRUE > - !if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE > - NetworkPkg/IScsiDxe/IScsiDxe.inf > - !endif > - !if $(NETWORK_VLAN_ENABLE) =3D=3D TRUE > - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > - !endif > !if $(CSM_ENABLE) =3D=3D TRUE > IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf > !endif > !endif >=20 > -!if $(NETWORK_ENABLE) =3D=3D TRUE > - # > - # UEFI network modules > - # > - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf > - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf > - > - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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 > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > - NetworkPkg/TcpDxe/TcpDxe.inf > - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.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 > -!endif > - > !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE) > MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf > MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > index 69286bfc6f..c0ae9c02af 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc > @@ -167,13 +167,7 @@ > !if $(SCSI_ENABLE) =3D=3D TRUE > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > !endif > -!if $(NETWORK_ENABLE) =3D=3D TRUE > - 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 > -!endif > + > !if $(S3_ENABLE) =3D=3D TRUE > S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf > !endif > @@ -1438,40 +1432,17 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fT > PMInitPeim.inf > } >=20 >=20 > + # > + # Network Stacks > + # > +!include NetworkPkg/Network.dsc.inc >=20 > !if $(NETWORK_ENABLE) =3D=3D TRUE > - !if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE > - NetworkPkg/IScsiDxe/IScsiDxe.inf > - !endif > - !if $(NETWORK_VLAN_ENABLE) =3D=3D TRUE > - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > - !endif > !if $(CSM_ENABLE) =3D=3D TRUE > IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf > !endif > !endif >=20 > -!if $(NETWORK_ENABLE) =3D=3D TRUE > - # > - # UEFI network modules > - # > - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf > - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf > - > - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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 > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > - NetworkPkg/TcpDxe/TcpDxe.inf > - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.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 > !endif >=20 > !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE) diff --git > a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > index 4a226cf03c..0cb1bb9a9c 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgX64.dsc > @@ -50,6 +50,8 @@ > !include $(PLATFORM_PACKAGE)/AutoPlatformCFG.txt > !include $(PLATFORM_PACKAGE)/PlatformPkgConfig.dsc >=20 > + DEFINE PLATFORMX64_ENABLE =3D TRUE > + > !if $(X64_CONFIG) =3D=3D TRUE > DEFINE DXE_ARCHITECTURE =3D X64 > DEFINE EDK_DXE_ARCHITECTURE =3D X64 > @@ -167,13 +169,6 @@ > !if $(SCSI_ENABLE) =3D=3D TRUE > UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf > !endif > -!if $(NETWORK_ENABLE) =3D=3D TRUE > - 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 > -!endif > !if $(S3_ENABLE) =3D=3D TRUE > S3Lib|IntelFrameworkModulePkg/Library/PeiS3Lib/PeiS3Lib.inf > !endif > @@ -1453,42 +1448,17 @@ > $(PLATFORM_BINARY_PACKAGE)/$(DXE_ARCHITECTURE)$(TARGET)/IA32/fT > PMInitPeim.inf > } >=20 >=20 > + # > + # Network Stacks > + # > +!include NetworkPkg/Network.dsc.inc >=20 > !if $(NETWORK_ENABLE) =3D=3D TRUE > - !if $(NETWORK_ISCSI_ENABLE) =3D=3D TRUE > - NetworkPkg/IScsiDxe/IScsiDxe.inf > - !endif > - !if $(NETWORK_VLAN_ENABLE) =3D=3D TRUE > - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf > - !endif > !if $(CSM_ENABLE) =3D=3D TRUE > IntelFrameworkModulePkg/Csm/BiosThunk/Snp16Dxe/Snp16Dxe.inf > !endif > !endif >=20 > -!if $(NETWORK_ENABLE) =3D=3D TRUE > - # > - # UEFI network modules > - # > - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf > - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf > - > - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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 > - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf > - NetworkPkg/TcpDxe/TcpDxe.inf > - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.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 > -!endif > - > !if $(CAPSULE_ENABLE) || $(MICOCODE_CAPSULE_ENABLE) > MdeModulePkg/Universal/EsrtFmpDxe/EsrtFmpDxe.inf > MdeModulePkg/Application/CapsuleApp/CapsuleApp.inf > -- > 2.18.0.windows.1