From nobody Sat Apr 27 10:48:14 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+41130+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+41130+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445798; cv=none; d=zoho.com; s=zohoarc; b=kMdoCuE6EGuIwZl7ctwj31mpCjA9tnP+k6M9pflqqSKbeauOLIAals3sKtMEGJ6hekfNBZJyEiHQ3PlH73TIiLiQpADwY2whuxicy2BcNrQB69LjBeqMWwHfbHHq79Epbunn7QhS8cNcM169bjUN3DJiTMPoCjdQeMvf77Yrl8M= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445798; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=uneWa/ImMZgdzqPKE8XuGKyx5zErJtOfkXSZfmhJ+8g=; b=MqzZ/eESahLYgb4JYGUd9N19vded0mlbMIIhTkKq3RwoEk3tFWAAEux0wplQn8XlpUL5jMbT4BFlZfgPUequ/7kO6tLRsso6fmcNTwi0DUrUjaEvBp2jSxO6uddmi9Vd0f5Qlu7It0GpM+dkh90Ua3KAB9cXUJt2ORAuP0notVo= 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+41130+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 1558445798870493.1263995474111; Tue, 21 May 2019 06:36:38 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:38 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:37 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:37 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang Subject: [edk2-devel] [Patch edk2-platform V4 01/18] Platform/OverdriveBoard: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Tue, 21 May 2019 21:36:06 +0800 Message-Id: <20190521133623.20404-2-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445798; bh=IXIioqPfPDNauqxHWEW94FqbLTDmjJMDUFq6ZQRlqZQ=; h=Cc:Date:From:Reply-To:Subject:To; b=knzglEh2e24xYykwSiToMuFcf9sUyqz7ef/eAmJpeKdKktKXOdfu2pREty++kFdTmUK odP3M7VHQAuOMiiWbeFGfEyYy1f4LjOnhvZqGrvADetwxQS1ce0bE+X+Vnk7LdSnnltT8 qp9QgFw4Ywvl8MtaNFhyW1/aErnUEB0n8xo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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/AMD/OverdriveBoard/OverdriveBoard.dsc | 31 +---------------------= --------- Platform/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.13.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 (#41130): https://edk2.groups.io/g/devel/message/41130 Mute This Topic: https://groups.io/mt/31696678/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 Sat Apr 27 10:48:14 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+41131+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+41131+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445799; cv=none; d=zoho.com; s=zohoarc; b=hNBEkjtztgb439Eeep+aO083tp+3dOPKU1Glxwfkz0JKOnzl7TU5tfvhUc5uzE3qiTNZWyL7C79qxJkoB8hnnTzGLLo7x1LLzJsBfDkxSppcWkCwxiYojYYlsIV1YO4sdv2X1PYE78+rUpICC/zUMCVjydTwv8iYexmWwpPEKto= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445799; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=9YG5rLGYwCmgIj4GySRgmXryfWGx0RwZiJ4rih9IOjo=; b=MxTVcg1tAIs2kWVuiO/9rdE6i/SOaeVQh7uiS1E4J12a9dT2d4K9G9cJreKRCB/YUjNJYU+TJOfNQskBPKvsTO9FPEhmj2KkTru6ODZjUhaptyxHfc1SeKDC7dM0E8Lineq+qyYOBjpOSWnXVn/dp0wNAOjOU+u5rnD9JOBupg8= 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+41131+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 1558445799654798.1103565368475; Tue, 21 May 2019 06:36:39 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:38 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:38 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:38 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang Subject: [edk2-devel] [Patch edk2-platform V4 02/18] Platform/VExpressPkg: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Tue, 21 May 2019 21:36:07 +0800 Message-Id: <20190521133623.20404-3-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445799; bh=1OeAu1BKopJsnIC17MReY2xqen05x+2A/ghN1bhZGok=; h=Cc:Date:From:Reply-To:Subject:To; b=xRkUXkCoZyEly63RcxHTUAWPHAOKYp9A78H8sGBbiWd4EHDJ7Uq08i2Uop6LkgNaIQC E12nAZln6oadQHAL+JMAKPEnGHFMLfhdGPCikact+nMlB5uDMwKs3Ny5iN4OZDyH6OEin Af5lZlgleAqYz5Da/smYTR/8dt3kpIMLs7E= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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/ARM/VExpressPkg/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.13.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 (#41131): https://edk2.groups.io/g/devel/message/41131 Mute This Topic: https://groups.io/mt/31696679/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 Sat Apr 27 10:48:14 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+41132+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+41132+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445800; cv=none; d=zoho.com; s=zohoarc; b=JCl23lcA3WVM2PkMD2B8uktY0p5th4kQ+WpqJ5q2eZi9MJTsf3m9NPDF/isfhx1qn0DVHpuIM/KRH2S7l2sICCjAmMoL528cduBzdb01BoJeAwd/Zp0PQ2qUJh1YdEB2on44KTBH8gA31aPG97FMvznC8kpebuyCyZY3qKUezcc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445800; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=S5eqvkQGu0xX/O0PXeMiGwtXcKV8s4UsqdsZIfnM6JE=; b=BOtgddRMN9Hg1sS9/GiyC5EPJCrm+jFwzoVTTeHDVQK0msLlC7KGy9lhZ6sC5rejzCQWvHgNC3qsRHXvLbIYyTYIR3oGrh50zSARkxO4YOWcd/MciEytFFdCTLmKJm0plDz/rMrr4v8BSgyYSkDae0BFLzpByH2yjPsW6Oz/Tqo= 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+41132+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 155844580048785.65526762756576; Tue, 21 May 2019 06:36:40 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:39 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:39 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:38 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang Subject: [edk2-devel] [Patch edk2-platform V4 03/18] Hisilicon/D03: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Tue, 21 May 2019 21:36:08 +0800 Message-Id: <20190521133623.20404-4-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445800; bh=q+rmr6/xLRYo22DhK5Zw+roboJLgbfewyoTiWkh+QM8=; h=Cc:Date:From:Reply-To:Subject:To; b=K5aoNEVGbTm5i/Oo8cMfJ9wjJYgp07uEPuP92ATSUyhWNaHZVidrr2jp63AKUfSWRfu Z83wF1n8mwAmaqBGL0rs4dGJsbwo7gAVjzPPz26hF/czqOFwmgeX2OsFsmbp173Ptkzrr iVtDPlc0uj45CH667bfwdCdWndP64XTFdqI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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.13.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 (#41132): https://edk2.groups.io/g/devel/message/41132 Mute This Topic: https://groups.io/mt/31696680/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 Sat Apr 27 10:48:14 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+41133+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+41133+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445801; cv=none; d=zoho.com; s=zohoarc; b=R915EtzztClH7HN5on2kfpBI1P8FsRiw2cxuf33fj5mXd/oOZQD7kLRrii3TJ/TVzI4eNNj0iIt7SepH5oV75zy4+CzqmsZaFkG/cbnCR2nVczMxfECQDPK8EkL5RjCjERvuNj82y6p8DDCQTuUUgZNdvzSsejHR93HMbrPxb1E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445801; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=AWWr46s677OCRqY5S1LflmAY5FHtxgipw9xDseiDG1M=; b=cfxxRx5HmS05lxqhj7AmabZacPX+V1A1AGiYF8U+zEE2e/35n5k2NVA9SawxZJjMFeBsixZ2RnUQ9KVLypKEAkauhe00afi5CxmBl/g48iYgXXg24n6cIiyr6gh+yhDnf/gF2F7kjRvh76yIGFfy154d+0QzDr3DCqrPJdNPdUY= 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+41133+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 1558445801812395.80905390917906; Tue, 21 May 2019 06:36:41 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:41 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:40 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:39 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang , Leif Lindholm Subject: [edk2-devel] [Patch edk2-platform V4 04/18] Hisilicon/D05: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Tue, 21 May 2019 21:36:09 +0800 Message-Id: <20190521133623.20404-5-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445801; bh=DdyZJ1jVB+5hEhnQJ1AcpeM+O/x/9RNYTn9QiZUpROk=; h=Cc:Date:From:Reply-To:Subject:To; b=uhRSGApQ5GzclK7US8l9EJH7O+/RAlQt61J3Mtv5FJNGybfp/5KlyboewXcAufezz3m MpenBJAqNT4zZcpKvv1t9byDG3fjZjl0fS7mQFECbQhyix6TDF7zmmNuhZBixbyB7UpFI cbpMbk37ewBDfTsjDSEkjGW2w+9UKh0oNAw= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang This patch updates the platform DSC/FDF files to use the include fragment files provided by NetworkPkg. Cc: Leif Lindholm Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm --- Platform/Hisilicon/D05/D05.dsc | 45 ++++++++++----------------------------= ------- Platform/Hisilicon/D05/D05.fdf | 23 +---------------------- 2 files changed, 11 insertions(+), 57 deletions(-) diff --git a/Platform/Hisilicon/D05/D05.dsc b/Platform/Hisilicon/D05/D05.dsc index dc9e1407ba..3c04b7ee24 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 @@ -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 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.13.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 (#41133): https://edk2.groups.io/g/devel/message/41133 Mute This Topic: https://groups.io/mt/31696682/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 Sat Apr 27 10:48:14 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+41134+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+41134+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445802; cv=none; d=zoho.com; s=zohoarc; b=JUtD2nIx7x5IfkapPY2VPBDkVZToipM1c+H1+7IkiatmPqnUfuOpGSBKy2XJtVL4y8Ujz/7UiATE36Fd+xj+dRGqco9Hf8nRDWEecf0L/uWQ2bBXOW3Pj1ULSyTiCcfdcddJQOYqXg4GqHdUiOPIP/q5VhRBw6PpvqZCcJg5b9s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445802; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=33o/46MIioKYABi8l4/C3K+HgYSvAv61IHJ6IOE5lUk=; b=FCn3F7aFf7yp9zGb7El7c9WLCCJeZWrH+c9TAxy0ecYQCO0U+405qwccrxVuuQ088W5KG9Yqgv7jq9yVK+FaxNJzJCISIdlkflkL6HRyUji6WCVE3zygH/gpGyJbAFFzTwB8PVW2rESDi1Zc7r9oIBoFbPgU+Ll060CT5uVPang= 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+41134+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 1558445802516400.3808135012148; Tue, 21 May 2019 06:36:42 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:42 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:41 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:41 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang Subject: [edk2-devel] [Patch edk2-platform V4 05/18] Hisilicon/D06: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Tue, 21 May 2019 21:36:10 +0800 Message-Id: <20190521133623.20404-6-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445802; bh=BFPujF3RxQIYCfLZlt+NUV8ddq7wBJiJl1phnYpVAQk=; h=Cc:Date:From:Reply-To:Subject:To; b=k7i0eZpPSrbzOLA71HWqbvO/dGWX7qmAINw3czRclk0QMNrDjnQKO1JWK1DobZjEle0 +YdufbA+iYyMz93oMaTqyRr2Op+fwQmbqU/5m/VmZ0sUt3On9R4724vx6IL5AlO/L37+R TA8MbLPSIBg9xqs1kg587Q+grHFZAAHRueo= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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.13.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 (#41134): https://edk2.groups.io/g/devel/message/41134 Mute This Topic: https://groups.io/mt/31696683/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 Sat Apr 27 10:48:14 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+41135+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+41135+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445803; cv=none; d=zoho.com; s=zohoarc; b=TViMYEZCwj/8oIHnICy0cbSykHNfNxPhbhctgKoTV1iVcK3uR+zTUj66aIg03Z4u/48tXxrk9W+KbElajU8qyGFIy5uD2EbHds6nf/elGhJZ3XQ/iuyIonpPYmKOjoNwfIpGQb4TuvjL9R2zFFo8Z/BLYPl5kvhiL3MdGLGYrD8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445803; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=IjSmXxsh6UsQ+0t4k7QOindIn+mFqCMRqYQYmWSXr4g=; b=bVr7au2fX4sLtTWI+uFzjCv6wQnZO544u511Slvfm/lAaNZXbjIhwfJCy/FQW+78Wy7+t3V7aP0akQHQk6yZkesA0iN7E3O7TYFXhBx7VV/jOPFi8dXQWxlYljtV5gMyD0jIj1RzG5cr2zNqUUaxj3echFm66kEarJe8hbKZoTY= 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+41135+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 1558445803578308.48441439272324; Tue, 21 May 2019 06:36:43 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:42 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:42 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:42 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang Subject: [edk2-devel] [Patch edk2-platform V4 06/18] Hisilicon/HiKey: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Tue, 21 May 2019 21:36:11 +0800 Message-Id: <20190521133623.20404-7-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445803; bh=WxJ3xUKpnI2zIB308gjE/oUmuNxyn1R4mb4K4BI7UFM=; h=Cc:Date:From:Reply-To:Subject:To; b=vR1KS7XaxGowthjtMyZN73Y7G/HX6HbMEkCtDezpDtp/ykTXyD/mn5y1n3WjQENVyhr RHnFyhditY9ma4q/ySm8LuOdA8LgnmVP+JQxID0PrA1MyrC/nin3J2iNsJs8LqFmT4PlY QVMip4LqlpPZc/nXEMNxhBQvMD1Md06K9C0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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.13.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 (#41135): https://edk2.groups.io/g/devel/message/41135 Mute This Topic: https://groups.io/mt/31696684/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 Sat Apr 27 10:48:14 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+41136+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+41136+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445804; cv=none; d=zoho.com; s=zohoarc; b=FGjVQsrchfqYSVymKPRmt11Sc5WPNMQOwH5uyeMaqQOTLvRWP5Hn7Vyankh4+Kzv5qQym+QRuBeZp1x+b2YGKBDP5TTSujyiIv8SPNdx+rzc+MCKSPxnN6g/sQx/9hkykCJWhq99SIQviya8RfoE02bSqrAlMPbIVGsMeNwsEz8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445804; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=SGzA1amhD1514MU8F0QpteuDRM74wHzMlquBM9ONBEE=; b=LvnMz6g9WRNLvPthiGMkeSQPvq/R/2+vaLsnuEjE5NOeZofTK86NvyBaHSqIQOc7Kwx3bYnFuSppMKDkJJaXanxXcJXfyjVdyxE0DXdsRhpbbJ17M338SVON5aIC7UfMvxX5ujY7IB0IVrqEM8iC2oaiclSlHkSrEWOCAZvJIuI= 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+41136+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 155844580426728.254612867357537; Tue, 21 May 2019 06:36:44 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:43 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:43 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:42 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang Subject: [edk2-devel] [Patch edk2-platform V4 07/18] Hisilicon/HiKey960: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Tue, 21 May 2019 21:36:12 +0800 Message-Id: <20190521133623.20404-8-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445804; bh=kaVic4bC4N4QEFe4hhu7g1lRN73ne9iQqVo2K9hv9xI=; h=Cc:Date:From:Reply-To:Subject:To; b=qMJXrWtCxmJHLan+PpuZ9OA8D4OO601kIC9GRpCzWU/Xgphz7NPcPgCptPGwCz3m6yQ velh2Dz/phr6djIsqVq3LQM7H90Wf41NzYxptSQAw2uMiNcKG1WmsQNHJpcXL5gB2hYfr ufK+7WbUpm9qwBQyeCt67MrfSWVNRiqTHE0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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.13.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 (#41136): https://edk2.groups.io/g/devel/message/41136 Mute This Topic: https://groups.io/mt/31696685/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 Sat Apr 27 10:48:14 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+41137+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+41137+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445805; cv=none; d=zoho.com; s=zohoarc; b=VOvVyh2MjbXym8tMj49L/Vtx5xDL+LtT7hcouayLa3Em9IyufP6GrwXxM8iWvTAbZY3yHAEGjPRns4ggRtc4VdOGbjHTUB4xcOs7iSwH4iRZOFJlnzAXx9KWQOCKhQpEWgy7tjZ3BhZ4pOmx3LUrLfb34Wdb53xGECj66w+hyok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445805; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=a8iMfZBKtwyNNHdhn9q/zi96R3FO2f27zhHhc9PJWcQ=; b=bu0KCsOKIrbGjk8dzCZGlthfcNgG/iJxW0I5lb2ioWbaK24A0lYfEEw/liE5YPK/WTAtauozTHnB3LDwcKf/ZP78oGtdgE/LCCg59OZE/wpm1y0ZI6CrRFQuK+EXIb+tErMupdefR1nwjqlzq5q0sRwEV8YB3o5tQ4xZxZjl1pU= 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+41137+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 1558445805094271.2214789271703; Tue, 21 May 2019 06:36:45 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:44 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:44 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:43 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang Subject: [edk2-devel] [Patch edk2-platform V4 08/18] Platform/CelloBoard: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Tue, 21 May 2019 21:36:13 +0800 Message-Id: <20190521133623.20404-9-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445804; bh=v59th6SxID7UiMswNyQhye/fn0jKsVo9PbKtZfAz7u0=; h=Cc:Date:From:Reply-To:Subject:To; b=ujev2YFT/p4DC62ETdesLNGDTC8WHfIq/Wnltg8VlzWnA526mAOqPol460iuSl2S4vi i0L1VDgAndl03UGgTqKpvXQ15Itej5EvPRar/YPVAWj1K47kXo7XdlvI6sqanCjEnqAwa wJMJXE1sqdtt4969bJIRJG7gTN2c38H2dEQ= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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.13.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 (#41137): https://edk2.groups.io/g/devel/message/41137 Mute This Topic: https://groups.io/mt/31696686/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 Sat Apr 27 10:48:14 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+41138+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+41138+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445806; cv=none; d=zoho.com; s=zohoarc; b=Uv0vwxaezPhJ+3lH0EoeGCoPN7SrOJwfKDlnG+F1EECW6s+0FglCONfp4QC7T2iFFhG6wi5ZMruDFZcYdPRMTtuuCS7qsi0Qc5LpqhxswDq5WQmwURg2mXKfOEUc8eHmx6V7zfDS8WgJYwxZma4oB2BPRMJyZgOO2lZmxnbhG9o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445806; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=8y1XLSafaWiaXDkQAeyu0PCimn8xTqFUVzxfA4A/ecI=; b=THSXeKadCLzfKr2UNo6mgBo7DjzAoKraCReTS5LGLfQcPf+fRxpqjixES1h4+mWstCirYD0Llv9eA6zOEaQ9jDaK9bcPJFKrM5xcLj3qwzA66bQ/SrUS0+rhK90wV9XdA6vbEH1e7GjtdyTBELmok3JAxguqv3H4bxoNWS4kqkI= 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+41138+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 1558445806120756.4501594979351; Tue, 21 May 2019 06:36:46 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:45 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:45 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:44 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang Subject: [edk2-devel] [Patch edk2-platform V4 09/18] Platform/DeveloperBox: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Tue, 21 May 2019 21:36:14 +0800 Message-Id: <20190521133623.20404-10-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445805; bh=ohC5/BgQuuA7rGGwKcOMN3jXRJuAXsS5qFA7F1SgVGU=; h=Cc:Date:From:Reply-To:Subject:To; b=FxASa7/yLOBfvHdRhMDYOE4YjWUen1c6Ufznxmeuse468ifWsrGoxmma1wCID++RkOt mGG8or5jfDRqqY18VwdLWNpv3rbN0Yy79/hzl9EXOADt69+1AnMitNQDmM+KVD/7OcrEL C09INnNvvFbdPpU7pxXApf5HTHmrfhw42ew= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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/Socionext/DeveloperBox/DeveloperBox.dsc | 29 +++++++-------------= --------- Platform/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.13.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 (#41138): https://edk2.groups.io/g/devel/message/41138 Mute This Topic: https://groups.io/mt/31696687/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 Sat Apr 27 10:48:14 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+41139+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+41139+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445807; cv=none; d=zoho.com; s=zohoarc; b=P5QPeu/fX5EsMX9mwHy9AA+ZmX1S9PzTIAEN0DehudjZViDKyjJnkuBlUPfZNJ4p5NReVPL7X2++uHPEItRwaR8sj0SaqG4qOY93+DR5uV5b4KpCfOYjkWG8YXwJkvgwRupdqy+IJS0iAs8Jo8m+wRPOz753KpnhOVdmBFOYFYU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445807; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=Mk8PIJ8H0nvItadfR/c4BYfqX+Z5uo+h1WZqV5WJapU=; b=ExYMxh7zQrC2PUpEaKGXas/B7VwDpEidSfmZHmYN8mPxEdAfkaj4xMNh2JsIS2mz1f1Z0FM/E7nuyX1LH/ZZVl6mEykJycytKnFlzXreMwlGTBK7zZbwRg4G09tZ3OYTbQxZCys/NRuQAXOSJDGhvGKzkQvuLmmAdreMv+TELBM= 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+41139+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 1558445807144529.1514844836189; Tue, 21 May 2019 06:36:47 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:46 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:46 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:45 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang , Leif Lindholm Subject: [edk2-devel] [Patch edk2-platform V4 10/18] Platform/SynQuacerEvalBoard: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Tue, 21 May 2019 21:36:15 +0800 Message-Id: <20190521133623.20404-11-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445806; bh=4Uwns414XMYSd0r6rxmAXXJDSutU2an/IMggsWOEKdY=; h=Cc:Date:From:Reply-To:Subject:To; b=dDzuKJAca7OejB7BYnEc96g3ZS7mh4VVJAu46Qp7K0jokcRsuEBDlI6l1WIGRGCx/Qs Wfct1GzHq7dCu28TmilNED8Z+0CfOnYwvUVdbw5+4YhYODPXZiDO+rnRe16WdaHJNGhBY 0+eS1ePx5YSUJMGpPF0YjRfm5vY99vCQ5xg= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang This patch updates the platform DSC/FDF files to use the include fragment files provided by NetworkPkg. Cc: Leif Lindholm Signed-off-by: Shenglei Zhang Reviewed-by: Leif Lindholm --- Platform/Socionext/SynQuacerEvalBoard/SynQuacerEvalBoard.dsc | 35 ++++++++= --------------------------- Platform/Socionext/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.13.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 (#41139): https://edk2.groups.io/g/devel/message/41139 Mute This Topic: https://groups.io/mt/31696688/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 Sat Apr 27 10:48:14 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+41140+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+41140+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445808; cv=none; d=zoho.com; s=zohoarc; b=AGvbdGYbk2b+CkBS4YCxeI0oX8Wv5n6585nTC28+Epe5k/+aZrmWiqzZsQTRDfXXhXnzBWu/n6CsGz+tm8p4mLc9h+jatv2KJjBOahJ0VNZvFpk0Hiksf7lxN7T/Kdd+EMG1PWBlHnop7GhttXJMjSldyfFwEsghvk/yMUp93uo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445808; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=/boThG+D+QKTacByGHBUOfwfN2m2oiVjpAMF33rALbc=; b=XUAORpOccmcVWdBUKFdRcB2Nz88fHwMien7QF0VRic+78seOx9xqkW5G29rTzRV9IoEgFknlumyNilT8EZ6T/91ZBomu1vW2s9ShGSoG/BaUq4AVWcERgCytiR6Qd0a8cIpbSls8g1cFe94ndcTdzdQXX1HI5Sja7yt8r2B5lus= 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+41140+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 1558445808011663.0054269906299; Tue, 21 May 2019 06:36:48 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:47 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:47 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:46 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang Subject: [edk2-devel] [Patch edk2-platform V4 11/18] Platform/Overdrive1000Board: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Tue, 21 May 2019 21:36:16 +0800 Message-Id: <20190521133623.20404-12-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445807; bh=5T7NA2I0dVsF0vMFlR4vNvL5D1xF1GYBsirHWOMKrcE=; h=Cc:Date:From:Reply-To:Subject:To; b=L+2+y0V0XkbY5jLX7eJUUwcaxYFlW5LOAiV2kkhru+ihtukOHleNLmryVf24aTjR+yd +phDWxx/PK+Qhj7o+vg2VQIyyjHesGb3FMFgpVWauHVkbhSOZg9z8YQV/rMfb5JSVJ5CL 5ckiioUMX12ME0WOBovtauaPE3MLRCdOf/M= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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/SoftIron/Overdrive1000Board/Overdrive1000Board.dsc | 27 +++++++++= ------------------ Platform/SoftIron/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.13.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 (#41140): https://edk2.groups.io/g/devel/message/41140 Mute This Topic: https://groups.io/mt/31696689/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 Sat Apr 27 10:48:14 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+41141+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+41141+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445809; cv=none; d=zoho.com; s=zohoarc; b=ISKLTU5SDJ3MUjtio1jPYRBlCmhcKdoA0Bnc6ex4DeHKAoxs78CFJ2B1wzC7fJ90+ciGd+sotKioW9yuEhAGEkK65eKfx4q3iZ/P2ZevIQnDWxcXvp1vTq+d3uWM+tN/Rcpgdt4hBKFhNYB/o4DuUEBs+LcQx4FPxG3LwQ9Tt7o= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445809; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=0H4BmenV449UhbaTfuTip7ElMqktc2lYZsVXd6DaN/U=; b=lIrsyaaRGGHFforgxjKQmgaoC96hR7P0QCSturadK4DLWCyBCzKefjpje3m1B6fGUVJljdaOyRmEm61nevPW4+eB32/SzDR3/mvi/ynuHH34REQVCMnPyBWObKqB5WzDfpy0CQL4c61slxfUJuKN+n/94MxsiG0u8XEA9XBtItw= 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+41141+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 1558445809118526.8843264974064; Tue, 21 May 2019 06:36:49 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:48 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:48 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:47 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang , Leif Lindholm Subject: [edk2-devel] [Patch edk2-platform V4 12/18] Silicon/Armada7k8k: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Tue, 21 May 2019 21:36:17 +0800 Message-Id: <20190521133623.20404-13-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445808; bh=QUqazLw3LlTBJisuYLU9W9im5Fzq+YDK2NwKq/2VdHQ=; h=Cc:Date:From:Reply-To:Subject:To; b=V7X46Mnuz4OmuyRH+myRwOTaTLHIAVosNqD/cZhFdBDc+OB7gaBbzhvSMJuSlf474sU K1GEuukL1RCnE8zKlHpKHVAUGxc3br6vtX6x+AwBdN4rcntemN8z3ntpQ6cGf2fHshwqt LrlxNimXrXp17UArGGRb07Q6apP9yzAwHe0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang This patch updates the platform DSC/FDF files to use the include fragment files provided by NetworkPkg. Cc: Leif Lindholm Signed-off-by: Shenglei Zhang --- Platform/Marvell/Armada70x0Db/Armada70x0Db.dsc | 8 ++++++++ Platform/Marvell/Armada80x0Db/Armada80x0Db.dsc | 8 ++++++++ Platform/SolidRun/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.13.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 (#41141): https://edk2.groups.io/g/devel/message/41141 Mute This Topic: https://groups.io/mt/31696690/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 Sat Apr 27 10:48:14 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+41142+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+41142+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445809; cv=none; d=zoho.com; s=zohoarc; b=mkeL5DpXyfNzATPI5a2MDIoiYdjm5+kGvg/uZgMfVAp+pJC5AIu3RdufTVYek36dGMjAMC0ZVyjV7XL2s0xIaRF0evo1eoJSJChD4dJkYe+ePeEhZuHfrtzY5AYjl0n65eqqVtYlSIGt7DDSVWy4F5Fa16qbbKFyE7ddb3PIgsM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445809; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=x8CXTuYPyEd+pL96mP8nRfZ8U8u/4M2fkntjYdHa9A0=; b=VW0Wtno/ifVDovgHBp1EwiqVEXbSs9iEV3eXxdDIfM3lvH9+tW9EgsnG6IYDRuTd1vK9lw0QsgJyQ2g1YSlx++iv+dbSpAqkRdwNxomU8oeIY4qyWt9WTCPPygBOz/t+yG/896Fo0xbNWGUMVkZ/AJ+YDyIwTqnAsznhmsba068= 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+41142+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 1558445809880929.2429672201164; Tue, 21 May 2019 06:36:49 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:49 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:49 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:48 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang Subject: [edk2-devel] [Patch edk2-platform V4 13/18] Platform/SgiPkg: Update FDF to use NetworkPkg FDF Date: Tue, 21 May 2019 21:36:18 +0800 Message-Id: <20190521133623.20404-14-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445809; bh=pTKcUpf4Jq8QgBqW9J4tvbg4FFnxAPlEFpLitVgfJW8=; h=Cc:Date:From:Reply-To:Subject:To; b=Qn59A3p3LYxRstZ5FFE8pUEd19nguOfcHdTKgHfO4medzthRi7gcqsz1MFgKjXvzzSV l4Vhs87LXUsZ5XZnUa87Ir/DbMd1yIV+4fBd8wqaK0XzP+q1CW94zLTqXjlujUeWYrIq3 XAYM7Wq6Cb+fno4YTLoc1QDefRV5P2PCqsk= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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.13.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 (#41142): https://edk2.groups.io/g/devel/message/41142 Mute This Topic: https://groups.io/mt/31696691/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 Sat Apr 27 10:48:14 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+41143+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+41143+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445810; cv=none; d=zoho.com; s=zohoarc; b=B0CKvGmt/Z+SqwdqLvcPPvMo5W1SjknZLvmTi61/jlgVE/UFhbA9avs27l87wbIEcgn1uF+SKu5GV5lBbGwVX3uvZ3oFjjnYxWvGnuxb4ETxz44UaRm1iIQG7Gvp1qw4HU8yxj7wmhpz+ieTz3hLDcGx1/hHIQQXN6mTh9aL8Y8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445810; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=To0WcMqy7mxgvJ/OxtpQk2XQInhQwbnuqB01mkG8mYs=; b=C+2J3IfGqrOl3SGlmK3tNyzK4sjaC5e0mD+5WNVM8pHZx3tfUajToxYzCuEh4Klz0OBvI0uWMwePXRfTw0kPD0zqsN+Uzivk5q0UR4iNCSagdUkgGkvmcWA2dHb/PnykHWthnsBspmoawx+Z19jkuxBkg1/TC2gdqOHwy9RmRJs= 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+41143+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 1558445810626985.6212218625157; Tue, 21 May 2019 06:36:50 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:49 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:49 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:49 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang Subject: [edk2-devel] [Patch edk2-platform V4 14/18] Platform/RDKQemu: Update DSC to use NetworkPkg DSC. Date: Tue, 21 May 2019 21:36:19 +0800 Message-Id: <20190521133623.20404-15-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445810; bh=Tgly0eT2i+JlURcq3I0EZX0auSnnMnqZ0xSJHSiObXM=; h=Cc:Date:From:Reply-To:Subject:To; b=GZ5M4pIFn0XaOlWMHTCuZ1XDjv2wZ2kqbmiv+Ba9p0hq70POiwQ2NtDXW941/VlY3tV zOg8Mcc4puVj452O4dUJpx4tAaMIwDGLg+q1KHZKZFGjT32sOAW2+KQqVHQ/hy34cUEYa PwSV7eXvKVRJd68/Gg86OGodtoOZcvW/CM0= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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.13.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 (#41143): https://edk2.groups.io/g/devel/message/41143 Mute This Topic: https://groups.io/mt/31696692/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 Sat Apr 27 10:48:14 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+41144+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+41144+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445812; cv=none; d=zoho.com; s=zohoarc; b=A43QdXOsAb1XyHm2CHV4BLdHvScLZwmsRY6jZ4Kkv2zvQvks7AKyaIyI1TooHjs2/3aCYvmsG+xGcDeyvU0/Pk6JqHcsop/Gh+gPU9XEeHvwGxR3wC2G+6SVsO6V3SdlOUb/nKOq4pusaSIS4Fr0mBSgpXivMszdGMjU8UpPnxg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445812; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=GgGdsBSIbt1l/8OVKdlGqsvZevtAmmydeDJ7jFoRnIk=; b=DKmW3TGWX6A2Y6ft98SO77GWOTIqFfhEYnc4/3080HiDW3PgyzlLywFAh8kYqMQeVn1cD0b66q+eigQwEwimBlLCUXCdvLKy4/C0GW7ThmDutxFY2A1txgtG9d1eb8bjYg4wXRhyd9pkLrj7c+BPQyKJpUZJPFfKy6T/QSswhqA= 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+41144+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 155844581204311.201038079836053; Tue, 21 May 2019 06:36:52 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:51 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:51 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:50 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang , Zailiang Sun , Yi Qian Subject: [edk2-devel] [Patch edk2-platform V4 15/18] Platform/Vlv2TbltDevicePkg: Update DSC/FDF to use NetworkPkg DSC/FDF. Date: Tue, 21 May 2019 21:36:20 +0800 Message-Id: <20190521133623.20404-16-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445811; bh=qSk6Ee9n1Q8uKF/MWmtrpnckU2dGBIJ1nSwW6l17YEE=; h=Cc:Date:From:Reply-To:Subject:To; b=TG0OMAvq4Wp0bS4jC/HwBqZc6v3sWmphkXzK+Pf6J4MnZFnR7n1TeCgLUN+b+PXBZQr 25jxHIvjSvbPCa2D+5hIBBSwpITibYevTj+e9fUuLFiJbZkUqIc7EY86PDOg/MbjUf16Y tqTocg9brnNfuQbwAP92c/f3NREsLguI2hc= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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 --- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkg.fdf | 24 ++------------= ---------- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgConfig.dsc | 6 ++++++ Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGcc.fdf | 24 ++------------= ---------- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgGccX64.dsc | 43 +++++++-------= ----------------------------- Platform/Intel/Vlv2TbltDevicePkg/PlatformPkgIA32.dsc | 39 +++++---------= ------------------------- Platform/Intel/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.13.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 (#41144): https://edk2.groups.io/g/devel/message/41144 Mute This Topic: https://groups.io/mt/31696694/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 Sat Apr 27 10:48:14 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+41145+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+41145+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445813; cv=none; d=zoho.com; s=zohoarc; b=eB7n/0CvFST9zvaiCs7VUxOqto9PDsHmnqZA8Y0NLJNkFSXRgFdeuWxtLtacOJniGy1lg/IlMUFmVmky7WSmhkPFQPyXzjxF1dAsz9oXhiNRROn7Qmc2k3c5Tc8lglD2JFGn4txIe9M/d6aw1wHlbU+QTQ2CJspMU+V9a2sj/hg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445813; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=Y+1WI1yHm64G+rv1aWyxuvhWrq1Aq7JxsRSCMFDTBNc=; b=YpTrGGvcrCa8dGqsQZbJIRGMUDlrc3Iyv/tF9/r2gz9TF4FWcPnHlI/eADMjLa/SLVcMctFk6JNBuVYAKa5HXBC1e9gPD2KVmurjVGaiZ9A117CldDRqqiIj1YEKS57DD3RFJtcKXyPR50DJiDLDjKGZI9iuIXFWJOYAflWCdPA= 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+41145+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 1558445813118635.2957972281077; Tue, 21 May 2019 06:36:53 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:52 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:52 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:51 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang , Michael A Kubacki , Jiewen Yao , Shifei A Lu , Xiaohu Zhou Subject: [edk2-devel] [Patch edk2-platform V4 16/18] Platform/PurleyOpenBoardPkg: Update DSC to use NetworkPkg DSC Date: Tue, 21 May 2019 21:36:21 +0800 Message-Id: <20190521133623.20404-17-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445812; bh=Q22VQxCVqhC8hk6Z3HFiMNgZI/+K3BSTWh+TfVO6RMM=; h=Cc:Date:From:Reply-To:Subject:To; b=g3czWbQ/JV0F21iLCK1l8Z39shJMDk1cn1CZS55Gg5IzDs8NkI1ZqIsokbT1mTod0JT lPYk1EBq0C1tLP7sTGEyZfIXTa3VaXbae4QT3RYVMI0anN/vIPDJU1DHMeJPuZqFGt4Uq mfs5SWocYBGpk/AdOT+J6KZ6LZh8Ywda2wY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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. Cc: Michael A Kubacki Cc: Jiewen Yao Cc: Shifei A Lu Cc: Xiaohu Zhou Signed-off-by: Shenglei Zhang Reviewed-by: Michael Kubacki --- Platform/Intel/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.13.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 (#41145): https://edk2.groups.io/g/devel/message/41145 Mute This Topic: https://groups.io/mt/31696695/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 Sat Apr 27 10:48:14 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+41146+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+41146+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445814; cv=none; d=zoho.com; s=zohoarc; b=TJG1QTyXoeTOIN7oUV42ZzwTa3Bc4yvhbk7wouN90jE2r9YdRTqPMdtntCQslvP49F7Yrd1cIRe1fNZrHX0aqEyoYWUG23GDRGJjAlwt2LVaUXSb1pr1hDz9frfQRLhOlcYlqGohKYJs4feMwDdUrnJKU4h1t2NP7C3Nmk2kfa0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445814; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=jpBxgpQmLCW5tbC/NBP6LXIIN0i74xGm2s3e8kc2OEU=; b=ZSgcHa4q7VaSJZx9VHrCS/Cjhu5iAkgadlS8oAbB4LEAEeE9LHzZFkydd6AyB62NTjc7N2xuhKmNP/3v1jEQBqMX8iGr85jKKj9bPPo8Gqhq8FEq0SDw0298KdIfaMhbOrH4jRKk9PwICg5+Xl+SAiMF8oVDlnCfGwKehNw/Z4w= 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+41146+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 1558445814766702.0429918311733; Tue, 21 May 2019 06:36:54 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:54 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:53 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:52 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang , Michael A Kubacki , Jiewen Yao , Shifei A Lu , Xiaohu Zhou Subject: [edk2-devel] [Patch edk2-platform V4 17/18] Platform/MinPlatformPkg: Update DSC to use NetworkPkg DSC. Date: Tue, 21 May 2019 21:36:22 +0800 Message-Id: <20190521133623.20404-18-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445814; bh=w32e8TvbYzSLAlhezF9uS6uyZz+4Jc2VMixI4gHIKmw=; h=Cc:Date:From:Reply-To:Subject:To; b=YOM+DWLURj1iBtHMANidMV3V73wrnAf1OG9Jt9VddVXT2zMhjA4eYr1gVZk8aF56cxl cpsBnZngN2Vq3ISdwfkdSpm6QM7mL9MoMJlTHu7Lx1D4kjJ9GcitffAzWw6ZeGjTMuh5x jvqtT78KA0TfZJQLlW0tqQfPUARRsMxXKj8= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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: Michael Kubacki Reviewed-by: Liming Gao --- Platform/Intel/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.13.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 (#41146): https://edk2.groups.io/g/devel/message/41146 Mute This Topic: https://groups.io/mt/31696696/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 Sat Apr 27 10:48:14 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+41147+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+41147+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1558445816; cv=none; d=zoho.com; s=zohoarc; b=njnw/8Vqg0Gid/fBMkisuDBZ7yKZVxtOKkS7yjhxbEfVK8V0lUR+3HA7KCkDCOqMKeEO+j140bKTvKOFOG0nadeL3VGAzGoKnUkkrr9fB+moqr/LZsP2fd33U6oi9xjDBzhx/WQe+ApQqF3jHKfktfe6vax23tzgH31RMuvmJHk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558445816; h=Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=98yz29nSg8gdhyOlquOT/XrnqFHvPbn9b9kQK0spjc0=; b=BYmxszA1khAns1HFH8BDzQQuJ1Nduiup+0oz27SwxoaoEdrUUh3GegnJMMiXXL+BEEnQuzApEgPJuLoTUbIy9aEUTtJlNr86Y9snM0v/9QYDSS3sgEb5Bn3dPYY8504LVZAJnuZeJUaGtKBQ9FWzWVnA/DhtWUbJU7JIrgmh+HU= 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+41147+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 1558445816185169.34808579459786; Tue, 21 May 2019 06:36:56 -0700 (PDT) Return-Path: X-Received: from mga17.intel.com (mga17.intel.com []) by groups.io with SMTP; Tue, 21 May 2019 06:36:55 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 May 2019 06:36:55 -0700 X-ExtLoop1: 1 X-Received: from lgao4-mobl1.ccr.corp.intel.com ([10.255.28.21]) by fmsmga008.fm.intel.com with ESMTP; 21 May 2019 06:36:54 -0700 From: "Liming Gao" To: devel@edk2.groups.io Cc: Shenglei Zhang , Michael A Kubacki , Jiewen Yao , Shifei A Lu , Xiaohu Zhou Subject: [edk2-devel] [Patch edk2-platform V4 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Tue, 21 May 2019 21:36:23 +0800 Message-Id: <20190521133623.20404-19-liming.gao@intel.com> In-Reply-To: <20190521133623.20404-1-liming.gao@intel.com> References: <20190521133623.20404-1-liming.gao@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,liming.gao@intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1558445815; bh=sfiVdOQ0yhIli3r2uJqS4bR4OfeR4pSkIJexlUm9OKY=; h=Cc:Date:From:Reply-To:Subject:To; b=LPshu2krTIpCv4Xi8UXD/4R7TEFozSEqdCB8jNEvhkPl/63tb23uicgrW3YIyZkyn9+ ZWiSz/762X3dsuGAbJ6ED5aNdhSGQUuhSZp1qB4H7tPRPQYWHbrI8w+6PMv74Wgrr9qDF h0UPmoP9AsS+HsufI+gcKVyPk9OjCeW2eis= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Shenglei Zhang 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: Michael Kubacki Reviewed-by: Liming Gao Reviewed-by: Xiaohu Zhou --- Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc = | 26 +------------------------- Platform/Intel/AdvancedFeaturePkg/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.13.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 (#41147): https://edk2.groups.io/g/devel/message/41147 Mute This Topic: https://groups.io/mt/31696697/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-