From patchwork Wed Sep 20 17:27:50 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 113159 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp925840edb; Wed, 20 Sep 2017 10:28:03 -0700 (PDT) X-Received: by 10.84.132.66 with SMTP id 60mr2811017ple.158.1505928483038; Wed, 20 Sep 2017 10:28:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505928483; cv=none; d=google.com; s=arc-20160816; b=ZEC+RwsEJcp7kGMKb9T7Qc3HUtL9yQtIQL49d3wyQVaYWEpLbpzwZz5Wfnr4QbXzxC /iXY7ggWsZvdx/ZYaYrE98WWoEj0VCU+QbPg+KVANl6yIaPO2tIJCPuMT6FRqwmvI/A6 D9nw1z3Wv7E1P/83DHGGgp2+Siv04tgwE0m5vOUXu04Q+T4G8gRvPbOIhC8QjhscAqWE g6lfBOBFTR7IiJsAobfPpBqYnADEMAim2wyiuvFri4vARL96PFWZgMJIFZgcqvVyBeff Xb8pLKz338Iia316/MEz5IupfXLvUZ8K546iKYcKq5f9/JmobIrejVs9I5oFRN/m2tMd Yoww== 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=w94zUdLJg/8s3Vh1hlJK/KoTKOIs0/E0+du2pWkqlXY=; b=z4GtYUNy/5iQO7jRBiDFRP9Wpp7wjCEg64xWIIcBWCBj9/rEW1Q8MhdMcGrvXR7uLr fB3/trySpuY8QoG8j7MeKx5El3k0RzKRNlHSbcTrlQBdeCo4Z1VccXkLvAZRrKyVrb9+ AigCil9lxnP6gYncHJAe+bJbPnV7yulhGawIx1fUldM847Vdu0AALpomhQYb4OT31I+k sdIIgWtNnbmP496ylXI5cQNFHV4K1SvlRpWhMmiO3V3tNu6DM0eP9luP1QZivvuDq9X1 reA8+aTtYuJmkkvRi2q6rsrQcHgMN1UnLeJxYOGVtarPBimbxH67OnGT2yxRLQ/FdwqR 79pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=CCvH0yP2; 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 y66si3400253pgy.413.2017.09.20.10.28.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 10:28:03 -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=CCvH0yP2; 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 2F9D120958BF8; Wed, 20 Sep 2017 10:24:56 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wr0-x22b.google.com (mail-wr0-x22b.google.com [IPv6:2a00:1450:400c:c0c::22b]) (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 28E5520945C1C for ; Wed, 20 Sep 2017 10:24:55 -0700 (PDT) Received: by mail-wr0-x22b.google.com with SMTP id m18so2746708wrm.2 for ; Wed, 20 Sep 2017 10:28:01 -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=b2H62UjQh5hPGwAivsn3bxh+SCyAeMFCdwy7c036gVA=; b=CCvH0yP21MYXidE2USh2rMnrFkGhttqNV7B3QCG4V6z052XqYFQIcju5D7AzFoBDUR X+JAYaXLhEPwyAyuy2OQIyl4ojNT7zZ13yRHHTiWV64RxghOjjTQK6tJhII/W3ScD6Ms AXJp2POIbXonJ4u05N8FBU0n+wj2RiGz3YCbU= 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=b2H62UjQh5hPGwAivsn3bxh+SCyAeMFCdwy7c036gVA=; b=ciUSIXFS23gFtc5qcIHFEydLOMG6BcLe0O9NrqN4IIm+iuUsh+83R/1u02tl9BDTzG 7p9FQ7/7E8kHjHPWx8TnPBP/SMf1rQXpUxEkW6PDgodmewiS+ogzhUpsjpvQWgzdDfX6 m0TSh9RPaLqrsfC3us0mCLEQ8nnS2jpz9uWT/ZFLyVUauI1IO2EzRLiJgTPGvMB2TJbi alzmg35VSI9D7By7q03FrTkPzd61Gau7Gc3kvx9LMVMiJ7p/zcLz4JXPSbERugJh8+zI e3PCwjtTVsGOs0TPkdI0Z9VerfDCSQFc4dmpFtj/QvIRMsOiHgvVJf1FXPoeu+Z8pQf/ eHOg== X-Gm-Message-State: AHPjjUjcVfNCJHPFBII+PaaKfTZa2oNkEl0UxEVCb0vNiCtjkauw0dF8 MJsHKPG68PqfOrmrlFfqu/JI8zDx4Bw= X-Google-Smtp-Source: AOwi7QAbwbCh+TD7KxOvC7ClhxsjEnaQ5B8mYCFqsUqeUfexIKyeqp4Oj7ObIfUfIBprPb7PJulnNw== X-Received: by 10.223.159.77 with SMTP id f13mr5494202wrg.154.1505928479491; Wed, 20 Sep 2017 10:27:59 -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.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 10:27:57 -0700 (PDT) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Wed, 20 Sep 2017 18:27:50 +0100 Message-Id: <20170920172755.22767-2-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 1/6] ConfigPkg: add new package for holding common config fragments 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" Start with common networking options. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- ConfigPkg/Network/Network.dsc.inc | 92 +++++++++++++++++++++++++++++++++++++++ ConfigPkg/Network/Network.fdf.inc | 47 ++++++++++++++++++++ 2 files changed, 139 insertions(+) create mode 100644 ConfigPkg/Network/Network.dsc.inc create mode 100644 ConfigPkg/Network/Network.fdf.inc -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ConfigPkg/Network/Network.dsc.inc b/ConfigPkg/Network/Network.dsc.inc new file mode 100644 index 0000000000..8c53350deb --- /dev/null +++ b/ConfigPkg/Network/Network.dsc.inc @@ -0,0 +1,92 @@ +## @file +# +# Copyright (c) 2017, Linaro ltd. All rights reserved.
+# +# This program and the accompanying materials are licensed and made available +# under the terms and conditions of the BSD License which accompanies this +# distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# +## + + +################################################################################ +# +# Library Class section +# +################################################################################ +[LibraryClasses] + DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf + IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf + NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf + UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf + +!if $(CONFIG_HTTP_BOOT_ENABLE) == TRUE + HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf +!endif + +!if $(CONFIG_NETWORK_IP6_ENABLE) == TRUE + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf +!endif + +!if $(CONFIG_TLS_ENABLE) == TRUE + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf + TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf +!else + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +!endif + + +################################################################################# +# Pcd Section +# +################################################################################ +[PcdsFixedAtBuild] +!if $(CONFIG_HTTP_BOOT_ENABLE) == TRUE + gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE +!endif + + +################################################################################ +# +# Components Section +# +################################################################################ +[Components] + 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/SnpDxe/SnpDxe.inf + MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf + MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf +!if $(CONFIG_NETWORK_IP6_ENABLE) == TRUE + NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf + NetworkPkg/Ip6Dxe/Ip6Dxe.inf + NetworkPkg/IScsiDxe/IScsiDxe.inf + NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf + NetworkPkg/TcpDxe/TcpDxe.inf + NetworkPkg/Udp6Dxe/Udp6Dxe.inf + NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf +!else + MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf + MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf + MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf +!endif +!if $(CONFIG_HTTP_BOOT_ENABLE) == TRUE + NetworkPkg/DnsDxe/DnsDxe.inf + NetworkPkg/HttpBootDxe/HttpBootDxe.inf + NetworkPkg/HttpDxe/HttpDxe.inf + NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf +!endif +!if $(CONFIG_TLS_ENABLE) == TRUE + NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf + NetworkPkg/TlsDxe/TlsDxe.inf +!endif diff --git a/ConfigPkg/Network/Network.fdf.inc b/ConfigPkg/Network/Network.fdf.inc new file mode 100644 index 0000000000..614fd18a9a --- /dev/null +++ b/ConfigPkg/Network/Network.fdf.inc @@ -0,0 +1,47 @@ +## @file +# +# Copyright (c) 2017, Linaro ltd. All rights reserved.
+# +# This program and the accompanying materials are licensed and made available +# under the terms and conditions of the BSD License which accompanies this +# distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# +## + + + 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/SnpDxe/SnpDxe.inf + INF MdeModulePkg/Universal/Network/Udp4Dxe/Udp4Dxe.inf + INF MdeModulePkg/Universal/Network/VlanConfigDxe/VlanConfigDxe.inf +!if $(CONFIG_NETWORK_IP6_ENABLE) == TRUE + INF NetworkPkg/Dhcp6Dxe/Dhcp6Dxe.inf + INF NetworkPkg/Ip6Dxe/Ip6Dxe.inf + INF NetworkPkg/IScsiDxe/IScsiDxe.inf + INF NetworkPkg/Mtftp6Dxe/Mtftp6Dxe.inf + INF NetworkPkg/TcpDxe/TcpDxe.inf + INF NetworkPkg/Udp6Dxe/Udp6Dxe.inf + INF NetworkPkg/UefiPxeBcDxe/UefiPxeBcDxe.inf +!else + INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf + INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf + INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf +!endif +!if $(CONFIG_HTTP_BOOT_ENABLE) == TRUE + INF NetworkPkg/DnsDxe/DnsDxe.inf + INF NetworkPkg/HttpBootDxe/HttpBootDxe.inf + INF NetworkPkg/HttpDxe/HttpDxe.inf + INF NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf +!endif +!if $(CONFIG_TLS_ENABLE) == TRUE + INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf + INF NetworkPkg/TlsDxe/TlsDxe.inf +!endif 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 From patchwork Wed Sep 20 17:27:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 113161 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp925951edb; Wed, 20 Sep 2017 10:28:09 -0700 (PDT) X-Received: by 10.98.218.18 with SMTP id c18mr2865065pfh.256.1505928489157; Wed, 20 Sep 2017 10:28:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505928489; cv=none; d=google.com; s=arc-20160816; b=NWztiGKRr+gMoN14oz1JeY8EfsL0c/RWmSNLa83oZNjgEIXrCZFVThTmYZBLzr6lEy MpFgr4+nT2t/wKO4m1f9X7gqhRGheybygh5WCLU3eMUE+eI3VQ8532ODF14/tFBOtVg8 gt6OfO7vqTqwviW+V97SlhOPy7TEmCGknEXtouhDIPw1aKvfh3MorFpHGT8yADftRZTv KhSFXTmceg0GM/XFT/ncUFZiODnVLSkjBDqY1xP+K8DAInrea3xNVmhp8AxlZpayfOVN DujQJE4ZcA4R3nwh84feQqXpoONUZkHXMxz6ENFCAM4XEF4+eYlhsRX5wGmKAQ6BJTMG gHdg== 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=oe/k3SpDR2Xg2Vir0cKytB1L2szfp6f0OQFqAVxD8QE=; b=x9i3bPzLvyChT4nmeNzzWQlYFvo4PN1iFzPLrOnHoHJry5VNaRd5p0DKlSjg1IYd8q ux6Hviq0kWa2W6prvhxTXfyYu0QDYvodGXD7JJVcxITTzbhTXjwidU+L9RCUZS4GVJD6 0IEmdYrcNUEQBhohf69pX+es49+3idqNR8fY52biTrYr8JOjpm4Ws23sGFMfJmA99DV2 LaSzc8/vB7URnt2nTqXplL8LaJYU/it4f394WyENwAf5rriMSlGR1wT7SdPnzKjJnbig xmSv93HcbYLLx2NHZsbH2AXS6O72LGa1uDtWsfSeq+wirv5hvshyyDCLCxu7gS42c/Rx zS8w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=PcWqceDk; 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 x66si3233128pfb.432.2017.09.20.10.28.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 10:28:09 -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=PcWqceDk; 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 B23BA21D046D6; Wed, 20 Sep 2017 10:25:00 -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 EEF2A21ECCB23 for ; Wed, 20 Sep 2017 10:24:58 -0700 (PDT) Received: by mail-wr0-x231.google.com with SMTP id k20so2750000wre.4 for ; Wed, 20 Sep 2017 10:28:04 -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=PBwf2Pezqq0+M2Ev2vxCLul9G/RkW6qbA0BOQcE40lo=; b=PcWqceDkCNL6V0KUsJSI/xxFqCWRZFu9vQHXdXofq5KDsjYKGHHP8NNL76wUc24Vr5 gclk4WZM/LkV7Ajg36pjieqMxYRw6524yNf0+SVA+Xwoba6yh1prNxC58MWrR88mBVtJ HeswE2fB6Xxh57nEslcqXZbUOCzPpQN2PAho0= 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=PBwf2Pezqq0+M2Ev2vxCLul9G/RkW6qbA0BOQcE40lo=; b=gkFaFe2aIbQQyd9Q6TV3nxVEqlw4wgg2NshBpjSSOg3yCtmxKS8RMz4LevIkbp6PTr VwLM8lwb4frji8PzyQ8Sgy70lG86sqkY6SDWAelg7IDGN/sBWLQeUHmh14DleEroCErV FivYewr0zZCSD2fl9zIAsNOH7nO9MkM10/570jc/wJQFyy/s803S0mjK97ZhY8gyZHkq zrCmjhRdixr3f+8ZOnUSQGoZK2EidCQ6OyPBtQOKwtJ2S1CGOl3h2LPPPqMk2OF/VuN4 OGa7LaW2DTt4VxGNXg1MxY83+e8JFcH/HF7kg7buriaADpVQN7fRknweXyCQMMmieAaQ Dlvg== X-Gm-Message-State: AHPjjUiuCGOCnLy98ptTqPWqKGYa5UvGuaoPA38lPT2sJl8jFJIFx+Cn Mck+/vtPZb4QU8a4ikHls4O+5p629Tg= X-Google-Smtp-Source: AOwi7QDfdsUWedwdMjtG4W00/FCSRJ4d1u6Kv/cjgNJCf/jDRmaVkYcammJ5DscrlgW6Tf40/cUPVw== X-Received: by 10.223.169.111 with SMTP id u102mr5418064wrc.266.1505928483141; Wed, 20 Sep 2017 10:28:03 -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.28.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 10:28:01 -0700 (PDT) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Wed, 20 Sep 2017 18:27:52 +0100 Message-Id: <20170920172755.22767-4-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 3/6] OvmfPkg: 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 Ovmf platforms by including ConfigPkg/Network/Network.{dsc|fdf}.inc. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- OvmfPkg/OvmfPkgIa32.dsc | 67 +++++----------------------------------------- OvmfPkg/OvmfPkgIa32.fdf | 33 +---------------------- OvmfPkg/OvmfPkgIa32X64.dsc | 67 +++++----------------------------------------- OvmfPkg/OvmfPkgIa32X64.fdf | 33 +---------------------- OvmfPkg/OvmfPkgX64.dsc | 67 +++++----------------------------------------- OvmfPkg/OvmfPkgX64.fdf | 33 +---------------------- 6 files changed, 21 insertions(+), 279 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 92e943d4a0..99175155a2 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -34,11 +34,11 @@ # 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 NETWORK_IP6_ENABLE = FALSE - DEFINE HTTP_BOOT_ENABLE = FALSE DEFINE SMM_REQUIRE = FALSE - DEFINE TLS_ENABLE = FALSE # # Flash size selection. Setting FD_SIZE_IN_KB on the command line directly to @@ -59,6 +59,8 @@ !endif !endif +!include ConfigPkg/Network/Network.dsc.inc + [BuildOptions] GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG @@ -136,10 +138,6 @@ FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf @@ -165,11 +163,6 @@ DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf -!if $(TLS_ENABLE) == TRUE - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf -!else - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -!endif !if $(SECURE_BOOT_ENABLE) == TRUE PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf @@ -181,18 +174,6 @@ !endif VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf -!if $(NETWORK_IP6_ENABLE) == TRUE - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf -!endif - -!if $(HTTP_BOOT_ENABLE) == TRUE - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf -!endif - -!if $(TLS_ENABLE) == TRUE - TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf -!endif - S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf @@ -471,10 +452,6 @@ gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2 !endif -!if $(HTTP_BOOT_ENABLE) == TRUE - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE -!endif - !ifndef $(USE_OLD_SHELL) gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } !endif @@ -731,38 +708,6 @@ # # 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 -!if $(NETWORK_IP6_ENABLE) == TRUE - 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 -!else - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf -!endif -!if $(HTTP_BOOT_ENABLE) == TRUE - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpBootDxe/HttpBootDxe.inf -!endif -!if $(TLS_ENABLE) == TRUE - NetworkPkg/TlsDxe/TlsDxe.inf - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf -!endif OvmfPkg/VirtioNetDxe/VirtioNet.inf # @@ -795,7 +740,7 @@ NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf -!if $(NETWORK_IP6_ENABLE) == TRUE +!if $(CONFIG_NETWORK_IP6_ENABLE) == TRUE NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf !endif NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 7515224118..68438afc13 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -295,38 +295,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf # # Network modules # - 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 -!if $(NETWORK_IP6_ENABLE) == TRUE - 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 -!else - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf -!endif -!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 -!if $(TLS_ENABLE) == TRUE - INF NetworkPkg/TlsDxe/TlsDxe.inf - INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf -!endif +!include ConfigPkg/Network/Network.fdf.inc INF OvmfPkg/VirtioNetDxe/VirtioNet.inf # diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 7f9220ccb9..0e4c86d5bc 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -34,11 +34,11 @@ # 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 NETWORK_IP6_ENABLE = FALSE - DEFINE HTTP_BOOT_ENABLE = FALSE DEFINE SMM_REQUIRE = FALSE - DEFINE TLS_ENABLE = FALSE # # Flash size selection. Setting FD_SIZE_IN_KB on the command line directly to @@ -59,6 +59,8 @@ !endif !endif +!include ConfigPkg/Network/Network.dsc.inc + [BuildOptions] GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG @@ -141,10 +143,6 @@ FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf @@ -170,11 +168,6 @@ DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf -!if $(TLS_ENABLE) == TRUE - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf -!else - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -!endif !if $(SECURE_BOOT_ENABLE) == TRUE PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf @@ -186,18 +179,6 @@ !endif VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf -!if $(NETWORK_IP6_ENABLE) == TRUE - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf -!endif - -!if $(HTTP_BOOT_ENABLE) == TRUE - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf -!endif - -!if $(TLS_ENABLE) == TRUE - TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf -!endif - S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf @@ -477,10 +458,6 @@ !endif [PcdsFixedAtBuild.X64] -!if $(HTTP_BOOT_ENABLE) == TRUE - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE -!endif - !ifndef $(USE_OLD_SHELL) gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } !endif @@ -740,38 +717,6 @@ # # 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 -!if $(NETWORK_IP6_ENABLE) == TRUE - 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 -!else - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf -!endif -!if $(HTTP_BOOT_ENABLE) == TRUE - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpBootDxe/HttpBootDxe.inf -!endif -!if $(TLS_ENABLE) == TRUE - NetworkPkg/TlsDxe/TlsDxe.inf - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf -!endif OvmfPkg/VirtioNetDxe/VirtioNet.inf # @@ -804,7 +749,7 @@ NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf -!if $(NETWORK_IP6_ENABLE) == TRUE +!if $(CONFIG_NETWORK_IP6_ENABLE) == TRUE NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf !endif NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index f1a2044fb7..ec91c0b74a 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -301,38 +301,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf SECTION PE32 = Intel3.5/EFIX64/E3522X2.EFI } !endif - 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 -!if $(NETWORK_IP6_ENABLE) == TRUE - 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 -!else - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf -!endif -!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 -!if $(TLS_ENABLE) == TRUE - INF NetworkPkg/TlsDxe/TlsDxe.inf - INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf -!endif +!include ConfigPkg/Network/Network.fdf.inc INF OvmfPkg/VirtioNetDxe/VirtioNet.inf # diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 36c60fc19c..8a600f8051 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -34,11 +34,11 @@ # 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 NETWORK_IP6_ENABLE = FALSE - DEFINE HTTP_BOOT_ENABLE = FALSE DEFINE SMM_REQUIRE = FALSE - DEFINE TLS_ENABLE = FALSE # # Flash size selection. Setting FD_SIZE_IN_KB on the command line directly to @@ -59,6 +59,8 @@ !endif !endif +!include ConfigPkg/Network/Network.dsc.inc + [BuildOptions] GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG GCC:RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG @@ -141,10 +143,6 @@ FileHandleLib|MdePkg/Library/UefiFileHandleLib/UefiFileHandleLib.inf UefiCpuLib|UefiCpuPkg/Library/BaseUefiCpuLib/BaseUefiCpuLib.inf SecurityManagementLib|MdeModulePkg/Library/DxeSecurityManagementLib/DxeSecurityManagementLib.inf - NetLib|MdeModulePkg/Library/DxeNetLib/DxeNetLib.inf - IpIoLib|MdeModulePkg/Library/DxeIpIoLib/DxeIpIoLib.inf - UdpIoLib|MdeModulePkg/Library/DxeUdpIoLib/DxeUdpIoLib.inf - DpcLib|MdeModulePkg/Library/DxeDpcLib/DxeDpcLib.inf UefiUsbLib|MdePkg/Library/UefiUsbLib/UefiUsbLib.inf SerializeVariablesLib|OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.inf QemuFwCfgLib|OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxeLib.inf @@ -170,11 +168,6 @@ DebugPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPrintErrorLevelLib.inf IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf -!if $(TLS_ENABLE) == TRUE - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf -!else - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf -!endif !if $(SECURE_BOOT_ENABLE) == TRUE PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf @@ -186,18 +179,6 @@ !endif VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf -!if $(NETWORK_IP6_ENABLE) == TRUE - TcpIoLib|MdeModulePkg/Library/DxeTcpIoLib/DxeTcpIoLib.inf -!endif - -!if $(HTTP_BOOT_ENABLE) == TRUE - HttpLib|MdeModulePkg/Library/DxeHttpLib/DxeHttpLib.inf -!endif - -!if $(TLS_ENABLE) == TRUE - TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf -!endif - S3BootScriptLib|MdeModulePkg/Library/PiDxeS3BootScriptLib/DxeS3BootScriptLib.inf SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib/BaseOrderedCollectionRedBlackTreeLib.inf @@ -476,10 +457,6 @@ gEfiSourceLevelDebugPkgTokenSpaceGuid.PcdDebugLoadImageMethod|0x2 !endif -!if $(HTTP_BOOT_ENABLE) == TRUE - gEfiNetworkPkgTokenSpaceGuid.PcdAllowHttpConnections|TRUE -!endif - !ifndef $(USE_OLD_SHELL) gEfiIntelFrameworkModulePkgTokenSpaceGuid.PcdShellFile|{ 0x83, 0xA5, 0x04, 0x7C, 0x3E, 0x9E, 0x1C, 0x4F, 0xAD, 0x65, 0xE0, 0x52, 0x68, 0xD0, 0xB4, 0xD1 } !endif @@ -738,38 +715,6 @@ # # 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 -!if $(NETWORK_IP6_ENABLE) == TRUE - 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 -!else - MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf - MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf -!endif -!if $(HTTP_BOOT_ENABLE) == TRUE - NetworkPkg/DnsDxe/DnsDxe.inf - NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf - NetworkPkg/HttpDxe/HttpDxe.inf - NetworkPkg/HttpBootDxe/HttpBootDxe.inf -!endif -!if $(TLS_ENABLE) == TRUE - NetworkPkg/TlsDxe/TlsDxe.inf - NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf -!endif OvmfPkg/VirtioNetDxe/VirtioNet.inf # @@ -802,7 +747,7 @@ NULL|ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.inf NULL|ShellPkg/Library/UefiShellInstall1CommandsLib/UefiShellInstall1CommandsLib.inf NULL|ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf -!if $(NETWORK_IP6_ENABLE) == TRUE +!if $(CONFIG_NETWORK_IP6_ENABLE) == TRUE NULL|ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf !endif NULL|ShellPkg/Library/UefiShellTftpCommandLib/UefiShellTftpCommandLib.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index 32000a3b93..be22048f66 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -301,38 +301,7 @@ INF MdeModulePkg/Logo/LogoDxe.inf SECTION PE32 = Intel3.5/EFIX64/E3522X2.EFI } !endif - 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 -!if $(NETWORK_IP6_ENABLE) == TRUE - 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 -!else - INF MdeModulePkg/Universal/Network/Tcp4Dxe/Tcp4Dxe.inf - INF MdeModulePkg/Universal/Network/UefiPxeBcDxe/UefiPxeBcDxe.inf - INF MdeModulePkg/Universal/Network/IScsiDxe/IScsiDxe.inf -!endif -!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 -!if $(TLS_ENABLE) == TRUE - INF NetworkPkg/TlsDxe/TlsDxe.inf - INF NetworkPkg/TlsAuthConfigDxe/TlsAuthConfigDxe.inf -!endif +!include ConfigPkg/Network/Network.fdf.inc INF OvmfPkg/VirtioNetDxe/VirtioNet.inf # From patchwork Wed Sep 20 17:27:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 113162 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp926002edb; Wed, 20 Sep 2017 10:28:12 -0700 (PDT) X-Received: by 10.99.6.140 with SMTP id 134mr2805120pgg.199.1505928492042; Wed, 20 Sep 2017 10:28:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505928492; cv=none; d=google.com; s=arc-20160816; b=ijMFRo10kljXrG8TfnNrksfenwVIA6m8us49LQK3EIAeho7rZXIvii5QOzXcodzVFh QwC0gAtcu9upOfkenG5VIbSIsOZzp3dCd8FiVu8bTzLobcpJ8MN9w65CE8auBjlRfRfM hbzmOj1L0POZL/m3t2F5g28GRHNdeQTZzPXndsTBw6ZqnB8jiADp8r3lMVXq3hIFRpkq 3/7BkJ6GL/j5hIOLJUu018fyJpjWgSZeB3juxzd6CeS1stjrXMR0sgMNVNntg1N8feNV K8OGvkBjmDCYiVTIotPwtUtGXJxmHaWoaF5jE9egvEYBQ6O4FegahmgYndRAjUvp+XWH qCVA== 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=CBjMxjHxDMrrMfweGclsea4xmwXI1htqlm8RmvNHqCQ=; b=Ifz7JP3KkVHml4+PyY4/Cgtk9PxRlhWc+RN6Lwz8ZJLe1tcMNEyoi+kxqQgANKO6Dw DPYGRJBYU6YVkgThYNMcnMXVBn6FNtjV70QUuGyVK/4VPRSyn8MFIU3g4YMAVRGjO/B0 dTjYYLyPn5qQddHOlcbkmfAFdiHvydwzOWgbF16TYjhw9gD3Mee6NgNx8sQIbszskffB WfvyeYBKSSkHPpcP39CdeofweWVOii8UnJ8yOpN7YfdGXO/qiP9KndG8fYzUCi5CQPC3 /05PuZ0NQjuMxZ4cV+bbBAzv5Xq2h0HJyY+icLtF5xcpF3tpbh+gj9+/NKu8unViE1Yq /gtg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=L4GHvZZC; 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 j9si3515828pgs.702.2017.09.20.10.28.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 10:28:12 -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=L4GHvZZC; 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 0429221D046DF; Wed, 20 Sep 2017 10:25:02 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x235.google.com (mail-wm0-x235.google.com [IPv6:2a00:1450:400c:c09::235]) (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 B74C121D046D7 for ; Wed, 20 Sep 2017 10:25:00 -0700 (PDT) Received: by mail-wm0-x235.google.com with SMTP id 13so9221954wmq.2 for ; Wed, 20 Sep 2017 10:28:06 -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=pHlRgljo0XFT0yYBiAfxtNO7DSnFb9kzc9ts7TYZ0PQ=; b=L4GHvZZCKR8KTCzxgoNHeFIFtvVd6+fH/bzm3p3zYmh95FE22/g/Nfic1m80fCEk93 V1Sdx33g9NPRxBHXF6RwHys2zotXSUDbpevrRRdoeHEQLbthErg/y89fs+vkXp2DRX9y +M1FgSmKf0SdeeLhsOqYV2+/dHuHiuDQ7Ka7c= 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=pHlRgljo0XFT0yYBiAfxtNO7DSnFb9kzc9ts7TYZ0PQ=; b=ZRFOM8EpU/YVbUwaurC7AyxyLT/gzNDZj/97Emr9NM49bHJK6shaTQvmiYza4M8JR/ a7J5nbDlcF+tiDx5cT4NVZ86VmHAMPmd4SklS+CR0C9etZ+4rKk9EE/UHwkUHgPw/LwG 2emq64OLwh2B+QoWdV9HJ1pg2duWT0gT2EmfaGc0OaqfHhAaYNPwtEpCUlAGlivNQNHM dKA6ysqEydNbdJZQW5+F8c7cbaM7dFUscFgQTLGSGNHrCTUSzIogHCSSLqpWtlewoH1o Rdho5u62cNpSVVRdRZNamw/TdpS2JndMUiDMnekbYAGd6oaTuwEPSbEnlKRRki/byaqN 0u0w== X-Gm-Message-State: AHPjjUh5K6RZ+wnSKPOeQ+IBcDlaCvraASG5WCZnVzRo+dEqZh1Y83u0 gAfuq4iASzWt85wubsL6z7P1ZMQwVeQ= X-Google-Smtp-Source: AOwi7QAnPzw64v4Jr2Z/caXQUtvZGBlrgIX5P8ZhqKgBOAjFerpognXDSPKqZaFDcEKv23TX106SrA== X-Received: by 10.28.12.65 with SMTP id 62mr5056967wmm.129.1505928485047; Wed, 20 Sep 2017 10:28:05 -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.28.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 10:28:03 -0700 (PDT) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Wed, 20 Sep 2017 18:27:53 +0100 Message-Id: <20170920172755.22767-5-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 4/6] ConfigPkg: add common Security settings 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" Collate universal Secure Boot and crypto settings under Security/. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- ConfigPkg/Security/Security.dsc.inc | 67 +++++++++++++++++++++++++++++++++++++ ConfigPkg/Security/Security.fdf.inc | 17 ++++++++++ 2 files changed, 84 insertions(+) create mode 100644 ConfigPkg/Security/Security.dsc.inc create mode 100644 ConfigPkg/Security/Security.fdf.inc -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/ConfigPkg/Security/Security.dsc.inc b/ConfigPkg/Security/Security.dsc.inc new file mode 100644 index 0000000000..88100c992d --- /dev/null +++ b/ConfigPkg/Security/Security.dsc.inc @@ -0,0 +1,67 @@ +## @file +# +# Copyright (c) 2017, Linaro ltd. All rights reserved.
+# +# This program and the accompanying materials are licensed and made available +# under the terms and conditions of the BSD License which accompanies this +# distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# +## + + +################################################################################ +# +# Library Class section +# +################################################################################ +[LibraryClasses.common] +!if $(CONFIG_SECURE_BOOT_ENABLE) == TRUE + AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf + IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf + TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf +# +!else +# + AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf + TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf +!endif + +[LibraryClasses.ARM, LibraryClasses.AARCH64] +!if $(CONFIG_SECURE_BOOT_ENABLE) == TRUE + OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf +!endif + +[LibraryClasses.common.DXE_RUNTIME_DRIVER] +!if $(CONFIG_SECURE_BOOT_ENABLE) == TRUE + BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf +!endif + + +################################################################################ +# +# Pcd Section +# +################################################################################ +[PcdsFeatureFlag] + + +################################################################################ +# +# Components Section +# +################################################################################ +[Components] +!if $(CONFIG_SECURE_BOOT_ENABLE) == TRUE + MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { + + NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf + } + SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf +!else + MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf +!endif diff --git a/ConfigPkg/Security/Security.fdf.inc b/ConfigPkg/Security/Security.fdf.inc new file mode 100644 index 0000000000..2a75446c9b --- /dev/null +++ b/ConfigPkg/Security/Security.fdf.inc @@ -0,0 +1,17 @@ +## @file +# +# Copyright (c) 2017, Linaro ltd. All rights reserved.
+# +# This program and the accompanying materials are licensed and made available +# under the terms and conditions of the BSD License which accompanies this +# distribution. The full text of the license may be found at +# http://opensource.org/licenses/bsd-license.php +# +# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +# +## + +!if $(CONFIGURE_SECURE_BOOT_ENABLE) == TRUE + INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf +!endif From patchwork Wed Sep 20 17:27:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 113163 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp926067edb; Wed, 20 Sep 2017 10:28:17 -0700 (PDT) X-Received: by 10.98.56.74 with SMTP id f71mr2939462pfa.44.1505928497349; Wed, 20 Sep 2017 10:28:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505928497; cv=none; d=google.com; s=arc-20160816; b=sdzlgCHlhmmi/3BLjljLL2lrKXranq7ZyC6IRxMwVhSQkimLInIsDnPyavx9kGjXE5 oR0Tc1hNHjjAGRyI/rP/zwFMtAghLIcCFIWuTf8O0qFbvk8ANdjfpRv/9AtOXSmXiT/P ejAmF1t19n0OhWD2P/U1MXtjQ1CCFnGNa3WrG56EtEnKgq+Oz9jeDIGmJGL3RUUgOm1U zWmo1SGFvIzOzy3p/x7JgSciK0jcNGczdmuNsSc/ajMdifPfGAKjaQo2cQ2TB7v7Lmtx 0kRtWCnCBLjgyk7VB3tqKFm55Al2crb3W/R9x8w3DtKY54LWPlgH/l1JRy9PSew3aTff 5Ntw== 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=Y+5yrAq9JZgKAnx0JCQtQNhw93yvdsU+OGBj8g019UQ=; b=Aok/Yo85eZzllRe2k4HfQqM/X3pscsY9JpGkcF6uY15spQU15zXGrPWZRJA7i0R8y0 cU8M4SBuliXny5jptgcrI3aRlMGT4Cs9O6XY/lFlZxCkD62fCv+PU3hOOrEWAZ560mBK FmJgRQv8UgL7ESJqJR1qaUekzGViVo+LiYMPyvb43Dvl87K+K+a36jonKtoT52gBjV1b Pn3QlImO2g7a8YUpLU8y0P7vOJB5F7piIQdfJkGp6s1ohAPmF6hwitUo7e/nVFQLf0Wr mEhZTbtufCFFBhwJBp+n4TC0KJXy8mE3MroBooH7C40gzMkPLee5aol1+0G4htPtJsMt KhcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=Q4T/50vK; 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 f14si3498223pgt.803.2017.09.20.10.28.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 10:28:17 -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=Q4T/50vK; 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 6692721D046DC; Wed, 20 Sep 2017 10:25:03 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wr0-x22f.google.com (mail-wr0-x22f.google.com [IPv6:2a00:1450:400c:c0c::22f]) (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 4F14B20945BF5 for ; Wed, 20 Sep 2017 10:25:02 -0700 (PDT) Received: by mail-wr0-x22f.google.com with SMTP id c23so2738804wrg.9 for ; Wed, 20 Sep 2017 10:28:08 -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=T3E/XchJsON2OwULJBEYPdyyC75SE9GM0QiYMd0i9UM=; b=Q4T/50vK5jXwumcWw1eVCk9pJ7lUrUjRFw8VR7JKXPXjX4QCJVoXYzwGKJJx0kJTns gnQh2uR9NLoug+JOXea0BebZwcuw06oK3praW5e5+Lj9zerSeMBZ5QMwhfHazCIqEWqj 5B80gepdqiPKcYJeGhD1RzIS+TueTBF+wMGB4= 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=T3E/XchJsON2OwULJBEYPdyyC75SE9GM0QiYMd0i9UM=; b=N1/mrxwCKD02syO99opwfPfvLRTav8GWZFgVRculORBkaEvrLEWhUJMYG2FKNhk16n XsXRu52F5Oa/yQDptJaFo8V9GwwNCgHbRSdsE3ONsO4cHjvO81ECiwniHvUE2Pjfihs2 QcB2XJtin9MuM0pGZHoNOXi4jlc7iOBVCUhRkg6E15UH3qs0jKB4Dk1Y67O8xF/Ho8ua IKLbGQk2mMpo3stw3otKoIntzcgJqQJePiHJrq3PYzReWPQTFa5pIWIInY567siDd0W0 +23jJi2eXaTg4xmghuupneYz01cDWxlDuJd0/LiEONeNto3HTnyGfz5RbPcUbry4TkyI 7eKA== X-Gm-Message-State: AHPjjUhRIOSXO1xA55enwzDBJppEFrgWAbK5H8nc9ahqOq3PHZuaXA+8 iOwBnWMZQC9nhYk+P9xS0F/kJTlg4Nc= X-Google-Smtp-Source: AOwi7QDn7GTPHPYkkUPOIZ7loIwXBgUEmjG7mZN2FhV6OQrWqDQfORIPKkw3ADoheAU+tPk8tyDBiA== X-Received: by 10.223.155.154 with SMTP id d26mr5680913wrc.149.1505928486518; Wed, 20 Sep 2017 10:28:06 -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.28.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 10:28:05 -0700 (PDT) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Wed, 20 Sep 2017 18:27:54 +0100 Message-Id: <20170920172755.22767-6-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 5/6] ArmVirtPkg: use ConfigPkg for common security 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/Security/Security.{dsc|fdf}.inc. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- ArmVirtPkg/ArmVirt.dsc.inc | 19 +++---------------- ArmVirtPkg/ArmVirtQemu.dsc | 12 ++---------- ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc | 1 + ArmVirtPkg/ArmVirtQemuKernel.dsc | 12 ++---------- 4 files changed, 8 insertions(+), 36 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 a9fdddcd6c..5c8be2d689 100644 --- a/ArmVirtPkg/ArmVirt.dsc.inc +++ b/ArmVirtPkg/ArmVirt.dsc.inc @@ -131,18 +131,9 @@ # # Secure Boot dependencies # -!if $(SECURE_BOOT_ENABLE) == TRUE - IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf - OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibCrypto.inf - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf - AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf - +!if $(CONFIG_SECURE_BOOT_ENABLE) == TRUE # re-use the UserPhysicalPresent() dummy implementation from the ovmf tree PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf -!else - TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf - AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf !endif VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf UefiBootManagerLib|MdeModulePkg/Library/UefiBootManagerLib/UefiBootManagerLib.inf @@ -225,10 +216,6 @@ MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf CapsuleLib|MdeModulePkg/Library/DxeCapsuleLibNull/DxeCapsuleLibNull.inf -!if $(SECURE_BOOT_ENABLE) == TRUE - BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf -!endif - [LibraryClasses.ARM] ArmSoftFloatLib|ArmPkg/Library/ArmSoftFloatLib/ArmSoftFloatLib.inf @@ -323,7 +310,7 @@ gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIReclaimMemory|0 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiACPIMemoryNVS|0 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiReservedMemoryType|0 -!if $(SECURE_BOOT_ENABLE) == TRUE +!if $(CONFIG_SECURE_BOOT_ENABLE) == TRUE gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesData|600 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiRuntimeServicesCode|400 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiBootServicesCode|1500 @@ -336,7 +323,7 @@ gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderCode|20 gEmbeddedTokenSpaceGuid.PcdMemoryTypeEfiLoaderData|0 -!if $(SECURE_BOOT_ENABLE) == TRUE +!if $(CONFIG_SECURE_BOOT_ENABLE) == TRUE # override the default values from SecurityPkg to ensure images from all sources are verified in secure boot gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x04 gEfiSecurityPkgTokenSpaceGuid.PcdFixedMediaImageVerificationPolicy|0x04 diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc index 71d3fb252f..635309c346 100644 --- a/ArmVirtPkg/ArmVirtQemu.dsc +++ b/ArmVirtPkg/ArmVirtQemu.dsc @@ -36,10 +36,11 @@ DEFINE CONFIG_HTTP_BOOT_ENABLE = FALSE DEFINE CONFIG_NETWORK_IP6_ENABLE = FALSE DEFINE CONFIG_TLS_ENABLE = FALSE - DEFINE SECURE_BOOT_ENABLE = FALSE + DEFINE CONFIG_SECURE_BOOT_ENABLE = FALSE !include ArmVirtPkg/ArmVirt.dsc.inc !include ConfigPkg/Network/Network.dsc.inc +!include ConfigPkg/Security/Security.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf @@ -257,15 +258,6 @@ NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf } -!if $(SECURE_BOOT_ENABLE) == TRUE - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { - - NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf - } - SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf -!else - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -!endif MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf diff --git a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc index 504fdf5fa9..9cff352416 100644 --- a/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc +++ b/ArmVirtPkg/ArmVirtQemuFvMain.fdf.inc @@ -45,6 +45,7 @@ READ_LOCK_CAP = TRUE READ_LOCK_STATUS = TRUE !include ConfigPkg/Network/Network.fdf.inc +!include ConfigPkg/Security/Security.fdf.inc INF MdeModulePkg/Core/Dxe/DxeMain.inf INF MdeModulePkg/Universal/PCD/Dxe/Pcd.inf diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index db62c1d611..59ad54c3fb 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -35,11 +35,12 @@ # DEFINE CONFIG_HTTP_BOOT_ENABLE = FALSE DEFINE CONFIG_NETWORK_IP6_ENABLE = FALSE + DEFINE CONFIG_SECURE_BOOT_ENABLE = FALSE DEFINE CONFIG_TLS_ENABLE = FALSE - DEFINE SECURE_BOOT_ENABLE = FALSE !include ArmVirtPkg/ArmVirt.dsc.inc !include ConfigPkg/Network/Network.dsc.inc +!include ConfigPkg/Security/Security.dsc.inc [LibraryClasses.common] ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf @@ -248,15 +249,6 @@ NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf } -!if $(SECURE_BOOT_ENABLE) == TRUE - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { - - NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf - } - SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf -!else - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -!endif MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf MdeModulePkg/Universal/FaultTolerantWriteDxe/FaultTolerantWriteDxe.inf MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf From patchwork Wed Sep 20 17:27:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 113164 Delivered-To: patch@linaro.org Received: by 10.80.163.150 with SMTP id s22csp926125edb; Wed, 20 Sep 2017 10:28:21 -0700 (PDT) X-Received: by 10.98.36.132 with SMTP id k4mr2948827pfk.148.1505928501138; Wed, 20 Sep 2017 10:28:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505928501; cv=none; d=google.com; s=arc-20160816; b=fn7o/KgqI1lH265zFroQuDWMDyD8qW2Y9gRC1lC/sB60aHuVuPWuBWbhwbQcx67frV 4RODdijRjrH2O8IF793wnFMS73trkXFLRgsp1IsQIuILCUkrCkVhwOIdoYBs2Oc/22ev DQqMuKw2O/DPeBNwtXACJfQDgnLeYi20rhOMOn/bmET6u8S/CSWe+FzoDLLwgpubWg1q X4wj33y1yVut7MuWdVuqrEHvguln5SXM+I1yRcRh64Lcx1UF+v8oYem64pIdu9UeEfSR NGILCGqRentiyRcHzs0hmHbXhnccIc3PSkR/RJ1ChZsC7jZooAEkNR/c7qMb/rCHnYsX OkAw== 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=LIlbeZbmIqc+OvpJFgqDoVYWwjg8IfOzllJIGzBsLP8=; b=Er9n3j6VuC0y8n1Kj0+AQB+KLVBPhGSMAHUizBZVl4T0rSm7IRT0odUwUmI59NGqXE /u/edwPCC47Ok591Rk6DhGbSHryUaXBQMalcxxsEGvyjwdO2mcItNMQDDp2vTykChJo8 g9d9iiFbBooyLJ2IcaFE8Kz6kiYgN8BDhSqRaa504jpWKnq9LoRG8suV17IWJZrL7cuO TUsHSDU4MAtyUBHIsu781UFBi3rGLVmM7SlvkUW3gJjfoqjXPjrhfiRlG/n+hbEoP3VH RA7arVAz9Fh61mxW7P1q4oUf3Mqtevy3+xqV9eIKvXxsUV1u+YdTb0OMqRLU/3oy9ymA EdJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=eESfZuz1; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id p33si1650804pld.547.2017.09.20.10.28.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 10:28:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=eESfZuz1; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 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 A2A6A21D046AB; Wed, 20 Sep 2017 10:25:05 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received: from mail-wm0-x22e.google.com (mail-wm0-x22e.google.com [IPv6:2a00:1450:400c:c09::22e]) (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 3E86021D046AB for ; Wed, 20 Sep 2017 10:25:04 -0700 (PDT) Received: by mail-wm0-x22e.google.com with SMTP id 13so9222322wmq.2 for ; Wed, 20 Sep 2017 10:28:10 -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=8Klr0NHp9aoK3ME5zcaC+M1Bc0bOjoxhww4xMkDzfT0=; b=eESfZuz1l1bqNJC3MUfKb5y4CFR/DkG7NeEc6H3ZWPxjZzH1UM9D3TzXulA2v5zPob cEuNZB00qA/eWvCsmafBRshnWoqwTB/KJznwrtDGjpDe3JbX8qK5N5qQMe6Cq2Q/plrQ djCU/Xp6zvzAzN0oWJmAyunMJhOHJu4ZGzPbo= 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=8Klr0NHp9aoK3ME5zcaC+M1Bc0bOjoxhww4xMkDzfT0=; b=n/DAcl9ynIa6961q5Q6Ab2Ks/Exao4ovte0PHVmqvsBQzgz9SekHAFv0qHGtPwBZOr i+Y2g8CEDvfBw8pRgWRldvlxpW6bMM+zH+eTXDUjJcnNeaNCfoP1JAbCzlGYDP4fo/eB cIKoZNhQVXPHibCP9PMX9q8I5LQigWK5gD4F/xGMX7MFTuKSxPOHHBT+NaHjFK9pB/Hk OVhAGH99Zx5f5hhnSMh+h4R2kH7v90ff6YydiX2O0vt7KtAQb0vEscWGlHayclSVbdmk W26B1UmrhDCnJW9tp2NohZQ3Sw9scZKdjprNts48wvYyPM+M5Bun4nt4dEhXrWlkF5o6 XAzg== X-Gm-Message-State: AHPjjUiEapogw4F4qU/huGRl0jYnBt5Ler1csXQbBfSYtAsMIFmEWC4H hf3NKX0hQEqOTsNs5NGzq4CeKwf+Agg= X-Google-Smtp-Source: AOwi7QAl+1UNUFtq7d6CiHiHQ0GiPc5OWWGsHnn38LGpuqf4vSBNXaiaw1smHvmlIsBSHaDOox7Idw== X-Received: by 10.28.65.213 with SMTP id o204mr4760892wma.139.1505928488510; Wed, 20 Sep 2017 10:28:08 -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.28.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Sep 2017 10:28:07 -0700 (PDT) From: Leif Lindholm To: edk2-devel@lists.01.org Date: Wed, 20 Sep 2017 18:27:55 +0100 Message-Id: <20170920172755.22767-7-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 6/6] OvmfPkg: use ConfigPkg for common security 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 Ovmf platforms by including ConfigPkg/Security/Security.{dsc|fdf}.inc. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Leif Lindholm --- OvmfPkg/OvmfPkgIa32.dsc | 25 ++++--------------------- OvmfPkg/OvmfPkgIa32.fdf | 4 +--- OvmfPkg/OvmfPkgIa32X64.dsc | 23 +++-------------------- OvmfPkg/OvmfPkgIa32X64.fdf | 4 +--- OvmfPkg/OvmfPkgX64.dsc | 25 ++++--------------------- OvmfPkg/OvmfPkgX64.fdf | 4 +--- 6 files changed, 14 insertions(+), 71 deletions(-) -- 2.11.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 99175155a2..c450733d7c 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -36,8 +36,8 @@ # DEFINE CONFIG_HTTP_BOOT_ENABLE = FALSE DEFINE CONFIG_NETWORK_IP6_ENABLE = FALSE + DEFINE CONFIG_SECURE_BOOT_ENABLE = FALSE DEFINE CONFIG_TLS_ENABLE = FALSE - DEFINE SECURE_BOOT_ENABLE = FALSE DEFINE SMM_REQUIRE = FALSE # @@ -60,6 +60,7 @@ !endif !include ConfigPkg/Network/Network.dsc.inc +!include ConfigPkg/Security/Security.dsc.inc [BuildOptions] GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG @@ -164,13 +165,8 @@ IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf -!if $(SECURE_BOOT_ENABLE) == TRUE +!if $(CONFIG_SECURE_BOOT_ENABLE) == TRUE PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf - AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf -!else - TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf - AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf !endif VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf @@ -460,7 +456,7 @@ gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000 !endif -!if $(SECURE_BOOT_ENABLE) == TRUE +!if $(CONFIG_SECURE_BOOT_ENABLE) == TRUE gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 !endif @@ -585,15 +581,6 @@ MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf -!if $(SECURE_BOOT_ENABLE) == TRUE - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { - - NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf - } -!else - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -!endif - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf @@ -759,10 +746,6 @@ } !endif -!if $(SECURE_BOOT_ENABLE) == TRUE - SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf -!endif - OvmfPkg/PlatformDxe/Platform.inf OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 68438afc13..dfe4e78568 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -230,9 +230,7 @@ INF OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf INF OvmfPkg/XenBusDxe/XenBusDxe.inf INF OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf -!if $(SECURE_BOOT_ENABLE) == TRUE - INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf -!endif +!include ConfigPkg/Security/Security.fdf.inc INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index 0e4c86d5bc..106de22bdc 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -36,8 +36,8 @@ # DEFINE CONFIG_HTTP_BOOT_ENABLE = FALSE DEFINE CONFIG_NETWORK_IP6_ENABLE = FALSE + DEFINE CONFIG_SECURE_BOOT_ENABLE = FALSE DEFINE CONFIG_TLS_ENABLE = FALSE - DEFINE SECURE_BOOT_ENABLE = FALSE DEFINE SMM_REQUIRE = FALSE # @@ -60,6 +60,7 @@ !endif !include ConfigPkg/Network/Network.dsc.inc +!include ConfigPkg/Security/Security.dsc.inc [BuildOptions] GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG @@ -171,11 +172,6 @@ !if $(SECURE_BOOT_ENABLE) == TRUE PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf - AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf -!else - TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf - AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf !endif VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf @@ -466,7 +462,7 @@ gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000 !endif -!if $(SECURE_BOOT_ENABLE) == TRUE +!if $(CONFIG_SECURE_BOOT_ENABLE) == TRUE gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 !endif @@ -594,15 +590,6 @@ MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf -!if $(SECURE_BOOT_ENABLE) == TRUE - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { - - NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf - } -!else - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -!endif - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf @@ -768,10 +755,6 @@ } !endif -!if $(SECURE_BOOT_ENABLE) == TRUE - SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf -!endif - OvmfPkg/PlatformDxe/Platform.inf OvmfPkg/AmdSevDxe/AmdSevDxe.inf OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index ec91c0b74a..51846f3e1b 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -231,9 +231,7 @@ INF OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf INF OvmfPkg/XenBusDxe/XenBusDxe.inf INF OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf -!if $(SECURE_BOOT_ENABLE) == TRUE - INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf -!endif +!include ConfigPkg/Security/Security.fdf.inc INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 8a600f8051..0564936d2b 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -36,8 +36,8 @@ # DEFINE CONFIG_HTTP_BOOT_ENABLE = FALSE DEFINE CONFIG_NETWORK_IP6_ENABLE = FALSE + DEFINE CONFIG_SECURE_BOOT_ENABLE = FALSE DEFINE CONFIG_TLS_ENABLE = FALSE - DEFINE SECURE_BOOT_ENABLE = FALSE DEFINE SMM_REQUIRE = FALSE # @@ -60,6 +60,7 @@ !endif !include ConfigPkg/Network/Network.dsc.inc +!include ConfigPkg/Security/Security.dsc.inc [BuildOptions] GCC:*_UNIXGCC_*_CC_FLAGS = -DMDEPKG_NDEBUG @@ -169,13 +170,8 @@ IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf -!if $(SECURE_BOOT_ENABLE) == TRUE +!if $(CONFIG_SECURE_BOOT_ENABLE) == TRUE PlatformSecureLib|OvmfPkg/Library/PlatformSecureLib/PlatformSecureLib.inf - TpmMeasurementLib|SecurityPkg/Library/DxeTpmMeasurementLib/DxeTpmMeasurementLib.inf - AuthVariableLib|SecurityPkg/Library/AuthVariableLib/AuthVariableLib.inf -!else - TpmMeasurementLib|MdeModulePkg/Library/TpmMeasurementLibNull/TpmMeasurementLibNull.inf - AuthVariableLib|MdeModulePkg/Library/AuthVariableLibNull/AuthVariableLibNull.inf !endif VarCheckLib|MdeModulePkg/Library/VarCheckLib/VarCheckLib.inf @@ -465,7 +461,7 @@ gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStackSize|0x4000 !endif -!if $(SECURE_BOOT_ENABLE) == TRUE +!if $(CONFIG_SECURE_BOOT_ENABLE) == TRUE gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 !endif @@ -592,15 +588,6 @@ MdeModulePkg/Core/RuntimeDxe/RuntimeDxe.inf -!if $(SECURE_BOOT_ENABLE) == TRUE - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { - - NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificationLib.inf - } -!else - MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf -!endif - MdeModulePkg/Universal/EbcDxe/EbcDxe.inf PcAtChipsetPkg/8259InterruptControllerDxe/8259.inf UefiCpuPkg/CpuIo2Dxe/CpuIo2Dxe.inf @@ -766,10 +753,6 @@ } !endif -!if $(SECURE_BOOT_ENABLE) == TRUE - SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf -!endif - OvmfPkg/PlatformDxe/Platform.inf OvmfPkg/AmdSevDxe/AmdSevDxe.inf OvmfPkg/IoMmuDxe/IoMmuDxe.inf diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index be22048f66..97b93bfba4 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -231,9 +231,7 @@ INF OvmfPkg/XenIoPciDxe/XenIoPciDxe.inf INF OvmfPkg/XenBusDxe/XenBusDxe.inf INF OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.inf -!if $(SECURE_BOOT_ENABLE) == TRUE - INF SecurityPkg/VariableAuthenticated/SecureBootConfigDxe/SecureBootConfigDxe.inf -!endif +!include ConfigPkg/Security/Security.fdf.inc INF MdeModulePkg/Universal/WatchdogTimerDxe/WatchdogTimer.inf INF MdeModulePkg/Universal/MonotonicCounterRuntimeDxe/MonotonicCounterRuntimeDxe.inf