From patchwork Wed Sep 20 17:27:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 113160 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp925909edb; Wed, 20 Sep 2017 10:28:05 -0700 (PDT) X-Received: by 10.99.99.197 with SMTP id x188mr2945737pgb.49.1505928485662; Wed, 20 Sep 2017 10:28:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505928485; cv=none; d=google.com; s=arc-20160816; b=c3ljQaZZ4r6ri3/KnrsbtN3la04W13C3qx/+xg9ugfPrVXzQmXh0SFbC5SJK8RgYo2 F+qIhB+/slu4x9xrWukLZnfMGuvnmOhag3ahR+wteXK2e2l0R04sy8gCc/cwux2QzyjF wrGBk1oRXRi4eKCJRFsIr1ccNls4bog98ZoDdCI8kHXRRiqYVyY7Y+mOZKfvyzt5ddUk 1eCGdNWjYswGCR/E5vdORwqrIp032hGMMbbfklDpvIlREg+GadjvILAlq1/JhIma3sOF Zt9VuBa6SLIuPg4OfvndHWrbudH2NKi3dffnganUrqFHk3LY1RyRvzF6d7FoRZ0g7ETW Vs0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=MUrxX2WEVjGOhIdSCSZpNQhur+1/fFul8+Kh3kK/FME=; b=Ua4fIzF509HzcVnet+i/K/uSYx2dzio6KhFj9PElKfwN7GUS4hszDsPE+PxlWiMlJ1 xxBtwiBzEPUlOPWy6uYGWZN3p+uA5VrWYiEJwhjf0F1i7Frq5Pcn00+ZG13KOhWgvbwI mu34ilRX3cSWiwBFd3P4C2xCTZxKqHbGREik229fsF0BYuP5aWuUltP8UEatwzQz+MNC 3HIILo7EL47pbrrE7FzW++Q7HK6U4J8XwWnszuiHTuRy0u5TPLx+Ftki0LLkedgBlo5C gPY8Q+1xPqBdZ/xgDvDxJR8yqtQfGRylxR4ii1eAiATJMQfNUqUcD2BOk9KFZUiHunND eyBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=LTZCU3jQ; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [198.145.21.10]) by mx.google.com with ESMTPS id x5si1674152plv.552.2017.09.20.10.28.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 10:28:05 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=LTZCU3jQ; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 6F87C21D046B5; Wed, 20 Sep 2017 10:24:58 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wr0-x231.google.com (mail-wr0-x231.google.com [IPv6:2a00:1450:400c:c0c::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id CD4EB21ECCB23 for ; Wed, 20 Sep 2017 10:24:56 -0700 (PDT) Received: by mail-wr0-x231.google.com with SMTP id 108so2753626wra.5 for ; Wed, 20 Sep 2017 10:28:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Mux6i4Pwyo3PAANeaQwcEX2rs3Yn6LiJH4n3grJaYfU=; b=LTZCU3jQ5xs0fKKMEoI2/ws+ALPCj6Jrf8SyNSj348G9K9PCZt3g0wIh++bVfnEiob +ZOQqBLwxeoChRe0Nci/Lfx++kegLJ9n6qoYhIKj7hCue/Z7MZ8cZ+2bcJNDsaUoAXsn MsV6q7tpJkuapLwzqMEc9RuCcPA4fGFqAN4MU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Mux6i4Pwyo3PAANeaQwcEX2rs3Yn6LiJH4n3grJaYfU=; b=VGg+AmF6UY+iybHDif1qQhf4OSwbJjtz9EfDqJFWXEwXPoM8Lw8XRwjGWUjTboqfzd IhN1MpEEwd98pTGGkDbdNd6f2ceulI5WhtEA3WZS1fdXpkeCmgCmwO6xy9oQNVale6EM K2CcIp+uUIP+kX0jgnZHr1Qu8NI/DiVpCmGk/8g3z/pJVNpTLhUDDOgM/kab+pVyCoF0 w+lWpPXjwMic2P8PfJFoEaP+lKb6FSxeKEhEusYk5AZm6PcIs3NlNznqEpVcY1lpKL5x SePvQJk/LHoOyRX07YIqDbVOx7V2v0NYUk5wXN3hU6TUd5I+gBieu0DksQjMXnlpA2c3 cX+g== X-Gm-Message-State: AHPjjUiADMP5DTXzhtXt3b4SUkwcqTF9Z7NDYBrjZjas2hTOW7eInrxb xFcxeI8pLGgrPZABGgPpTxXknSRy5AE= X-Google-Smtp-Source: AOwi7QBIRX6HREl/1i/o8sW4RAqYWzkROJsiYuQ7evMMkIiCJ9jZjq+9ytMcwhAbiHWJ70eABAD42A== X-Received: by 10.223.187.129 with SMTP id q1mr5450562wrg.239.1505928481130; Wed, 20 Sep 2017 10:28:01 -0700 (PDT) Received: from vanye.hemma.eciton.net (cpc92316-cmbg19-2-0-cust118.5-4.cable.virginm.net. [82.12.0.119]) by smtp.gmail.com with ESMTPSA id j65sm1920429wmj.3.2017.09.20.10.27.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 10:28:00 -0700 (PDT) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Wed, 20 Sep 2017 18:27:51 +0100 Message-Id: <20170920172755.22767-3-leif.lindholm@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170920172755.22767-1-leif.lindholm@linaro.org> References: <20170920172755.22767-1-leif.lindholm@linaro.org> Subject: [edk2] [RFC 2/6] ArmVirtPkg: use ConfigPkg for common network items X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael D Kinney , Jordan Justen , Laszlo Ersek , Andrew Fish , Ard Biesheuvel MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" Remove boilerplate from the QEMU platforms by including ConfigPkg/Network/Network.{dsc|fdf}.inc. As a side effect, this enables support for building in IPv6 support, by specifying -D CONFIG_NETWORK_IP6_ENABLE=TRUE. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- ArmVirtPkg/ArmVirt.dsc.inc | 6 ------ ArmVirtPkg/ArmVirtQemu.dsc | 34 ++++------------------------------ ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 23 ++--------------------- ArmVirtPkg/ArmVirtQemuKernel.dsc | 34 ++++------------------------------ 4 files changed, 10 insertions(+), 87 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc index c92a69281a..a9fdddcd6c 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -71,12 +71,6 @@ # use the accelerated BaseMemoryLibOptDxe by default, overrides for SEC/PEI below 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 - # # It is not possible to prevent the ARM compiler from inserting calls to intrinsic functions. # This library provides the instrinsic functions such a compiler may generate calls to. diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 8a60b61f2a..71d3fb252f 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -33,10 +33,13 @@ # Defines for default states. These can be changed on the command line. # -D FLAG=VALUE # + DEFINE CONFIG_HTTP_BOOT_ENABLE = FALSE + DEFINE CONFIG_NETWORK_IP6_ENABLE = FALSE + DEFINE CONFIG_TLS_ENABLE = FALSE DEFINE SECURE_BOOT_ENABLE = FALSE - DEFINE HTTP_BOOT_ENABLE = FALSE !include ArmVirtPkg/ArmVirt.dsc.inc +!include ConfigPkg/Network/Network.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf @@ -64,10 +67,6 @@ PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf -!if $(HTTP_BOOT_ENABLE) == TRUE - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf -!endif - [LibraryClasses.common.UEFI_DRIVER] UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf @@ -129,10 +128,6 @@ # gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0 -!if $(HTTP_BOOT_ENABLE) == TRUE - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE -!endif - # System Memory Base -- fixed at 0x4000_0000 gArmTokenSpaceGuid.PcdSystemMemoryBase|0x40000000 @@ -334,27 +329,6 @@ } # - # 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/Tcp4Dxe/Tcp4Dxe.inf - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf -!if $(HTTP_BOOT_ENABLE) == TRUE - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpBootDxe/HttpBootDxe.inf -!endif - - # # SCSI Bus and Disk Driver # MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc index 744006d13c..504fdf5fa9 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -44,6 +44,8 @@ READ_STATUS = TRUE READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE +!include ConfigPkg/Network/Network.fdf.inc + INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf INF ArmVirtPkg/VirtioFdtDxe/VirtioFdtDxe.inf @@ -115,27 +117,6 @@ READ_LOCK_STATUS = TRUE INF MdeModulePkg/Application/UiApp/UiApp.inf # - # 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/Tcp4Dxe/Tcp4Dxe.inf - INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf -!if $(HTTP_BOOT_ENABLE) == TRUE - INF NetworkPkg/DnsDxe/DnsDxe.inf - INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - INF NetworkPkg/HttpDxe/HttpDxe.inf - INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf -!endif - - # # SCSI Bus and Disk Driver # INF MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 9a31ec93ca..db62c1d611 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -33,10 +33,13 @@ # Defines for default states. These can be changed on the command line. # -D FLAG=VALUE # + DEFINE CONFIG_HTTP_BOOT_ENABLE = FALSE + DEFINE CONFIG_NETWORK_IP6_ENABLE = FALSE + DEFINE CONFIG_TLS_ENABLE = FALSE DEFINE SECURE_BOOT_ENABLE = FALSE - DEFINE HTTP_BOOT_ENABLE = FALSE !include ArmVirtPkg/ArmVirt.dsc.inc +!include ConfigPkg/Network/Network.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf @@ -64,10 +67,6 @@ PciSegmentLib|MdePkg/Library/BasePciSegmentLibPci/BasePciSegmentLibPci.inf PciHostBridgeLib|ArmVirtPkg/Library/FdtPciHostBridgeLib/FdtPciHostBridgeLib.inf -!if $(HTTP_BOOT_ENABLE) == TRUE - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf -!endif - [LibraryClasses.common.UEFI_DRIVER] UefiScsiLib|MdePkg/Library/UefiScsiLib/UefiScsiLib.inf @@ -134,10 +133,6 @@ # gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz|0 -!if $(HTTP_BOOT_ENABLE) == TRUE - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE -!endif - [PcdsPatchableInModule.common] # # This will be overridden in the code @@ -325,27 +320,6 @@ } # - # 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/Tcp4Dxe/Tcp4Dxe.inf - MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf -!if $(HTTP_BOOT_ENABLE) == TRUE - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpBootDxe/HttpBootDxe.inf -!endif - - # # SCSI Bus and Disk Driver # MdeModulePkg/Bus/Scsi/ScsiBusDxe/ScsiBusDxe.inf