From nobody Thu May 2 12:46:24 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+41000+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+41000+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336234; cv=none; d=zoho.com; s=zohoarc; b=CBKaRYskQvuUE3W3Vd87rB1hx7+XyNOKpay4Njm8wVd8wHVQRTYmmTITJH7FV/l8cKS4uYxnsALJej4fNJcUEA0X6ECzPKI4dt47eoWvA5QGYPFquF4COABPxJGzP7FXKjFeIF4Dg2mxIDH8jhY31Ij3gW8coTPitJTITHB2w9M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336234; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=ad4zdxBmW4y/rYmrPoOcdZsKLGBjtbGvpMrNSYusr38=; b=ChDnXZvoEM0qR6SDV2q9akuSENrgNPLbmqiaBJsz3exAZJGuMHFmfnR34AkuHQkRVcNAfaeN9wN0SsMVf3HYEr3MFhPbJfZjIQsTcO4hBbG4gP36FeOyHQ2lxHvzzzvjtOzi2EtLiYT/9BcNqf4ojYUILyt+5XzR3Hmf9ecDyUI= 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+41000+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 1558336234965997.0464028746685; Mon, 20 May 2019 00:10:34 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:33 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:33 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:32 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH edk2-platforms V3 01/18] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Mon, 20 May 2019 15:07:12 +0800 Message-Id: <20190520070729.30812-2-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336234; bh=EY0gELt4O3EVnm8i8vpHGenTK4gffgGoaDvvXRWGm58=; h=Date:From:Reply-To:Subject:To; b=AIZtjiJu8mHPdyKppnSHpHan9UmX2x/tCNuv2NURDO9bx43WKSh7BNvfY+5PbHgapDr jMftd4UdDwxZwenARCleeST0FCw8maclajPQhTM/SA8bHzWalXGF5BhRsVpGvWVXeXvOq QL00B1QfRuZ296MRAdHJnLwnUEhdJmm48AE= 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. v2: Remove TcpIoLib and HttpLib. Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm --- .../AMD/OverdriveBoard/OverdriveBoard.dsc | 31 +------------------ .../AMD/OverdriveBoard/OverdriveBoard.fdf | 23 +------------- 2 files changed, 2 insertions(+), 52 deletions(-) diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc b/Platform/AMD/= OverdriveBoard/OverdriveBoard.dsc index 5ba8e16a5a..6629009132 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.dsc @@ -72,12 +72,6 @@ DEFINE X64EMU_ENABLE =3D FALSE =20 BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf =20 - # Networking Requirements - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - # ARM Architectural Libraries CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMainte= nanceLib.inf DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/Def= aultExceptionHandlerLib.inf @@ -124,9 +118,7 @@ DEFINE X64EMU_ENABLE =3D FALSE IniParsingLib|SignedCapsulePkg/Library/IniParsingLib/IniParsingLib.inf PlatformFlashAccessLib|Silicon/AMD/Styx/Library/StyxPlatformFlashAccessL= ib/StyxPlatformFlashAccessLib.inf =20 - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf =20 UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManag= erLib.inf @@ -635,28 +627,7 @@ DEFINE X64EMU_ENABLE =3D FALSE # # Networking stack # - 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/SnpDxe/SnpDxe.inf - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.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/UefiPxeBcDxe/UefiPxeBcDxe.inf - NetworkPkg/IScsiDxe/IScsiDxe.inf - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpBootDxe/HttpBootDxe.inf - NetworkPkg/TlsDxe/TlsDxe.inf - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf +!include NetworkPkg/Network.dsc.inc MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf =20 # diff --git a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf b/Platform/AMD/= OverdriveBoard/OverdriveBoard.fdf index b823cb1b46..851ae65b5b 100644 --- a/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf +++ b/Platform/AMD/OverdriveBoard/OverdriveBoard.fdf @@ -187,28 +187,7 @@ READ_LOCK_STATUS =3D TRUE # # Networking stack # - 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/SnpDxe/SnpDxe.inf - INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.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/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF NetworkPkg/IScsiDxe/IScsiDxe.inf - INF NetworkPkg/DnsDxe/DnsDxe.inf - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - INF NetworkPkg/HttpDxe/HttpDxe.inf - INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf - INF NetworkPkg/TlsDxe/TlsDxe.inf - INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf +!include NetworkPkg/Network.fdf.inc INF MdeModulePkg/Universal/Disk/RamDiskDxe/RamDiskDxe.inf =20 # --=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 (#41000): https://edk2.groups.io/g/devel/message/41000 Mute This Topic: https://groups.io/mt/31682811/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- From nobody Thu May 2 12:46:24 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+41001+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+41001+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336055; cv=none; d=zoho.com; s=zohoarc; b=ZPLRxTgK8ZykqfS49W+h5Ms2HJJgv+DcsEm1JYZpS31yY0x2HHxaZzFWynEJG5DPNh5Lgpi2zIMBXoUBQodvpJ16+23AzloZ2ZQbl5ZMZyYEhh1WXDA5KvAAMVktTDJjkT46hQS5zb5G3wqRa2i9wvJqOECOTZCKB9KgzZ5VOQE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336055; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=iDQf/dUSdBVHg7NigeWQRQWbFn+FsThe+0gJ/BpTg74=; b=UxgSlDFQpBTVdoEl/747HevjZAXOluHL4sOuovzxOO41u6arMp5Uol2SBT4Ed5mztbD0zIsLuAR4uUPdT9Z8evkGFcLq66ilfnF3D3V1B5J8WoErJXjY5qkBbPL7uF9OZcYv/glc3xgo48lSb0vZpyw7lwqFlyUvpjaDKX8qmpY= 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+41001+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 1558336055721859.3628719263492; Mon, 20 May 2019 00:07:35 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:34 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:34 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:33 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH edk2-platforms V3 02/18] Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Mon, 20 May 2019 15:07:13 +0800 Message-Id: <20190520070729.30812-3-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336054; bh=WduUgqg/rUPqMUFGjU1P95ljaAIOkuneq7tTlBbH7uY=; h=Date:From:Reply-To:Subject:To; b=M2M5kVvLUDFlk+cUyXw1r3T7u5GYjUcY7RHPywhrsEpNxbn9A7mShjA37Q0DP29iufX 8wrdoiFIpcXpZaSXPUWMx5i8JdNzoPMZB61p0XC6pwtbl59TobREMCocGkqezUnF76gSx PYzfBs7fhQBATgIRErXHXa5aUyG5X83sLM8= 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. v2: Withdraw the unnecessary changes. Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm --- .../ArmVExpress-networking.fdf.inc | 12 +-------- Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 26 +++++++------------ 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc b/Plat= form/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc index 6d060303b9..1ee2eeab01 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc @@ -7,17 +7,7 @@ # # Networking stack # - 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/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF NetworkPkg/TcpDxe/TcpDxe.inf - INF NetworkPkg/IScsiDxe/IScsiDxe.inf - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf +!include NetworkPkg/Network.fdf.inc =20 !if $(INCLUDE_TFTP_COMMAND) =3D=3D TRUE # diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VE= xpressPkg/ArmVExpress.dsc.inc index 7b5dc93a70..13f5c6c1e7 100644 --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc @@ -9,6 +9,14 @@ SECURE_BOOT_ENABLE =3D FALSE INCLUDE_TFTP_COMMAND =3D TRUE =20 + # + # Network definition + # + 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 + [BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,B= uildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICA= TION] GCC:*_*_*_DLINK_FLAGS =3D -z common-page-size=3D0x1000 =20 @@ -54,12 +62,6 @@ =20 BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf =20 - # Networking Requirements - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf =20 # ARM Architectural Libraries CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMainte= nanceLib.inf @@ -409,17 +411,7 @@ # # Networking stack # - 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 !ifdef EDK2_ENABLE_SMSC_91X # SMSC LAN 91C111 EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.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 (#41001): https://edk2.groups.io/g/devel/message/41001 Mute This Topic: https://groups.io/mt/31682812/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- From nobody Thu May 2 12:46:24 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+41002+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+41002+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336076; cv=none; d=zoho.com; s=zohoarc; b=bpNEqiJ+UH6AwYaO7acyWKoKsDukAdz7MjAcp9EBnuT5M4TMkggqmcqCQ93jrArHJaEEuMYOBRrt/RNvgHX2Cg3yF/rIGLk5JB3oMV4rgJ7Y6zaM3/i+p4l8C6A8USeCxEFaLdSER5k7eN4KO4brJjqH52Jq2ry7UhkRXgieZtY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336076; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=9y1Y9oitIH2BnP0S7Q4gNvqiHZhi2KAZ/AI5K1cx/tg=; b=Tsu7YJYWo9TjIoz/cZ8pbgTGvkvXL0HbQy9Ch4e14E3m4K/bJYDg8vtLto91J+5MxYX40E9FvlSYnt5gSUyAPxWYDiqv0x50aomtyraKiMJ76Oe4Akq8FOMYafEwTc+KKyst5sFe0Gv9N7cmmBy08C7jvClkHg4QfqwSwkRnVsE= 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+41002+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 1558336076252513.189516618621; Mon, 20 May 2019 00:07:56 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Mon, 20 May 2019 00:07:54 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:35 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:34 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH edk2-platforms V3 03/18] Hisilicon/D03: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Mon, 20 May 2019 15:07:14 +0800 Message-Id: <20190520070729.30812-4-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336075; bh=/ASflk7CiJstR4Xmse1+Q8sl4j65Yyyr2sn1qXpNVzw=; h=Date:From:Reply-To:Subject:To; b=leTcJkCZxqnHfZ+ZOgL7jZamUihVOXs0GtA1teWPzABtkkMtmfGpieDVZeyQcUOeb4R MzWc7EZo5cJRk2Nyu7ftrjWlrO2qT9ZY3rLq6THAt4g7oL4uobF3soRYg7gg4xW5bPE1O On2oWN2Z40mutMunj2bLgTxuy3IEWoMOl9c= 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. Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm --- Platform/Hisilicon/D03/D03.dsc | 26 +++++++++++--------------- Platform/Hisilicon/D03/D03.fdf | 10 +--------- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/Platform/Hisilicon/D03/D03.dsc b/Platform/Hisilicon/D03/D03.dsc index 60b0d6393e..7f4f3b002a 100644 --- a/Platform/Hisilicon/D03/D03.dsc +++ b/Platform/Hisilicon/D03/D03.dsc @@ -23,6 +23,16 @@ SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/Hisilicon/$(PLATFORM_NAME)/$= (PLATFORM_NAME).fdf =20 + # + # Network definition + # + 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 + DEFINE NETWORK_VLAN_ENABLE =3D FALSE + !include Silicon/Hisilicon/Hisilicon.dsc.inc =20 [LibraryClasses.common] @@ -34,13 +44,8 @@ =20 IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf =20 - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServic= esLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - =20 =20 !ifdef $(FDT_ENABLE) @@ -398,16 +403,7 @@ =20 Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf =20 - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf - NetworkPkg/TcpDxe/TcpDxe.inf - +!include NetworkPkg/Network.dsc.inc Platform/Hisilicon/D03/Drivers/Sas/SasDxeDriver.inf =20 SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.= inf diff --git a/Platform/Hisilicon/D03/D03.fdf b/Platform/Hisilicon/D03/D03.fdf index f5d0c66f63..e44cb86282 100644 --- a/Platform/Hisilicon/D03/D03.fdf +++ b/Platform/Hisilicon/D03/D03.fdf @@ -240,15 +240,7 @@ READ_LOCK_STATUS =3D TRUE INF Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf INF Platform/Hisilicon/D03/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.inf =20 - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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 +!include NetworkPkg/Network.fdf.inc =20 !ifdef $(FDT_ENABLE) INF Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.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 (#41002): https://edk2.groups.io/g/devel/message/41002 Mute This Topic: https://groups.io/mt/31682814/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- From nobody Thu May 2 12:46:24 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+41003+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+41003+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336077; cv=none; d=zoho.com; s=zohoarc; b=a9NXMZQof/FUAh3EUc2NALGWrpVRtpfvS+1NqHk+BAfReiFZ/kTvDxHSmwAhQI4D7bT9RyiTiSqj8Yz+LoE4rCgSc2/oK2yFeGyTDVbgaJDX+PWF6si2tZJUBGTL7M6OZ6aFMjPX/I20Jm8XtRPmtykK4Rs1kc3HVICs4uxRTCA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336077; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=TIg8nFmsNFgn0u8lTfJ7xzbtahA/GDSFjGgF/9f0+aE=; b=aJ6aRDAiXPUxPKxEjqXRpcDEajgp8SPBLvJ1pQVUNq9SE200Vz+5PWBy+/h2BZVkRSuUXIIyf6zbG2MMVh4PNR1gxRzEx2CrfxtQB2mlKWjG1DSrJhHCbN0/TTnkNFaWYONpjyxKZasg6fypVgPvodqncntThvjJRS3FKqIAnXM= 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+41003+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 1558336077068494.8255786166751; Mon, 20 May 2019 00:07:57 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:55 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:36 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:35 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Leif Lindholm Subject: [edk2-devel] [PATCH edk2-platforms V3 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Mon, 20 May 2019 15:07:15 +0800 Message-Id: <20190520070729.30812-5-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336075; bh=bYX0ixv+kjgzZPSqrVA9uyFGAUWkbvtPedf5PWhKNRA=; h=Cc:Date:From:Reply-To:Subject:To; b=F7/1fUjEklxoqCrxPYUbNHw6NAqIHArcRCfcDjgQmnpuzfh+uPYnka8QyQB7u1Tz6MW ol3sy7nv4Xf2coAfrEXrPim4ATxQOAM86POvVhh4iVn63KBMZWy5i5W6p/8ilaKS01kOm lgxFwBo0k9CJBPiPxAvcOdE7LTg/8x8xrKs= 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. v2: Withdraw unrelated changes. Cc: Leif Lindholm Signed-off-by: Shenglei Zhang --- Platform/Hisilicon/D05/D05.dsc | 59 ++++++++++------------------------ Platform/Hisilicon/D05/D05.fdf | 23 +------------ 2 files changed, 18 insertions(+), 64 deletions(-) diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index dc9e1407ba..239bc776f9 100644 --- a/Platform/Hisilicon/D05/D05.dsc +++ b/Platform/Hisilicon/D05/D05.dsc @@ -23,8 +23,15 @@ SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/Hisilicon/$(PLATFORM_NAME)/$= (PLATFORM_NAME).fdf DEFINE EDK2_SKIP_PEICORE=3D0 - DEFINE NETWORK_IP6_ENABLE =3D FALSE - DEFINE HTTP_BOOT_ENABLE =3D FALSE + + # + # Network definition + # + DEFINE NETWORK_SNP_ENABLE =3D FALSE + DEFINE NETWORK_TLS_ENABLE =3D FALSE + DEFINE NETWORK_VLAN_ENABLE =3D FALSE + DEFINE NETWORK_IP6_ENABLE =3D FALSE + DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE =20 !include Silicon/Hisilicon/Hisilicon.dsc.inc =20 @@ -37,12 +44,8 @@ =20 IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf =20 - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServic= esLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRepor= tStatusCodeLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf @@ -50,11 +53,6 @@ BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf =20 - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf - -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf -!endif =20 !ifdef $(FDT_ENABLE) #FDTUpdateLib @@ -89,10 +87,10 @@ =20 LpcLib|Silicon/Hisilicon/Hi1610/Library/LpcLib/LpcLib.inf SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortL= ib.inf - PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPci= Lib.inf + PlatformPciLib|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPci= Lib.inf PciHostBridgeLib|Platform/Hisilicon/Library/PciHostBridgeLib/PciHostBrid= geLib.inf PciSegmentLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciSegmentLib/Hi161= xPciSegmentLib.inf - PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi1= 61xPciPlatformLib.inf + PciPlatformLib|Silicon/Hisilicon/Hi1610/Library/Hi161xPciPlatformLib/Hi1= 61xPciPlatformLib.inf =20 [LibraryClasses.common.SEC] ArmPlatformLib|Silicon/Hisilicon/Library/ArmPlatformLibHisilicon/ArmPlat= formLibSec.inf @@ -130,7 +128,7 @@ =20 [PcdsFixedAtBuild.common] gArmPlatformTokenSpaceGuid.PcdCoreCount|8 - gArmTokenSpaceGuid.PcdPciIoTranslation|0 + gArmTokenSpaceGuid.PcdPciIoTranslation|0 =20 gEfiMdeModulePkgTokenSpaceGuid.PcdMaxVariableSize|0x2000 =20 @@ -466,7 +464,7 @@ ArmPkg/Drivers/CpuDxe/CpuDxe.inf MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf =20 - ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf + ArmPkg/Drivers/ArmPciCpuIo2Dxe/ArmPciCpuIo2Dxe.inf Platform/Hisilicon/D03/Drivers/OemNicConfig2PHi1610/OemNicConfig2P.inf =20 Platform/Hisilicon/D05/Drivers/SFC/SfcDxeDriver.inf @@ -532,30 +530,7 @@ =20 Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf =20 - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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 -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE - NetworkPkg/Ip6Dxe/Ip6Dxe.inf - NetworkPkg/Udp6Dxe/Udp6Dxe.inf - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf -!endif -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpBootDxe/HttpBootDxe.inf -!endif - - +!include NetworkPkg/Network.dsc.inc Platform/Hisilicon/D05/Drivers/Sas/SasDxeDriver.inf =20 SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareReportDxe.= inf @@ -602,10 +577,10 @@ NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf } - Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf { + Silicon/Hisilicon/Drivers/PciPlatform/PciPlatform.inf { - NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf - } + NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf + } MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf { NULL|Platform/Hisilicon/D05/Library/PlatformPciLib/PlatformPciLib.inf diff --git a/Platform/Hisilicon/D05/D05.fdf b/Platform/Hisilicon/D05/D05.fdf index 812f7f2690..c18f23482f 100644 --- a/Platform/Hisilicon/D05/D05.fdf +++ b/Platform/Hisilicon/D05/D05.fdf @@ -246,28 +246,7 @@ READ_LOCK_STATUS =3D TRUE INF Silicon/Hisilicon/Drivers/SnpPlatform/SnpPlatform.inf INF Platform/Hisilicon/D05/Drivers/Net/SnpPV600Dxe/SnpPV600Dxe.inf =20 - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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 -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE - INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf - INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf - INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf -!endif -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE - INF NetworkPkg/DnsDxe/DnsDxe.inf - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - INF NetworkPkg/HttpDxe/HttpDxe.inf - INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf -!endif +!include NetworkPkg/Network.fdf.inc =20 !ifdef $(FDT_ENABLE) INF Silicon/Hisilicon/Drivers/UpdateFdtDxe/UpdateFdtDxe.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 (#41003): https://edk2.groups.io/g/devel/message/41003 Mute This Topic: https://groups.io/mt/31682815/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- From nobody Thu May 2 12:46:24 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+41004+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+41004+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336077; cv=none; d=zoho.com; s=zohoarc; b=ECjH1WAuZibGDjsnW4EMiFS3kjLp+vviP0GNEAcjjwyaeOu6NS40yA3WrObboVwigfjOcrRoNMUcXB6cT4QgbPdQUJxEFYTDVSFI+DA8/C2LUa+8j57SvmMlGiNhcseZvaSTwc86MhnqBSlpgwLzrn2hmtNxinBUPtGy6ynaUXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336077; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=FQPCxx0KX+xvAGKazhAa8WETx6hId+jdMG8kGpm8hp8=; b=Bht1W83Evh7rK8p6eTGK/1yfz0KnlAapxcFguOT3/U2RmB6Ih39l72AE6C2j7qfIa+webOox8jTmzYvvXbk69thDBf9LG9yy3o+kjrUqUpYL3zGXxNi94mjLU2W78BigboyJdA5J5IBsTHNLn6wiFFge8n5wh+UZ3lGXmG4j8Z4= 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+41004+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 1558336077160287.63836321203564; Mon, 20 May 2019 00:07:57 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:55 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:37 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:37 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH edk2-platforms V3 05/18] Hisilicon/D06: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Mon, 20 May 2019 15:07:16 +0800 Message-Id: <20190520070729.30812-6-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336076; bh=Qi+6iSmuSHszNXCLp2ebWYofR+a+Fs1GnYUvRsdf820=; h=Date:From:Reply-To:Subject:To; b=D8l1qoBv0P7q6HCLli5lInJ295RQXe5Dq0dCbJJjtyNBwjbVggvm5GTg/RdJuF+jzNe UBDCxrmK8bISKa2HHA1wAZQqTt+rCv9gGb2c1EgMMUzrTHkkiTlw1g0fq+7g337G5UH2E 8brVCU6nuPWbu/deY5XHpu3yOse78cktmYg= 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. Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm --- Platform/Hisilicon/D06/D06.dsc | 42 ++++++++-------------------------- Platform/Hisilicon/D06/D06.fdf | 27 +--------------------- 2 files changed, 11 insertions(+), 58 deletions(-) diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc index 5387daf553..269515c7a5 100644 --- a/Platform/Hisilicon/D06/D06.dsc +++ b/Platform/Hisilicon/D06/D06.dsc @@ -22,8 +22,14 @@ BUILD_TARGETS =3D DEBUG|NOOPT|RELEASE SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/Hisilicon/$(PLATFORM_NAME)/$= (PLATFORM_NAME).fdf - DEFINE NETWORK_IP6_ENABLE =3D FALSE - DEFINE HTTP_BOOT_ENABLE =3D FALSE + + # + # Network definition + # + DEFINE NETWORK_TLS_ENABLE =3D FALSE + DEFINE NETWORK_VLAN_ENABLE =3D FALSE + DEFINE NETWORK_IP6_ENABLE =3D FALSE + DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE =20 !include Silicon/Hisilicon/Hisilicon.dsc.inc =20 @@ -36,12 +42,8 @@ TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf IpmiCmdLib|Silicon/Hisilicon/Library/IpmiCmdLib/IpmiCmdLib.inf =20 - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf HiiLib|MdeModulePkg/Library/UefiHiiLib/UefiHiiLib.inf UefiHiiServicesLib|MdeModulePkg/Library/UefiHiiServicesLib/UefiHiiServic= esLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf ReportStatusCodeLib|MdeModulePkg/Library/DxeReportStatusCodeLib/DxeRepor= tStatusCodeLib.inf DxeServicesLib|MdePkg/Library/DxeServicesLib/DxeServicesLib.inf @@ -49,9 +51,8 @@ BootLogoLib|MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf SortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf =20 - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf =20 -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE +!if $(NETWORK_HTTP_BOOT_ENABLE) =3D=3D TRUE HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf !endif =20 @@ -340,30 +341,7 @@ # #network # - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf - - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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 -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE - NetworkPkg/Ip6Dxe/Ip6Dxe.inf - NetworkPkg/Udp6Dxe/Udp6Dxe.inf - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf -!endif -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpBootDxe/HttpBootDxe.inf -!endif +!include NetworkPkg/Network.dsc.inc =20 MdeModulePkg/Bus/Pci/SataControllerDxe/SataControllerDxe.inf MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AtaAtapiPassThru.inf diff --git a/Platform/Hisilicon/D06/D06.fdf b/Platform/Hisilicon/D06/D06.fdf index 976b597647..f6cb3f6876 100644 --- a/Platform/Hisilicon/D06/D06.fdf +++ b/Platform/Hisilicon/D06/D06.fdf @@ -239,32 +239,7 @@ READ_LOCK_STATUS =3D TRUE # #Network # - INF Platform/Hisilicon/D06/Drivers/Net/SnpHi1620NewDxe/SnpDxe.inf - - INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf - INF MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - INF MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - INF MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - INF MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - INF MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.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 -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE - INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf - INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf - INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf -!endif -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE - INF NetworkPkg/DnsDxe/DnsDxe.inf - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - INF NetworkPkg/HttpDxe/HttpDxe.inf - INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf -!endif - +!include NetworkPkg/Network.fdf.inc =20 # # PCI Support --=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 (#41004): https://edk2.groups.io/g/devel/message/41004 Mute This Topic: https://groups.io/mt/31682816/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- From nobody Thu May 2 12:46:24 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+41005+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+41005+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336077; cv=none; d=zoho.com; s=zohoarc; b=fNgKs2VHTVk1/AKpx5jzdy+l7sCGK1GAdyKA+abUQ1oS/GUF3Ykp0ZPuJnMiR8HrV6d1UQS0wU2h1UMIaK/SyhFKKce0s1EY3ZGiRuFoN03/7w6aN4JnNMJFi/T9g9Q13IjlfmikRYNGd0kjyi68462xGIC4IN5IdmFUmsoNAPI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336077; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=hRLCVF6pT64QnP7ORC7g/9Y5UC50ytNP2gZb6lqNU4g=; b=AaOyzt4ntG3F/i8dYBqnt/iXKiLN+NYcd/or4FpIKLj1TjH5WznC3tdqCkn/dBoMVdGKL6M3XC9jgF38oDvFQ90jCq5xd/pgP54MGAbG0EAg5SdB/ABl+0YCJngSu1H5Jaru9cAcsVDW81WSi4xaDUwVAFq+SlDa5Dz2o29m9hQ= 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+41005+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 1558336077480244.82350141652103; Mon, 20 May 2019 00:07:57 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:38 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:38 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH edk2-platforms V3 06/18] Hisilicon/HiKey: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Mon, 20 May 2019 15:07:17 +0800 Message-Id: <20190520070729.30812-7-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336076; bh=gyQeSt0JyN4mMG5J/QtvXsGBP+VqdjcQLGMLSoYs/vA=; h=Date:From:Reply-To:Subject:To; b=ORC5zVKHN9zlT5ZanMYlRkZNuWOUxsC5E9vSWbjI9Y17ydzdQoiFxSMBrLX+1FPr8X/ S+ZpCX7mqwQAlqE0HUJLL2I/NSiGAE/aSRQOX8bBudrypfxPz/OIvgfJw80mLpIroXot+ eVWVtO7IetnmmcuHA4WOOgfk5+5JcV40xGs= 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. Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm --- Platform/Hisilicon/HiKey/HiKey.dsc | 26 ++++++++++---------------- Platform/Hisilicon/HiKey/HiKey.fdf | 10 +--------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/Platform/Hisilicon/HiKey/HiKey.dsc b/Platform/Hisilicon/HiKey/= HiKey.dsc index 44f21700dd..c785af6e69 100644 --- a/Platform/Hisilicon/HiKey/HiKey.dsc +++ b/Platform/Hisilicon/HiKey/HiKey.dsc @@ -22,6 +22,15 @@ =20 DEFINE CONFIG_NO_DEBUGLIB =3D TRUE =20 + # + # Network definition + # + 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 + DEFINE NETWORK_VLAN_ENABLE =3D FALSE !include Silicon/Hisilicon/Hisilicon.dsc.inc =20 [LibraryClasses.common] @@ -47,12 +56,6 @@ # USB Requirements UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf =20 - # Network Libraries - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - # VariableRuntimeDxe Requirements SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchroniza= tionLib.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib= Null.inf @@ -239,16 +242,7 @@ # # UEFI Network Stack # - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf - NetworkPkg/TcpDxe/TcpDxe.inf - +!include NetworkPkg/Network.dsc.inc # # AX88772 Ethernet Driver # diff --git a/Platform/Hisilicon/HiKey/HiKey.fdf b/Platform/Hisilicon/HiKey/= HiKey.fdf index 3d85f01eca..2b2e3ad053 100644 --- a/Platform/Hisilicon/HiKey/HiKey.fdf +++ b/Platform/Hisilicon/HiKey/HiKey.fdf @@ -153,15 +153,7 @@ READ_LOCK_STATUS =3D TRUE # # UEFI Network Stack # - 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 +!include NetworkPkg/Network.fdf.inc =20 # # AX88772 Ethernet Driver for Apple Ethernet Adapter --=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 (#41005): https://edk2.groups.io/g/devel/message/41005 Mute This Topic: https://groups.io/mt/31682817/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- From nobody Thu May 2 12:46:24 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+41006+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+41006+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336077; cv=none; d=zoho.com; s=zohoarc; b=Q9lpSYDslFynBmbz3SWS9sUrYzLG/M9FZbG+kyAeUz+Ken7DQqzTAMcl9J196CeTrvqr8xHLhHaHyu3HqeKJkQLUTIZHi70bTV7q6A7MIAWxBC1pQQ0Pqi1EhM+i43JHQWdv8/0blFLZxJgbnX4XsWd8+4elErf3jOfSn5lLpq0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336077; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=244G2ubnRFONvO2lrovaHP2167xvEWpYgGJRUsa8lQI=; b=A2mcIw68+gNBNNEU7Zt6QI552YIl3a8Sf9gpmhyUWVB+fFXD70yLTLui0rN8LDHI5zqa+dyPjeaI9EtbKy6uC+5cuQ8roI7JisPfCzLqaI43w2mFIz1GbPyETBqzzEiKLKyjaqjILgMu116ZXGs+DncL4D7M6a5s/9mvBE+s1fo= 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+41006+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 1558336077480428.275769800259; Mon, 20 May 2019 00:07:57 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Mon, 20 May 2019 00:07:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:39 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:39 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH edk2-platforms V3 07/18] Hisilicon/HiKey960: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Mon, 20 May 2019 15:07:18 +0800 Message-Id: <20190520070729.30812-8-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336076; bh=5LrhqV1lSUumSIY/VFogVQK7oXjhQFY2aFqWqCXLvoY=; h=Date:From:Reply-To:Subject:To; b=umBhH8Memq1YFyCVd1kBrbf7rIjmzFnnfnXfkrgalLjlyEsJwHwBDh3CvIc5LaNo9Ie u9ZNNnnqynogah1NfTBPp/dyZDLSjM14L2eiIn3Ydi9whZnp2ZJPirEvpXQjgikk/It9e vKrQ8IOUsdk4FUjPmfC5zzM+syj/quHnuTk= 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. Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm --- Platform/Hisilicon/HiKey960/HiKey960.dsc | 25 ++++++++++-------------- Platform/Hisilicon/HiKey960/HiKey960.fdf | 11 +---------- 2 files changed, 11 insertions(+), 25 deletions(-) diff --git a/Platform/Hisilicon/HiKey960/HiKey960.dsc b/Platform/Hisilicon/= HiKey960/HiKey960.dsc index db6e5b918d..151c6312f8 100644 --- a/Platform/Hisilicon/HiKey960/HiKey960.dsc +++ b/Platform/Hisilicon/HiKey960/HiKey960.dsc @@ -22,6 +22,15 @@ =20 DEFINE CONFIG_NO_DEBUGLIB =3D TRUE =20 + # + # Network definition + # + 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 + DEFINE NETWORK_VLAN_ENABLE =3D FALSE !include Silicon/Hisilicon/Hisilicon.dsc.inc =20 [LibraryClasses.common] @@ -48,11 +57,6 @@ =20 # Network Libraries UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - # VariableRuntimeDxe Requirements SynchronizationLib|MdePkg/Library/BaseSynchronizationLib/BaseSynchroniza= tionLib.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLib= Null.inf @@ -223,16 +227,7 @@ # # UEFI Network Stack # - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf - MdeModulePkg/Universal/Network/Mtftp4Dxe/Mtftp4Dxe.inf - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf - NetworkPkg/TcpDxe/TcpDxe.inf - +!include NetworkPkg/Network.dsc.inc # # FAT filesystem + GPT/MBR partitioning # diff --git a/Platform/Hisilicon/HiKey960/HiKey960.fdf b/Platform/Hisilicon/= HiKey960/HiKey960.fdf index 01ae18499f..dcb3105d6e 100644 --- a/Platform/Hisilicon/HiKey960/HiKey960.fdf +++ b/Platform/Hisilicon/HiKey960/HiKey960.fdf @@ -147,16 +147,7 @@ READ_LOCK_STATUS =3D TRUE # # UEFI Network Stack # - 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 - +!include NetworkPkg/Network.fdf.inc # # FAT filesystem + GPT/MBR partitioning # --=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 (#41006): https://edk2.groups.io/g/devel/message/41006 Mute This Topic: https://groups.io/mt/31682818/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- From nobody Thu May 2 12:46:24 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+41007+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+41007+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336078; cv=none; d=zoho.com; s=zohoarc; b=biKRmjWCWO3b3YTAFevtVGHV1tht2YmWv3QWPoQefXgP8uSF6hf9v5leSmQLuTZcXeyvN/D+fgAbEnx1Kzi0RdVjrQNVao0UuqGewPt5uqbw3ZGX/6O/BBnexTvzmycwvFkc6+avEh6uw0xERqCVX4jzCLZhyXpEG+Hnch1gX0c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336078; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=O1iOvyp1DGNwjAhV11KbvEjW/LSPy1Au4BANpzeALA4=; b=J+SxUsxpepKLwzL6uMXigtHTAmwu/nWV4fM83TXjMAKk76cTRqcmOxGy9IUXKHCRCH2Y+VT+5JoXBIkHsxzYMqsEcwaeii2wmcHerMzjMbsguo9Bosa9IWtvS4kDDNgG5rcMM8URunLOn+BLDOg8iOC7RM0ncJAcIZomROKkngw= 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+41007+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 1558336078761842.885531975321; Mon, 20 May 2019 00:07:58 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:40 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:40 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH edk2-platforms V3 08/18] Platform/CelloBoard: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Mon, 20 May 2019 15:07:19 +0800 Message-Id: <20190520070729.30812-9-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336077; bh=Ga3ujWnF9L8e1FH+ZaDaNVjrU9Jc78BXJO/Xf2Pfj5Q=; h=Date:From:Reply-To:Subject:To; b=jgXOqFNHMb0y9zrTZn0DuQLfOmDYZ7lPlhUneNKlieudb4PJQO0EnIwGQ3HIGvzNoWw //wr6XC7EpWUpKAeX9Ic64G3Mjx2UhT5qmdHn54+djACYs6W/rY4WTEgPaZoi3IhYUA6n PpprxuXdTWrPUMKBaP326h4zYuvxwPp7otQ= 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. Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm --- Platform/LeMaker/CelloBoard/CelloBoard.dsc | 28 +++++++--------------- Platform/LeMaker/CelloBoard/CelloBoard.fdf | 15 +----------- 2 files changed, 9 insertions(+), 34 deletions(-) diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.dsc b/Platform/LeMaker/= CelloBoard/CelloBoard.dsc index 525276a2b0..67830506ab 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.dsc +++ b/Platform/LeMaker/CelloBoard/CelloBoard.dsc @@ -23,6 +23,13 @@ DEFINE NUM_CORES =3D 4 SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/LeMaker/CelloBoard/CelloBoar= d.fdf =20 + # + # Network definition + # + DEFINE NETWORK_IP6_ENABLE =3D FALSE + DEFINE NETWORK_TLS_ENABLE =3D FALSE + DEFINE NETWORK_HTTP_BOOT_ENABLE =3D FALSE + ##########################################################################= ###### # # Library Class section - list of all Library Classes needed by this Platf= orm. @@ -69,13 +76,6 @@ DEFINE NUM_CORES =3D 4 =20 BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf =20 - # Networking Requirements - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - # ARM Architectural Libraries CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMainte= nanceLib.inf DefaultExceptionHandlerLib|ArmPkg/Library/DefaultExceptionHandlerLib/Def= aultExceptionHandlerLib.inf @@ -574,19 +574,7 @@ DEFINE NUM_CORES =3D 4 # # Networking stack # - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf -# MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.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 =20 # # Core Info diff --git a/Platform/LeMaker/CelloBoard/CelloBoard.fdf b/Platform/LeMaker/= CelloBoard/CelloBoard.fdf index a2098989a0..80c760464f 100644 --- a/Platform/LeMaker/CelloBoard/CelloBoard.fdf +++ b/Platform/LeMaker/CelloBoard/CelloBoard.fdf @@ -172,20 +172,7 @@ READ_LOCK_STATUS =3D TRUE # # Networking stack # - INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf - 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/Ip4ConfigDxe/Ip4ConfigDxe.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 - +!include NetworkPkg/Network.fdf.inc # # Core Info # --=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 (#41007): https://edk2.groups.io/g/devel/message/41007 Mute This Topic: https://groups.io/mt/31682819/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- From nobody Thu May 2 12:46:24 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+41008+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+41008+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336078; cv=none; d=zoho.com; s=zohoarc; b=RiAqzLf/y6G/35CStwrqoHw5IDUXZD9pmIIyk6nRiCecuVVDebagSbmoXr5RYRlf//Nm2dITft56NzlDM57Dt8y8msWENKE5e1DBPRAmviTMbgSjYxTw6r7Q2zAq/SKzkVlInaCkM2TG5NTvWV3IUI15Oh6U+0hI3WP5ZAkthxA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336078; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=/4oxzPlI+jq22HZWYFlijLu+MYzVk9iVjrdgSnDcIf0=; b=GV4VkqilHygKe/gOc+xVxMwKPgJh2lDuBdseEZop6d/khIHPZHyacowZ3TQI5J8kEiviqKlSOTtYEYtDBbon1zw2OXes12yssjmVe44kEjfboi46o1G4WKeX812u1CKWsbUZiN4mXfKMYUvKWsr5oJG5MH+egQEnUQZutt6Rguo= 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+41008+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 1558336078134685.4540912509751; Mon, 20 May 2019 00:07:58 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:41 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:41 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH edk2-platforms V3 09/18] Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Mon, 20 May 2019 15:07:20 +0800 Message-Id: <20190520070729.30812-10-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336076; bh=kNDoYtCwQBoKByFxHJjloZVhqg6ZvFIIVpoDFXYmSc4=; h=Date:From:Reply-To:Subject:To; b=CAUniuDvcHOcO+RcZ2SolDa3VlymIU2EY82EmkGskukYteASABNYxGLi99ekI3/EAXT GxfE4FmGL2l4v/5RbbIp20oZ9iMSFKbtv+cn5p9coMOFhxmT9GBdJ7cdeIR8261xvRL0Y SSJ4bOSG7bt7kUMGGybE8OhVx7a0UfUKkc0= 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. Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm --- .../Socionext/DeveloperBox/DeveloperBox.dsc | 29 +++++-------------- .../Socionext/DeveloperBox/DeveloperBox.fdf | 24 ++------------- 2 files changed, 9 insertions(+), 44 deletions(-) diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc b/Platform/So= cionext/DeveloperBox/DeveloperBox.dsc index 428e5d6459..e100700f6e 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBox.dsc +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.dsc @@ -22,6 +22,11 @@ FLASH_DEFINITION =3D Platform/Socionext/DeveloperBox/Devel= operBox.fdf BUILD_NUMBER =3D 1 =20 + # + # Network definition + # + DEFINE NETWORK_TLS_ENABLE =3D FALSE + DEFINE DEBUG_ON_UART1 =3D FALSE DEFINE SECURE_BOOT_ENABLE =3D FALSE DEFINE X64EMU_ENABLE =3D FALSE @@ -404,28 +409,8 @@ # # Networking stack # - 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/SnpDxe/SnpDxe.inf - MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.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/UefiPxeBcDxe/UefiPxeBcDxe.inf - NetworkPkg/IScsiDxe/IScsiDxe.inf - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpBootDxe/HttpBootDxe.inf - NetworkPkg/TlsDxe/TlsDxe.inf - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf +!include NetworkPkg/Network.dsc.inc + Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf { DmaLib|EmbeddedPkg/Library/CoherentDmaLib/CoherentDmaLib.inf diff --git a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf b/Platform/So= cionext/DeveloperBox/DeveloperBox.fdf index b322fead62..da9290fd92 100644 --- a/Platform/Socionext/DeveloperBox/DeveloperBox.fdf +++ b/Platform/Socionext/DeveloperBox/DeveloperBox.fdf @@ -209,28 +209,8 @@ READ_LOCK_STATUS =3D TRUE # # Networking stack # - 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/SnpDxe/SnpDxe.inf - INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.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/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF NetworkPkg/IScsiDxe/IScsiDxe.inf - INF NetworkPkg/DnsDxe/DnsDxe.inf - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - INF NetworkPkg/HttpDxe/HttpDxe.inf - INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf - INF NetworkPkg/TlsDxe/TlsDxe.inf - INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf +!include NetworkPkg/Network.fdf.inc + INF Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf =20 # --=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 (#41008): https://edk2.groups.io/g/devel/message/41008 Mute This Topic: https://groups.io/mt/31682820/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- From nobody Thu May 2 12:46:24 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+41009+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+41009+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336077; cv=none; d=zoho.com; s=zohoarc; b=HyuiRkQGQPWummUwpHhA2rQz7Lk45cxyacxkY8moONrwb8lgb8icfAZyK8cF5pa1IDUyaAU6VmEZUf0l6tXraIcYuMQStQ7ffOxiOloHMFP0CW2KQRJ1FvOomolckWOudLs/yGGnQJa/kMIdm4CO+v5mXH9PgPqCbiHlruWri+E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336077; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=wCr8T5u3KPFkNjVrXbDEov2zbeZroK1qyHBNTs3KWwY=; b=AwcEei7ZVLKLw/9SU8V03/TdhGzuraxRrbW0JlcrUR3zaBRQedp29TqAtAKdLI5Su8waJrhluIyo0c7OXOlG2c8nt3RamZDxTbk8VREDTfukFDOUfb/vKjgriCWKnxTHJK6p747j4sPhQ/nh+FpYpxksPQuGBzkfy7GTRB/MPdk= 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+41009+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 1558336077813888.0270402104351; Mon, 20 May 2019 00:07:57 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:42 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:42 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Leif Lindholm Subject: [edk2-devel] [PATCH edk2-platforms V3 10/18] Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Mon, 20 May 2019 15:07:21 +0800 Message-Id: <20190520070729.30812-11-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336076; bh=yfsaidybY0RIZ+7ukh401kMe4Kh6qNi+gXodcdQy4VQ=; h=Cc:Date:From:Reply-To:Subject:To; b=KsUVYWCtjfMlqpJuOtoGW9jr6tOb5Ca1g71EYccsNegJcxaFcp2jdoSy1XF1B+HEGPm iS3lHTm0FIxovfvf3PS/XHjhl+YluDf59QKoxHeRTrB7aViXltmQZizWPWN/H8UoTjcGI ROmf55RyKVc+RtJ+P4160SAzXFbX21Lmqlg= 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. v2: Change Network.dsc.inc to Network.fdf.inc in SynQuacerEvalBoard.fdf. Cc: Leif Lindholm Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm --- .../SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 35 +++++-------------- .../SynQuacerEvalBoard/SynQuacerEvalBoard.fdf | 21 ++--------- 2 files changed, 10 insertions(+), 46 deletions(-) diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc b= /Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc index 189baa8659..ab1ab6f2de 100644 --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc @@ -22,6 +22,12 @@ FLASH_DEFINITION =3D Platform/Socionext/SynQuacerEvalBoard= /SynQuacerEvalBoard.fdf BUILD_NUMBER =3D 1 =20 + # + # Network definition + # + DEFINE NETWORK_SNP_ENABLE =3D FALSE + DEFINE NETWORK_TLS_ENABLE =3D FALSE + [BuildOptions] RELEASE_*_*_CC_FLAGS =3D -DMDEPKG_NDEBUG -U_FORTIFY_SOURCE -D_FORTIFY_S= OURCE=3D0 =20 @@ -49,11 +55,6 @@ =20 BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf =20 - # Networking Requirements - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf =20 # ARM Architectural Libraries CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMainte= nanceLib.inf @@ -113,9 +114,6 @@ SerialPortLib|ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortL= ib.inf PL011UartLib|ArmPlatformPkg/Library/PL011UartLib/PL011UartLib.inf =20 - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf - NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf =20 @@ -594,25 +592,8 @@ # # Networking stack # - 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/Ip6Dxe/Ip6Dxe.inf - NetworkPkg/TcpDxe/TcpDxe.inf - NetworkPkg/Udp6Dxe/Udp6Dxe.inf - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf - NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf - NetworkPkg/IScsiDxe/IScsiDxe.inf - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpBootDxe/HttpBootDxe.inf +!include NetworkPkg/Network.dsc.inc + Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf { DmaLib|EmbeddedPkg/Library/CoherentDmaLib/CoherentDmaLib.inf diff --git a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf b= /Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf index 1c9795df3b..b1e0a53e61 100644 --- a/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf +++ b/Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.fdf @@ -186,25 +186,8 @@ READ_LOCK_STATUS =3D TRUE # # Networking stack # - 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/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/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF NetworkPkg/IScsiDxe/IScsiDxe.inf - INF NetworkPkg/DnsDxe/DnsDxe.inf - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - INF NetworkPkg/HttpDxe/HttpDxe.inf - INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf +!include NetworkPkg/Network.fdf.inc + INF Silicon/Socionext/SynQuacer/Drivers/Net/NetsecDxe/NetsecDxe.inf =20 # --=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 (#41009): https://edk2.groups.io/g/devel/message/41009 Mute This Topic: https://groups.io/mt/31682821/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- From nobody Thu May 2 12:46:24 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+41010+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+41010+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336077; cv=none; d=zoho.com; s=zohoarc; b=VJVyrbxKjd9lk+9vA/qIC/1Ou9V0sSN2s/pzutxasat/GoBK6FjHi9gHHOcZg0C3eg2u4HTJQzM9gqFOwNAltZRApnL5JgDSHjKgpDiXT2kaWUd8u7P112rilC2VnuwuAIeUmMOD+o69ZPevP5sBd3tPq0So0a6xvmcPT6pUt5I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336077; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=5l72dNv1qF3p0IZRJnPUG4hiIDdBNB2Cw7zYlgOArws=; b=L2/PMCHU2SJHzoc393Y6dFKpiL4qXAofybyS036kzojqx5+T306VPsJeuITVywPqYD705N3WEOCXhVv45q4BK0xv+vRUhC1PEKQYwQ8avC2JNA+DZDWowHAg7ClpFJKCBLKmvCqWcUrY7+OcEljO7LKwixYVmOsxCysV11NOjiM= 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+41010+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 1558336077980347.26180981845266; Mon, 20 May 2019 00:07:57 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:43 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:43 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH edk2-platforms V3 11/18] Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Mon, 20 May 2019 15:07:22 +0800 Message-Id: <20190520070729.30812-12-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336077; bh=bCVAIT3a2z8YwMhfu32XJkvgv3QfhdcIvMFgl+coNgo=; h=Date:From:Reply-To:Subject:To; b=EyiwQ5vPkl2yrIeEVfY2l7O576/+5IrrtmqUOVkeIq8LmR0LGpH6mVI5Mkt5xHv5Xjh LR9gckCyBduJlk85ah2HdMLCW2cARyjv60UtL5OZVSEFjdHfnsFo3IZotONMZCvcTGimQ C71tBDpbxeYC++3xEO2SgUGR/nP2TuhKR5w= 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. Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm --- .../Overdrive1000Board/Overdrive1000Board.dsc | 27 +++++++------------ .../Overdrive1000Board/Overdrive1000Board.fdf | 16 +---------- 2 files changed, 10 insertions(+), 33 deletions(-) diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc b/= Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc index d74ad479af..f9b73edeb3 100644 --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc @@ -23,6 +23,14 @@ DEFINE NUM_CORES =3D 4 SKUID_IDENTIFIER =3D DEFAULT FLASH_DEFINITION =3D Platform/SoftIron/Overdrive1000Board/= Overdrive1000Board.fdf =20 + # + # Network definition + # + 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 + ##########################################################################= ###### # # Library Class section - list of all Library Classes needed by this Platf= orm. @@ -69,11 +77,6 @@ DEFINE NUM_CORES =3D 4 =20 BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf =20 - # Networking Requirements - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf =20 # ARM Architectural Libraries CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMainte= nanceLib.inf @@ -566,23 +569,11 @@ DEFINE NUM_CORES =3D 4 # # Networking stack # - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.inf - MdeModulePkg/Universal/Network/ArpDxe/ArpDxe.inf - MdeModulePkg/Universal/Network/Dhcp4Dxe/Dhcp4Dxe.inf -# MdeModulePkg/Universal/Network/Ip4ConfigDxe/Ip4ConfigDxe.inf - MdeModulePkg/Universal/Network/Ip4Dxe/Ip4Dxe.inf +!include NetworkPkg/Network.dsc.inc MdeModulePkg/Universal/Network/MnpDxe/MnpDxe.inf { gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x21 } - 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 -## Bug https://bugs.linaro.org/show_bug.cgi?id=3D2239 -# NetworkPkg/IScsiDxe/IScsiDxe.inf =20 # # Core Info diff --git a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf b/= Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf index 6581138a6c..6a9226476b 100644 --- a/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf +++ b/Platform/SoftIron/Overdrive1000Board/Overdrive1000Board.fdf @@ -179,21 +179,7 @@ READ_LOCK_STATUS =3D TRUE # # Networking stack # - INF MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf - 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/Ip4ConfigDxe/Ip4ConfigDxe.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 -## Bug https://bugs.linaro.org/show_bug.cgi?id=3D2239 -# INF NetworkPkg/IScsiDxe/IScsiDxe.inf - +!include NetworkPkg/Network.fdf.inc # # Core Info # --=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 (#41010): https://edk2.groups.io/g/devel/message/41010 Mute This Topic: https://groups.io/mt/31682822/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- From nobody Thu May 2 12:46:24 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+41013+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+41013+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336079; cv=none; d=zoho.com; s=zohoarc; b=AN+1XMOUPjeiygudqXNGe0GguPsV9IjPqfVBOmQtmh6U73330WOfnhSS+ezOcpjF48vuOoeH2N5rz69HHb3Z5wiSN0rZuKjyaAOFyu7W7DkGCZZdsgP/K8yXOOaBUxHTe84sV+Ynwc99EWHbaGFhFWJDaiOdOoYDHHjXwdFuZUI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336079; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=IV5C11DOWkTHf75KwcWdEtC6KMm9g/UEAX+sh6S/+Jc=; b=QHMuazV+gvevOcxVrKMw/yl1631HC9M5IAHeoS26UDhfG3zAoXvLL6ub+J3x7r9qkC+mXsC3NqT9mapq76XhR7dHDqsqotVTn+VcisxbPnPglEWpCYTl11j15LZbA7WPuIf6g8PLHnI1Lb/nTMThbUZPauKobzg/l4uRey8srxM= 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+41013+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 1558336079097580.2996115206283; Mon, 20 May 2019 00:07:59 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:45 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:44 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Leif Lindholm Subject: [edk2-devel] [PATCH edk2-platforms V3 12/18] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Mon, 20 May 2019 15:07:23 +0800 Message-Id: <20190520070729.30812-13-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336078; bh=V+ZsNB4ZbfaT4Fr4FJAjjZV+rPh2kYSzx+N8K7FAuGg=; h=Cc:Date:From:Reply-To:Subject:To; b=vnsFBB/XFE2+JlCpElWEGVh8bvPLJP4L4DRoM1a2QukxAK9qRMaX/Ry2Y0/Tvao1YDr HUqyeEJv+s23EHgmsDAG3TeEJj/plEU+6kUYm1Tzc0bIIoYAQAyMGqqvYhFyR+7eyQwYV Su+9hWwMBDDhUHu6eygOQSoUgJINER9llqs= 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. v2:Remove the definitions from Armada7k8k.dsc.inc to Armada70x0Db.dsc, Armada80x0Db.dsc and Armada80x0McBin.dsc. Cc: Leif Lindholm Signed-off-by: Shenglei Zhang --- Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc | 8 ++++++++ Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 8 ++++++++ .../Armada80x0McBin/Armada80x0McBin.dsc | 8 ++++++++ Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc | 18 +----------------- Silicon/Marvell/Armada7k8k/Armada7k8k.fdf | 12 +----------- 5 files changed, 26 insertions(+), 28 deletions(-) diff --git a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc b/Platform/Marv= ell/Armada70x0Db/Armada70x0Db.dsc index 01532b4a00..8ee84902ef 100644 --- a/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc +++ b/Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc @@ -46,6 +46,14 @@ FLASH_DEFINITION =3D Silicon/Marvell/Armada7k8k/Armada7k8k= .fdf BOARD_DXE_FV_COMPONENTS =3D Platform/Marvell/Armada70x0Db/Armada7= 0x0Db.fdf.inc =20 + # + # Network definition + # + 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 + !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc =20 [LibraryClasses.common] diff --git a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc b/Platform/Marv= ell/Armada80x0Db/Armada80x0Db.dsc index c6510bbbbd..5418ddcaa7 100644 --- a/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc +++ b/Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc @@ -46,6 +46,14 @@ FLASH_DEFINITION =3D Silicon/Marvell/Armada7k8k/Armada7k8k= .fdf BOARD_DXE_FV_COMPONENTS =3D Platform/Marvell/Armada80x0Db/Armada8= 0x0Db.fdf.inc =20 + # + # Network definition + # + 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 + !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc =20 [LibraryClasses.common] diff --git a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc b/Platfo= rm/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc index d08013612f..ff9bd5dc8c 100644 --- a/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc +++ b/Platform/SolidRun/Armada80x0McBin/Armada80x0McBin.dsc @@ -47,6 +47,14 @@ BOARD_DXE_FV_COMPONENTS =3D Platform/SolidRun/Armada80x0McBin/Arm= ada80x0McBin.fdf.inc CAPSULE_ENABLE =3D TRUE =20 + # + # Network definition + # + 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 + !include Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc =20 [LibraryClasses.common] diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc b/Silicon/Marvel= l/Armada7k8k/Armada7k8k.dsc.inc index 0cf5d8447a..cfbc172b4f 100644 --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.dsc.inc @@ -115,12 +115,6 @@ RealTimeClockLib|Silicon/Marvell/Armada7k8k/Library/RealTimeClockLib/Rea= lTimeClockLib.inf ResetSystemLib|ArmPkg/Library/ArmSmcPsciResetSystemLib/ArmSmcPsciResetSy= stemLib.inf =20 - # Network support - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - # These libraries are used by the dynamic EFI Shell commands ShellLib|ShellPkg/Library/UefiShellLib/UefiShellLib.inf FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf @@ -471,17 +465,7 @@ Silicon/Marvell/Armada7k8k/Drivers/Armada7k8kRngDxe/Armada7k8kRngDxe.inf =20 # Network support - MdeModulePkg/Universal/Network/SnpDxe/SnpDxe.inf - MdeModulePkg/Universal/Network/DpcDxe/DpcDxe.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/UefiPxeBcDxe/UefiPxeBcDxe.inf - NetworkPkg/TcpDxe/TcpDxe.inf +!include NetworkPkg/Network.dsc.inc Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.inf diff --git a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf b/Silicon/Marvell/Ar= mada7k8k/Armada7k8k.fdf index d2bbdedcfa..6face86577 100644 --- a/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf +++ b/Silicon/Marvell/Armada7k8k/Armada7k8k.fdf @@ -129,17 +129,7 @@ FvNameGuid =3D 5eda4200-2c5f-43cb-9da3-0baf74b= 1b30c INF MdeModulePkg/Universal/Variable/RuntimeDxe/VariableRuntimeDxe.inf =20 # Network support - 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/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/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF NetworkPkg/TcpDxe/TcpDxe.inf +!include NetworkPkg/Network.fdf.inc INF Silicon/Marvell/Drivers/Net/MvMdioDxe/MvMdioDxe.inf INF Silicon/Marvell/Drivers/Net/MvPhyDxe/MvPhyDxe.inf INF Silicon/Marvell/Drivers/Net/Pp2Dxe/Pp2Dxe.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 (#41013): https://edk2.groups.io/g/devel/message/41013 Mute This Topic: https://groups.io/mt/31682826/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- From nobody Thu May 2 12:46:24 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+41011+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+41011+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336078; cv=none; d=zoho.com; s=zohoarc; b=DPRMeRx95yZfRK8GagVUtbhv/yZWJ41NvYfIcM2SiDAHUrlolLs5n8DrpNrK0Av6odAzEf8GEwAKq+uzthZvFzhUXyT2WSNKaCY3nhGj6v2g2ogPi/aqR70ju83i5hrpvIaQGd8kI3Tt2Mzi00tEtFA7holsSH34C9vXzZYUZXA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336078; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=tF0TEiLYK0C2lS3knmljpz0zwdbYb3ciE64VUDDHvKQ=; b=eE5WYuV3V1v2vNdfz3LLIhUeG2qsj5z67ueJ9qlJ7mAsMMnDqLMb3PNbst6Daf1XoXQj4VfgI+f3KVlF5E5dg9QOdtsz1EnSFBlhVKWxY0UtLRhCA2EjZ1pIorFJXt7RJwhz5w77Hr+nvvJ/TCcpEIcuiT68HBNoSaraexmVQbo= 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+41011+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 1558336078393146.6433583687268; Mon, 20 May 2019 00:07:58 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:46 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:45 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH edk2-platforms V3 13/18] Platform/SgiPkg: Update FDF to use NetworkPkg FDF Date: Mon, 20 May 2019 15:07:24 +0800 Message-Id: <20190520070729.30812-14-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336077; bh=EbVVUeffCO/lji17aDgrJODuLmh6B1M+vJHeP9jIbhM=; h=Date:From:Reply-To:Subject:To; b=SmAe6rb4xZq8DiaEtrDNpIyvO9mMkA2YrNPiDYp4tClROJTP20QBHg9BSuxDphx13Ct GUhW8FHx+ueFo/AHPcPgftkKfjutAEEpI8THFGpHPB2dOflMxeeOWdrRJ0eqzgB1qvbg/ GYLu1YzoYi56NPItT2LSi2WZtFVl2i9z4Wk= 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 FDF files to use the include fragment files provided by NetworkPkg. Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm --- Platform/ARM/SgiPkg/SgiPlatform.fdf | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf b/Platform/ARM/SgiPkg/SgiP= latform.fdf index 527bbd825d..44e571a184 100644 --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf @@ -183,17 +183,7 @@ READ_LOCK_STATUS =3D TRUE # # Networking stack # - 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 +!include NetworkPkg/Network.fdf.inc =20 !ifdef EDK2_ENABLE_SMSC_91X INF EmbeddedPkg/Drivers/Lan91xDxe/Lan91xDxe.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 (#41011): https://edk2.groups.io/g/devel/message/41011 Mute This Topic: https://groups.io/mt/31682823/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- From nobody Thu May 2 12:46:24 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+41012+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+41012+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336078; cv=none; d=zoho.com; s=zohoarc; b=cmp5RfkRtuQgLUA5KDsfHnbjw0wIdZD/Wk511ySKuczmnmr+csazxYv2xj7YCmuVjiopaeCc8D15m9NFd3zAONyzKqwtFsuSJ4zK0d5zgXiQ+e7G8FSeWtznSBlAY7R8RLJmTvzteQ2aQsd32XTq6UWHGMKU6PfAYA0pbRHIXp8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336078; h=Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=L82WAOtps75HLxRZTEjz3Xf04s4r1HJABsm1D5NdeUo=; b=VvqCx430QaIBE/WUhzn7LcbnEOWs5s6tehVlLVLemT/nY4Wr09lwgzz1lBF8qyZvA3NFkYH1jbC8XQgVErmtPqnuDAfHkcMH3ea+0RRtq1I7Gf1SiMIts4YK/sOrdmnsTX/2JK8cd2iMDDuN6sVt4I8BEu5CnU4wBHtWxrYmzmA= 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+41012+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 1558336078733462.6540139080307; Mon, 20 May 2019 00:07:58 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:47 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:47 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Subject: [edk2-devel] [PATCH edk2-platforms V3 14/18] Platform/RDKQemu: Update DSC to use NetworkPkg DSC. Date: Mon, 20 May 2019 15:07:25 +0800 Message-Id: <20190520070729.30812-15-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336077; bh=+k+xRoTlKZhRmltr7cz8xAdISFMuUKTanfQLauYDD1k=; h=Date:From:Reply-To:Subject:To; b=QbsKfj9PVEWPWUu4qbc94OB3eCgd0OQcm9SDM+GP4LAf1kYl8PGl209tnh2dTmUjvcT lXBOugZ3jMgE160PcL+IvAe9PgUnu7PRA6nEEpbcZtKwx7a1FCIVP8V1zDnhbtoq5rF45 a0dmdN8xgbMYMyGXkAaLQy3MXitaBczDZe0= 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 files to use the include fragment files provided by NetworkPkg. Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm --- Platform/Comcast/RDKQemu/RDKQemu.dsc | 34 ++++++++-------------------- 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/Platform/Comcast/RDKQemu/RDKQemu.dsc b/Platform/Comcast/RDKQem= u/RDKQemu.dsc index 75b835ce60..64b6699ae7 100644 --- a/Platform/Comcast/RDKQemu/RDKQemu.dsc +++ b/Platform/Comcast/RDKQemu/RDKQemu.dsc @@ -28,7 +28,14 @@ # -D FLAG=3DVALUE # DEFINE SECURE_BOOT_ENABLE =3D TRUE - DEFINE HTTP_BOOT_ENABLE =3D TRUE + + # + # Network definition + # + DEFINE NETWORK_SNP_ENABLE =3D FALSE + DEFINE NETWORK_TLS_ENABLE =3D FALSE + DEFINE NETWORK_IP6_ENABLE =3D FALSE + DEFINE NETWORK_HTTP_BOOT_ENABLE =3D TRUE =20 !include ArmVirtPkg/ArmVirt.dsc.inc =20 @@ -339,29 +346,8 @@ # # Networking stack # - 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 -!if $(NETWORK_IP6_ENABLE) =3D=3D TRUE - NetworkPkg/Ip6Dxe/Ip6Dxe.inf - NetworkPkg/Udp6Dxe/Udp6Dxe.inf - NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf - NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf -!endif -!if $(HTTP_BOOT_ENABLE) =3D=3D TRUE - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpBootDxe/HttpBootDxe.inf -!endif +!include NetworkPkg/Network.dsc.inc + # # SCSI Bus and Disk Driver # --=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 (#41012): https://edk2.groups.io/g/devel/message/41012 Mute This Topic: https://groups.io/mt/31682824/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- From nobody Thu May 2 12:46:24 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+41015+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+41015+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336079; cv=none; d=zoho.com; s=zohoarc; b=lXHgCHWwgXBYTTXCq0cbMYtKbIXmCrAn9Ga4m6hwkEdTowVpVVBDAaNNCKcILDP8SEaHCZzMbAhwu2YcjLVo0dOm9QU3hx1LgCdz45RP95nJmuy1vi3p+DfcPviyKJS0pAW+jENHmqI/RYoMJDXGMYaVD43/X0oh9FBUM57XoIM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336079; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=oyM/R/G91km4bRKvZxcIF3n4nHMgO0z7jLLgnxfH13U=; b=S9QLGrwmZY/eP3UqFmMumFxMxTR5dVNIJ7q5NmxZkohhzOmYK9Jphr6gOV8r/YsJunfV+OLRf+txcRzUKUWBDoXVTOYCmNkZ2ch+n0G/RMsUUMyAlw6u/Ce+ynJxr8RTMBAwccQMP5Ugqx3X1sRrNU73xnPqWfUneX4wadULOGY= 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+41015+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 1558336079170392.11741730443384; Mon, 20 May 2019 00:07:59 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by groups.io with SMTP; Mon, 20 May 2019 00:07:57 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:49 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:48 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Zailiang Sun , Yi Qian Subject: [edk2-devel] [PATCH edk2-platforms V3 15/18] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg DSC/FDF. Date: Mon, 20 May 2019 15:07:26 +0800 Message-Id: <20190520070729.30812-16-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336078; bh=Gx+pVq7yQVw+KDiQZqXftkWydS+dtqBo8xojIM2M3+w=; h=Cc:Date:From:Reply-To:Subject:To; b=qK5mmcBUJnPv2sno6/jfwsGE8qzLr5f5JexJVxYg2QkSO6uF9C7cKA51xQRgoGAo/nr CKiJvJjG9HJ35i//xsA4dInq4HMoHUiuWV8Gnv+BEpLplbU9tFQTzjYslPFA41i6tc8IV yswfUoD+HnkKEth2vv30Gxi5CYFRPe8ssYo= 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. Cc: Zailiang Sun Cc: Yi Qian Signed-off-by: Shenglei Zhang Reviewed-by: Zailiang Sun --- .../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(-) diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf b/Platform/In= tel/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-51F89DAF56B= A { # # 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)/Rtk= UndiDxe.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/Platf= orm/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-51F89DAF56B= A { # # 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)/Rtk= UndiDxe.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/Platf= orm/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)$(TAR= GET)/IA32/fTPMInitPeim.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/Platfor= m/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)$(TAR= GET)/IA32/fTPMInitPeim.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)$(TAR= GET)/IA32/fTPMInitPeim.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 --=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 (#41015): https://edk2.groups.io/g/devel/message/41015 Mute This Topic: https://groups.io/mt/31682828/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- From nobody Thu May 2 12:46:24 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+41014+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+41014+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336079; cv=none; d=zoho.com; s=zohoarc; b=JHzwSTDJF/rK5UhedpFrUsQzBJlW7TWX631kXJctm8Fh0WlCRogNyGBA5NJ5fkFKqJ8R/Mw1vq6Mi6nkFJAlqgQU2hF56zK2KE6t3Ma7Jbf8BXjAHECRJxonBh0PHltRTESri+uTGoRbmZzDmvnyX4l3RU7WHV1YxdbEOQkTkOM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336079; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=gTLHOPmtI4huxPGlYCliUBhDh6yNlNL8EYiKjnLBcyw=; b=HlLvLuj+/OoH8ZsJyEyF8RDK5rkbRLPccV6MTB5yGXNaMy3YqEHsZJed2tMbNUlUCZW8FKje1Og+4l1mDKZ82oqDzStq/5/03x4MOx9IzcCnFkw87oPioYkNL1+4qJoClwH6A/IHafik80RssaQ9CcYcVqFkaUfIwoOfJHq7xkY= 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+41014+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 155833607913429.70272161602088; Mon, 20 May 2019 00:07:59 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:50 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:49 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Michael A Kubacki , Jiewen Yao , Shifei A Lu , Xiaohu Zhou Subject: [edk2-devel] [PATCH edk2-platforms V3 16/18] Platform/PurleyOpenBoardPkg: Update DSC to use NetworkPkg DSC Date: Mon, 20 May 2019 15:07:27 +0800 Message-Id: <20190520070729.30812-17-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-1-shenglei.zhang@intel.com> MIME-Version: 1.0 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558336078; bh=21fKKnss8BCKVfv2N9nuFE3hjdxTSqj1ds8eLeBFjA8=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=uMIbqAxXLa/8EX520mVDvcNPE4CF57Sko1T4PIRrr3gdsjZ8kAqYUBOWu71BePRMsjl ZmNsDc2UfCjE9Jna+Mlep/MQGEhGtkok8w0urNDM2gabaeDhMPY8rejViiAl4O+BEvC7a YuV0wj6UA3y5DejQKVPr4ZC8IRyAWQxAEQY= X-ZohoMail-DKIM: pass (identity @groups.io) This patch updates the platform DSC files to use the include fragment files provided by NetworkPkg. And add network related definition in Purley PlatformPkg.dsc. v3=EF=BC=9A Add "!include NetworkPkg/NetworkDefines.dsc.inc" in PlatformPkg= .dsc Cc: Michael A Kubacki Cc: Jiewen Yao Cc: Shifei A Lu Cc: Xiaohu Zhou Signed-off-by: Shenglei Zhang Reviewed-by: Michael Kubacki --- .../PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.d= sc b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc index de1a3965d7..a82d18a028 100644 --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/PlatformPkg.dsc @@ -30,6 +30,13 @@ 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 +!include NetworkPkg/NetworkDefines.dsc.inc + # # Set the global variables # --=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 (#41014): https://edk2.groups.io/g/devel/message/41014 Mute This Topic: https://groups.io/mt/31682827/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- From nobody Thu May 2 12:46:24 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+41016+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+41016+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336079; cv=none; d=zoho.com; s=zohoarc; b=UChhaLKbstl09tkpggSHv3HaSDh3e/6HoJCI9P5y7kCdvhtMrMlPFNXnbdMZCkFzHjwwzk0uDVgLDgB5j2alnG1k6Vxyr7Zuixe1s9KTKn++dslKTII0RdB7gwtxSvgHgwzvU86Vlz4wEji2KsB/XSnaNW4q3peBsFyDL7EUdvc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336079; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=8ZwWSaMgPc23IFva16mSyR640FhIQmAGCMRfpUM38xk=; b=H92I5Xks6KTVz6XgeXtyL/bciERGWnkaUZhFB7rmB1bb+IOshHGryTbfw36Dy1hmO8c7zgwZkch6faEIMuFnyIwp2e/xjD/a4VQy8AtZ5vwGqsDm6BqCb7zlZaVOVU6Pxiez2Y26QVZlh4cQN0APj5PdkFpyUeemMQx4p7zJTlA= 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+41016+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 1558336079517271.62043582254296; Mon, 20 May 2019 00:07:59 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:57 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:52 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:51 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Michael A Kubacki , Jiewen Yao , Shifei A Lu , Xiaohu Zhou Subject: [edk2-devel] [PATCH edk2-platforms V3 17/18] Platform/MinPlatformPkg: Update DSC to use NetworkPkg DSC. Date: Mon, 20 May 2019 15:07:28 +0800 Message-Id: <20190520070729.30812-18-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336078; bh=LeSqnCe9IKAwcQiRx20Ak+3+ecKJ3/4mD0DYTajtULM=; h=Cc:Date:From:Reply-To:Subject:To; b=FO3lzpMEcKKvf0WxcC6voF75OC1h1uZrZjfhvoVnN0U8/WFcb0yLJOvcX5tCCnGhEnd EAZ8HU1vyx7WTKzRhPb2FT2dJxHRnnMulEZZpQ0megt0ynZSQD9bsPAsaV1f2p4NXeIg8 bmV71TzNraEz7f0TtNg946feCqSHVB9QaK4= 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 DSC file to use the include fragment files provided by NetworkPkg. And add network related definition in CoreCommonLib.dsc. Cc: Michael A Kubacki Cc: Jiewen Yao Cc: Shifei A Lu Cc: Xiaohu Zhou Signed-off-by: Shenglei Zhang Reviewed-by: Liming Gao Reviewed-by: Michael Kubacki --- .../MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc b/= Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc index efe02c99f3..23ab53dbfe 100644 --- a/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc +++ b/Platform/Intel/MinPlatformPkg/Include/Dsc/CoreCommonLib.dsc @@ -72,11 +72,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 + OemHookStatusCodeLib|MdeModulePkg/Library/OemHookStatusCodeLibNull/OemHo= okStatusCodeLibNull.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf =20 --=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 (#41016): https://edk2.groups.io/g/devel/message/41016 Mute This Topic: https://groups.io/mt/31682829/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- From nobody Thu May 2 12:46:24 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+41017+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+41017+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558336079; cv=none; d=zoho.com; s=zohoarc; b=BVgn9pWl1ZL8w9JuXDauu1o4L3OdqYtyBRUxmxwoKLjGuLF1H7quq2oje79zl962WgX5lirbxutk0mzFc623BiN3ay0yEnj+ZX/pyx1YPsEqXbL3Ee2oS2nix+6CN5FCJ/d9s3gT16PGyAb7HoH7EPNoXaYWC/bARVrQRKQVdLs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558336079; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=1tMCZsmySSndv5WxBWP49VSAGLA4GuVKE0PqfYAzsfs=; b=BabJyUVBDXJwLPYG7ZQFnW2ruzIBmcICA/wVz8zvgTr7iaYWIeuHd862bIEze2072Rx55SBmO/hTf8/PPtTh1X/oBPnIbdV1fTDQxelq5JL7f8g3c/W6mS5Pj1QjxZ5tAbX0KC78kIAlKHmJvdGPKITXQtex9g1rho9W1m7D5t4= 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+41017+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 1558336079240821.0420126019708; Mon, 20 May 2019 00:07:59 -0700 (PDT) Return-Path: X-Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:57 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:54 -0700 X-ExtLoop1: 1 X-Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:53 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Cc: Michael A Kubacki , Jiewen Yao , Shifei A Lu , Xiaohu Zhou Subject: [edk2-devel] [PATCH edk2-platforms V3 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Mon, 20 May 2019 15:07:29 +0800 Message-Id: <20190520070729.30812-19-shenglei.zhang@intel.com> In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-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=1558336078; bh=X8FG1RmbZadKyvAvcgD+bIaHQd+5tQAHPtkFEiLzVRg=; h=Cc:Date:From:Reply-To:Subject:To; b=O1dnBOhlYuPfRKzJvDLq+Z/65AUzNF4AJCG8vKRiDiKP1X6uUq9ersAhLbDuiMHspYX WcKr8RP9Gc40Rdl8siJaLk6ApDE/SXwE+0fJbNZ4IMAaK3ceAaSaHfeF/uX5EZchKYSY1 BWoGuAEdryYsjiKt1LCHhdRAeCrRPmX4iB0= 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. And add network related definition in CoreAdvancedDxeInclude.dsc/fdf. Cc: Michael A Kubacki Cc: Jiewen Yao Cc: Shifei A Lu Cc: Xiaohu Zhou Signed-off-by: Shenglei Zhang Reviewed-by: Liming Gao Reviewed-by: Michael Kubacki Reviewed-by: Xiaohu Zhou --- .../Include/Dsc/CoreAdvancedDxeInclude.dsc | 26 +------------------ .../Include/Fdf/CoreAdvancedLateInclude.fdf | 26 +------------------ 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeI= nclude.dsc b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeI= nclude.dsc index b9bb33eb7e..fceaadc100 100644 --- a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.= dsc +++ b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.= dsc @@ -11,31 +11,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/CoreAdvancedLate= Include.fdf b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLat= eInclude.fdf index 66bf64f2c3..d980e673a8 100644 --- a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude= .fdf +++ b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude= .fdf @@ -11,31 +11,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 --=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 (#41017): https://edk2.groups.io/g/devel/message/41017 Mute This Topic: https://groups.io/mt/31682830/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-