Reviewed-by: Xiaohu Zhou <bowen.z...@intel.com> -----Original Message----- From: Zhang, Shenglei Sent: Monday, May 20, 2019 3:07 PM To: devel@edk2.groups.io Cc: Kubacki, Michael A <michael.a.kuba...@intel.com>; Yao, Jiewen <jiewen....@intel.com>; Lu, Shifei A <shifei.a...@intel.com>; Zhou, Bowen <bowen.z...@intel.com> Subject: [PATCH edk2-platforms V3 18/18] Platform/AdvancedFeaturePkg: Update DSC/FDF to use NetworkPkg DSC/FDF
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 <michael.a.kuba...@intel.com> Cc: Jiewen Yao <jiewen....@intel.com> Cc: Shifei A Lu <shifei.a...@intel.com> Cc: Xiaohu Zhou <bowen.z...@intel.com> Signed-off-by: Shenglei Zhang <shenglei.zh...@intel.com> --- .../Include/Dsc/CoreAdvancedDxeInclude.dsc | 26 +------------------ .../Include/Fdf/CoreAdvancedLateInclude.fdf | 26 +------------------ 2 files changed, 2 insertions(+), 50 deletions(-) diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc index b9bb33eb7e..fceaadc100 100644 --- a/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclude.dsc +++ b/Platform/Intel/AdvancedFeaturePkg/Include/Dsc/CoreAdvancedDxeInclu +++ de.dsc @@ -11,31 +11,7 @@ # # UEFI network modules # -!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == 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 !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf diff --git a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf index 66bf64f2c3..d980e673a8 100644 --- a/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateInclude.fdf +++ b/Platform/Intel/AdvancedFeaturePkg/Include/Fdf/CoreAdvancedLateIncl +++ ude.fdf @@ -11,31 +11,7 @@ # # UEFI network modules # -!if gAdvancedFeaturePkgTokenSpaceGuid.PcdNetworkEnable == 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 !if gAdvancedFeaturePkgTokenSpaceGuid.PcdSmbiosEnable == TRUE INF MdeModulePkg/Universal/SmbiosDxe/SmbiosDxe.inf -- 2.18.0.windows.1 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#41114): https://edk2.groups.io/g/devel/message/41114 Mute This Topic: https://groups.io/mt/31682830/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
