From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=fail (domain: intel.com, ip: , mailfrom: shenglei.zhang@intel.com) Received: from mga12.intel.com (mga12.intel.com []) by groups.io with SMTP; Mon, 20 May 2019 00:07:56 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 20 May 2019 00:07:38 -0700 X-ExtLoop1: 1 Received: from shenglei-dev.ccr.corp.intel.com ([10.239.158.52]) by orsmga004.jf.intel.com with ESMTP; 20 May 2019 00:07:38 -0700 From: "Zhang, Shenglei" To: devel@edk2.groups.io Subject: [PATCH edk2-platforms V3 06/18] Hisilicon/HiKey: Update DSC/FDF to use NetworkPkg DSC/FDF Date: Mon, 20 May 2019 15:07:17 +0800 Message-Id: <20190520070729.30812-7-shenglei.zhang@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 In-Reply-To: <20190520070729.30812-1-shenglei.zhang@intel.com> References: <20190520070729.30812-1-shenglei.zhang@intel.com> 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 @@ DEFINE CONFIG_NO_DEBUGLIB = TRUE + # + # Network definition + # + DEFINE NETWORK_SNP_ENABLE = FALSE + DEFINE NETWORK_IP6_ENABLE = FALSE + DEFINE NETWORK_TLS_ENABLE = FALSE + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE + DEFINE NETWORK_ISCSI_ENABLE = FALSE + DEFINE NETWORK_VLAN_ENABLE = FALSE !include Silicon/Hisilicon/Hisilicon.dsc.inc [LibraryClasses.common] @@ -47,12 +56,6 @@ # USB Requirements UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf - # 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/BaseSynchronizationLib.inf AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.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 = 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 # # AX88772 Ethernet Driver for Apple Ethernet Adapter -- 2.18.0.windows.1