On Wed, May 15, 2019 at 04:56:47PM +0800, Zhang, Shenglei wrote:
> This patch updates the platform DSC/FDF files to use the include fragment
> files provided by NetworkPkg.
>
> Signed-off-by: Shenglei Zhang <shenglei.zhang@intel.com>
This looks to me like it translates the existing configuration
accurately.
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
> ---
> .../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/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
> index b647f65ad1..887b8dd72d 100644
> --- a/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
> +++ b/Platform/ARM/VExpressPkg/ArmVExpress-networking.fdf.inc
> @@ -14,17 +14,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
>
> !if $(INCLUDE_TFTP_COMMAND) == TRUE
> #
> diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
> index e7a77c0ad9..7e10f62ca1 100644
> --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
> +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc
> @@ -15,6 +15,14 @@
> SECURE_BOOT_ENABLE = FALSE
> INCLUDE_TFTP_COMMAND = TRUE
>
> + #
> + # Network definition
> + #
> + DEFINE NETWORK_SNP_ENABLE = FALSE
> + DEFINE NETWORK_IP6_ENABLE = FALSE
> + DEFINE NETWORK_TLS_ENABLE = FALSE
> + DEFINE NETWORK_HTTP_BOOT_ENABLE = FALSE
> +
> [BuildOptions.common.EDKII.DXE_CORE,BuildOptions.common.EDKII.DXE_DRIVER,BuildOptions.common.EDKII.UEFI_DRIVER,BuildOptions.common.EDKII.UEFI_APPLICATION]
> GCC:*_*_*_DLINK_FLAGS = -z common-page-size=0x1000
>
> @@ -60,12 +68,6 @@
>
> BaseMemoryLib|MdePkg/Library/BaseMemoryLibOptDxe/BaseMemoryLibOptDxe.inf
>
> - # 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
>
> # ARM Architectural Libraries
> CacheMaintenanceLib|ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.inf
> @@ -415,17 +417,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
> --
> 2.18.0.windows.1
>
>
>
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#40816): https://edk2.groups.io/g/devel/message/40816
Mute This Topic: https://groups.io/mt/31627853/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-