From nobody Fri Apr 26 18:22:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+96895+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+96895+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1669986343; cv=none; d=zohomail.com; s=zohoarc; b=gp1Q366v+VnhOBTCmv0ikRZd1opMh4IFCZaTQDGy0k4wMpyIefdhnUMHFdr47cEE3dA7X4HuS3vZINJeGOdGZ7QRqn9erRS1T4A+CsZpFgQ5IMH9Fz1FpL4XyEiFtoxo4VeQ058ASl6POmzAPtg5m1FhsQFvJxrlpH/GlbSBVbw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669986343; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Kfi4657NooTc1X7eIPnUK62OEeJsLAr7GZ412Ii+zyQ=; b=NEd/QP5udsGBL5xtZmPjQN2IqE2QNwSyIsPFxZELCyaX6tujTVsIJd4017qnm6WwT7YV/3XljyLT2DjrpPeTl8hmQLnt+dDQl39qemt5CK2gNmBmHoNU3PST30Uc9BeAW3FIsFJXM6jDw9C4i0eogkSTN6rqsfkAZTIytNZ5jQ0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+96895+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1669986343088656.9648138955517; Fri, 2 Dec 2022 05:05:43 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id lCzIYY1788612x8xZ8xTBj3n; Fri, 02 Dec 2022 05:05:42 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.74323.1669986340962288271 for ; Fri, 02 Dec 2022 05:05:41 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-209-33s4XF8NMe68zLZ6wS43Og-1; Fri, 02 Dec 2022 08:05:39 -0500 X-MC-Unique: 33s4XF8NMe68zLZ6wS43Og-1 X-Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 44DD0806001; Fri, 2 Dec 2022 13:05:38 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8EC8A40C8468; Fri, 2 Dec 2022 13:05:36 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 4FF47180127E; Fri, 2 Dec 2022 14:05:33 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Anthony Perard , Jordan Justen , Min Xu , Sebastien Boeuf , Ard Biesheuvel , Rebecca Cran , Julien Grall , James Bottomley , Tom Lendacky , Erdem Aktas , Gerd Hoffmann , Jiewen Yao , Brijesh Singh , Pawel Polawski , Peter Grehan , Oliver Steffen Subject: [edk2-devel] [PATCH 1/3] OvmfPkg: move dsc and fdf include snippets for TPM support to inc subdir Date: Fri, 2 Dec 2022 14:05:31 +0100 Message-Id: <20221202130533.3187383-2-kraxel@redhat.com> In-Reply-To: <20221202130533.3187383-1-kraxel@redhat.com> References: <20221202130533.3187383-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: DgnMX6VN5HHMCRVXayjrmI68x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1669986342; bh=Z/pdommgmDqPfx4mfCv5/la6Co0O7+F4GTEElBAz9L4=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=fPNyHj4qG6I7XmXLJIu3wPFbFVXGOhkbxoxLYWE7CHjy6OmJYwbUb6I9RPaGNSmf5Lf UhwtOy/28SVf0RY5APKc3TL+Jm5iR7ZyREC+aIKX+Wu6DA3zYHsp8B3jhqbkiTfw/u/Ak 7WvmxYQVSss1xSJnjc7MbluFN2wKzNoqfmM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1669986343797100002 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Gerd Hoffmann --- OvmfPkg/{ =3D> inc}/OvmfTpmComponentsDxe.dsc.inc | 0 OvmfPkg/{ =3D> inc}/OvmfTpmComponentsPei.dsc.inc | 0 OvmfPkg/{ =3D> inc}/OvmfTpmDefines.dsc.inc | 0 OvmfPkg/{ =3D> inc}/OvmfTpmLibs.dsc.inc | 0 OvmfPkg/{ =3D> inc}/OvmfTpmPcds.dsc.inc | 0 OvmfPkg/{ =3D> inc}/OvmfTpmPcdsHii.dsc.inc | 0 OvmfPkg/{ =3D> inc}/OvmfTpmSecurityStub.dsc.inc | 0 OvmfPkg/AmdSev/AmdSevX64.dsc | 14 +++++++------- OvmfPkg/CloudHv/CloudHvX64.dsc | 14 +++++++------- OvmfPkg/Microvm/MicrovmX64.dsc | 2 +- OvmfPkg/OvmfPkgIa32.dsc | 14 +++++++------- OvmfPkg/OvmfPkgIa32X64.dsc | 14 +++++++------- OvmfPkg/OvmfPkgX64.dsc | 14 +++++++------- OvmfPkg/AmdSev/AmdSevX64.fdf | 4 ++-- OvmfPkg/CloudHv/CloudHvX64.fdf | 4 ++-- OvmfPkg/OvmfPkgIa32.fdf | 4 ++-- OvmfPkg/OvmfPkgIa32X64.fdf | 4 ++-- OvmfPkg/OvmfPkgX64.fdf | 4 ++-- OvmfPkg/{ =3D> inc}/OvmfTpmDxe.fdf.inc | 0 OvmfPkg/{ =3D> inc}/OvmfTpmPei.fdf.inc | 0 20 files changed, 46 insertions(+), 46 deletions(-) rename OvmfPkg/{ =3D> inc}/OvmfTpmComponentsDxe.dsc.inc (100%) rename OvmfPkg/{ =3D> inc}/OvmfTpmComponentsPei.dsc.inc (100%) rename OvmfPkg/{ =3D> inc}/OvmfTpmDefines.dsc.inc (100%) rename OvmfPkg/{ =3D> inc}/OvmfTpmLibs.dsc.inc (100%) rename OvmfPkg/{ =3D> inc}/OvmfTpmPcds.dsc.inc (100%) rename OvmfPkg/{ =3D> inc}/OvmfTpmPcdsHii.dsc.inc (100%) rename OvmfPkg/{ =3D> inc}/OvmfTpmSecurityStub.dsc.inc (100%) rename OvmfPkg/{ =3D> inc}/OvmfTpmDxe.fdf.inc (100%) rename OvmfPkg/{ =3D> inc}/OvmfTpmPei.fdf.inc (100%) diff --git a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc b/OvmfPkg/inc/OvmfTpmComp= onentsDxe.dsc.inc similarity index 100% rename from OvmfPkg/OvmfTpmComponentsDxe.dsc.inc rename to OvmfPkg/inc/OvmfTpmComponentsDxe.dsc.inc diff --git a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc b/OvmfPkg/inc/OvmfTpmComp= onentsPei.dsc.inc similarity index 100% rename from OvmfPkg/OvmfTpmComponentsPei.dsc.inc rename to OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc diff --git a/OvmfPkg/OvmfTpmDefines.dsc.inc b/OvmfPkg/inc/OvmfTpmDefines.ds= c.inc similarity index 100% rename from OvmfPkg/OvmfTpmDefines.dsc.inc rename to OvmfPkg/inc/OvmfTpmDefines.dsc.inc diff --git a/OvmfPkg/OvmfTpmLibs.dsc.inc b/OvmfPkg/inc/OvmfTpmLibs.dsc.inc similarity index 100% rename from OvmfPkg/OvmfTpmLibs.dsc.inc rename to OvmfPkg/inc/OvmfTpmLibs.dsc.inc diff --git a/OvmfPkg/OvmfTpmPcds.dsc.inc b/OvmfPkg/inc/OvmfTpmPcds.dsc.inc similarity index 100% rename from OvmfPkg/OvmfTpmPcds.dsc.inc rename to OvmfPkg/inc/OvmfTpmPcds.dsc.inc diff --git a/OvmfPkg/OvmfTpmPcdsHii.dsc.inc b/OvmfPkg/inc/OvmfTpmPcdsHii.ds= c.inc similarity index 100% rename from OvmfPkg/OvmfTpmPcdsHii.dsc.inc rename to OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc diff --git a/OvmfPkg/OvmfTpmSecurityStub.dsc.inc b/OvmfPkg/inc/OvmfTpmSecur= ityStub.dsc.inc similarity index 100% rename from OvmfPkg/OvmfTpmSecurityStub.dsc.inc rename to OvmfPkg/inc/OvmfTpmSecurityStub.dsc.inc diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index 8f7cae787e97..3c32c27095e0 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.dsc +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc @@ -33,7 +33,7 @@ [Defines] # DEFINE SOURCE_DEBUG_ENABLE =3D FALSE =20 -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/inc/OvmfTpmDefines.dsc.inc =20 # # Shell can be useful for debugging but should not be enabled for produc= tion @@ -200,7 +200,7 @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf =20 -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/inc/OvmfTpmLibs.dsc.inc =20 [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -527,12 +527,12 @@ [PcdsDynamicDefault] # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 =20 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcds.dsc.inc =20 gEfiMdePkgTokenSpaceGuid.PcdFSBClock|1000000000 =20 [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc =20 ##########################################################################= ###### # @@ -573,7 +573,7 @@ [Components] UefiCpuPkg/CpuMpPei/CpuMpPei.inf OvmfPkg/AmdSev/SecretPei/SecretPei.inf =20 -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc =20 # # DXE Phase modules @@ -595,7 +595,7 @@ [Components] =20 MdeModulePkg/Universal/SecurityStubDxe/SecurityStubDxe.inf { -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/inc/OvmfTpmSecurityStub.dsc.inc } =20 MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -766,4 +766,4 @@ [Components] # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsDxe.dsc.inc diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc index ce277cb2398b..79a73a63099f 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -33,7 +33,7 @@ [Defines] DEFINE SMM_REQUIRE =3D FALSE DEFINE SOURCE_DEBUG_ENABLE =3D FALSE =20 -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/inc/OvmfTpmDefines.dsc.inc =20 # # Network definition @@ -247,7 +247,7 @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf =20 -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/inc/OvmfTpmLibs.dsc.inc =20 [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -630,7 +630,7 @@ [PcdsDynamicDefault] =20 gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 =20 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcds.dsc.inc =20 # IPv4 and IPv6 PXE Boot support. gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 @@ -640,7 +640,7 @@ [PcdsDynamicDefault] gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 =20 [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc =20 ##########################################################################= ###### # @@ -690,7 +690,7 @@ [Components] !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc =20 # # DXE Phase modules @@ -714,7 +714,7 @@ [Components] !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificatio= nLib.inf -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/inc/OvmfTpmSecurityStub.dsc.inc !endif } =20 @@ -945,4 +945,4 @@ [Components] # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsDxe.dsc.inc diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index 994a02d30107..49c77ecf32e3 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -703,7 +703,7 @@ [Components] !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificatio= nLib.inf -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/inc/OvmfTpmSecurityStub.dsc.inc !endif } =20 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 6f774baf90f5..ba41816de4c9 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -34,7 +34,7 @@ [Defines] DEFINE SOURCE_DEBUG_ENABLE =3D FALSE DEFINE LOAD_X64_ON_IA32_ENABLE =3D FALSE =20 -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/inc/OvmfTpmDefines.dsc.inc =20 # # Shell can be useful for debugging but should not be enabled for produc= tion @@ -252,7 +252,7 @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf =20 -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/inc/OvmfTpmLibs.dsc.inc =20 [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -657,7 +657,7 @@ [PcdsDynamicDefault] =20 gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 =20 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcds.dsc.inc =20 # IPv4 and IPv6 PXE Boot support. gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 @@ -671,7 +671,7 @@ [PcdsDynamicDefault] !endif =20 [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc =20 ##########################################################################= ###### # @@ -721,7 +721,7 @@ [Components] !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc =20 # # DXE Phase modules @@ -746,7 +746,7 @@ [Components] !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificatio= nLib.inf !endif -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/inc/OvmfTpmSecurityStub.dsc.inc } =20 MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -1014,7 +1014,7 @@ [Components] # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsDxe.dsc.inc =20 !if $(LOAD_X64_ON_IA32_ENABLE) =3D=3D TRUE OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index c851764dec05..c26d6a353849 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -33,7 +33,7 @@ [Defines] DEFINE SMM_REQUIRE =3D FALSE DEFINE SOURCE_DEBUG_ENABLE =3D FALSE =20 -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/inc/OvmfTpmDefines.dsc.inc =20 # # Shell can be useful for debugging but should not be enabled for produc= tion @@ -256,7 +256,7 @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf =20 -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/inc/OvmfTpmLibs.dsc.inc =20 [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -669,7 +669,7 @@ [PcdsDynamicDefault] =20 gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 =20 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcds.dsc.inc =20 # Set ConfidentialComputing defaults gEfiMdePkgTokenSpaceGuid.PcdConfidentialComputingGuestAttr|0 @@ -684,7 +684,7 @@ [PcdsDynamicDefault.X64] gEfiNetworkPkgTokenSpaceGuid.PcdIPv6PXESupport|0x01 =20 [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc =20 ##########################################################################= ###### # @@ -734,7 +734,7 @@ [Components.IA32] !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc =20 [Components.X64] # @@ -760,7 +760,7 @@ [Components.X64] !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificatio= nLib.inf !endif -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/inc/OvmfTpmSecurityStub.dsc.inc } =20 MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -1032,4 +1032,4 @@ [Components.X64] # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsDxe.dsc.inc diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 63c3a47aea30..dc213ca3c1f9 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -33,7 +33,7 @@ [Defines] DEFINE SMM_REQUIRE =3D FALSE DEFINE SOURCE_DEBUG_ENABLE =3D FALSE =20 -!include OvmfPkg/OvmfTpmDefines.dsc.inc +!include OvmfPkg/inc/OvmfTpmDefines.dsc.inc =20 # # Shell can be useful for debugging but should not be enabled for produc= tion @@ -272,7 +272,7 @@ [LibraryClasses] SmbusLib|MdePkg/Library/BaseSmbusLibNull/BaseSmbusLibNull.inf OrderedCollectionLib|MdePkg/Library/BaseOrderedCollectionRedBlackTreeLib= /BaseOrderedCollectionRedBlackTreeLib.inf =20 -!include OvmfPkg/OvmfTpmLibs.dsc.inc +!include OvmfPkg/inc/OvmfTpmLibs.dsc.inc =20 [LibraryClasses.common] BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf @@ -693,7 +693,7 @@ [PcdsDynamicDefault] =20 gEfiSecurityPkgTokenSpaceGuid.PcdOptionRomImageVerificationPolicy|0x00 =20 -!include OvmfPkg/OvmfTpmPcds.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcds.dsc.inc =20 # IPv4 and IPv6 PXE Boot support. gEfiNetworkPkgTokenSpaceGuid.PcdIPv4PXESupport|0x01 @@ -707,7 +707,7 @@ [PcdsDynamicDefault] !endif =20 [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/inc/OvmfTpmPcdsHii.dsc.inc =20 ##########################################################################= ###### # @@ -780,7 +780,7 @@ [Components] NULL|OvmfPkg/Library/MpInitLibDepLib/PeiMpInitLibUpDepLib.inf } =20 -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsPei.dsc.inc =20 # # DXE Phase modules @@ -804,7 +804,7 @@ [Components] !if $(SECURE_BOOT_ENABLE) =3D=3D TRUE NULL|SecurityPkg/Library/DxeImageVerificationLib/DxeImageVerificatio= nLib.inf -!include OvmfPkg/OvmfTpmSecurityStub.dsc.inc +!include OvmfPkg/inc/OvmfTpmSecurityStub.dsc.inc !endif } =20 @@ -1102,4 +1102,4 @@ [Components] # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/inc/OvmfTpmComponentsDxe.dsc.inc diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf index 4658e1d30ed0..bd23888e819f 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -162,7 +162,7 @@ [FV.PEIFV] INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf INF OvmfPkg/AmdSev/SecretPei/SecretPei.inf =20 -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/inc/OvmfTpmPei.fdf.inc =20 ##########################################################################= ###### =20 @@ -316,7 +316,7 @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/inc/OvmfTpmDxe.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf index a41a5536933d..23296f4bfeae 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.fdf +++ b/OvmfPkg/CloudHv/CloudHvX64.fdf @@ -168,7 +168,7 @@ [FV.PEIFV] !endif INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/inc/OvmfTpmPei.fdf.inc =20 ##########################################################################= ###### =20 @@ -343,7 +343,7 @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/inc/OvmfTpmDxe.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 7023ade8cebe..0b0c18674727 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -172,7 +172,7 @@ [FV.PEIFV] !endif INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/inc/OvmfTpmPei.fdf.inc =20 ##########################################################################= ###### =20 @@ -371,7 +371,7 @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/inc/OvmfTpmDxe.fdf.inc =20 !if $(LOAD_X64_ON_IA32_ENABLE) =3D=3D TRUE INF OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 80de4fa2c0df..4ed3a4f9d72b 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -172,7 +172,7 @@ [FV.PEIFV] !endif INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/inc/OvmfTpmPei.fdf.inc =20 ##########################################################################= ###### =20 @@ -378,7 +378,7 @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/inc/OvmfTpmDxe.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index c0f5a1ef3c30..d0744c463da4 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -188,7 +188,7 @@ [FV.PEIFV] INF UefiCpuPkg/CpuMpPei/CpuMpPei.inf INF FILE_GUID =3D $(UP_CPU_PEI_GUID) UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 -!include OvmfPkg/OvmfTpmPei.fdf.inc +!include OvmfPkg/inc/OvmfTpmPei.fdf.inc =20 ##########################################################################= ###### =20 @@ -405,7 +405,7 @@ [FV.DXEFV] # # TPM support # -!include OvmfPkg/OvmfTpmDxe.fdf.inc +!include OvmfPkg/inc/OvmfTpmDxe.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfTpmDxe.fdf.inc b/OvmfPkg/inc/OvmfTpmDxe.fdf.inc similarity index 100% rename from OvmfPkg/OvmfTpmDxe.fdf.inc rename to OvmfPkg/inc/OvmfTpmDxe.fdf.inc diff --git a/OvmfPkg/OvmfTpmPei.fdf.inc b/OvmfPkg/inc/OvmfTpmPei.fdf.inc similarity index 100% rename from OvmfPkg/OvmfTpmPei.fdf.inc rename to OvmfPkg/inc/OvmfTpmPei.fdf.inc --=20 2.38.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#96895): https://edk2.groups.io/g/devel/message/96895 Mute This Topic: https://groups.io/mt/95405110/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 18:22:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+96898+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+96898+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1669986347; cv=none; d=zohomail.com; s=zohoarc; b=XDFFAJVyxgSyLB1zh/BJwee88GzLvQkUdoAojeGhsxeWBgzljpTokOk6g6ibHlAJvDUrl4jpfYPd/CcYqa+k5cfzUFhwgm+uMByMzP1V9GE8s2mjDqRmtHKnxbGt6p8D23kL5WGTFTYrrTp7gkuVA9XBZHpfQvBPgvp+tjU8FHI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669986347; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=ObWmjZCGjI1Ewr8VhHldOilKs9YNxRdHll4K7x8X4NM=; b=URcWBbeUIDJ5F2pumVFuJRGzckx4uWq5aXjR8v76Re4ZsJB9UI9NxRSghXShBlV7rf6lOkHevjQ6biKBTAIxXQ/O6sfiVN5/lcEClaMZy/Sy7OiSjJeQksM3kxCfUhyAbnyIqV4UC32nsjQCAYZmCplp1YHRWXSxLdrLHGq1xvk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+96898+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1669986347301377.66891375079035; Fri, 2 Dec 2022 05:05:47 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id NId4YY1788612x58LGTOJeo2; Fri, 02 Dec 2022 05:05:46 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.74326.1669986346119041912 for ; Fri, 02 Dec 2022 05:05:46 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-133-aqzRsd1WPXa-e4W-QKjOJg-1; Fri, 02 Dec 2022 08:05:42 -0500 X-MC-Unique: aqzRsd1WPXa-e4W-QKjOJg-1 X-Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 8D0EF800159; Fri, 2 Dec 2022 13:05:41 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4E9FA4EA61; Fri, 2 Dec 2022 13:05:41 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 55A00180127F; Fri, 2 Dec 2022 14:05:33 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Anthony Perard , Jordan Justen , Min Xu , Sebastien Boeuf , Ard Biesheuvel , Rebecca Cran , Julien Grall , James Bottomley , Tom Lendacky , Erdem Aktas , Gerd Hoffmann , Jiewen Yao , Brijesh Singh , Pawel Polawski , Peter Grehan , Oliver Steffen Subject: [edk2-devel] [PATCH 2/3] OvmfPkg: move dsc include snippet for Network support to inc subdir Date: Fri, 2 Dec 2022 14:05:32 +0100 Message-Id: <20221202130533.3187383-3-kraxel@redhat.com> In-Reply-To: <20221202130533.3187383-1-kraxel@redhat.com> References: <20221202130533.3187383-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: bADAsMDMshHFvsh37ToRU1Mtx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1669986346; bh=kuDHBdXvDAAkgLlz06xO9FaJGwrq7lObCXfv8WWLL1Q=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=b38UaZWtwg2MqiiKjqDsXLxFG+elDyUQZ0s2/4PB299f22zy4eiO7AGz8xLKrQ14y1U eZ8Ot4g2oh4E7Ml+8NPtkkLJJDBMCxUPwQkJueUGPAMXwQJH3UOIkNd+1KyqLgLnQYeem Bdq+9M70ayZ6ePNcp7LhVlMMSOOjICI9km8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1669986347727100008 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Gerd Hoffmann --- OvmfPkg/{ =3D> inc}/NetworkComponents.dsc.inc | 0 OvmfPkg/CloudHv/CloudHvX64.dsc | 2 +- OvmfPkg/Microvm/MicrovmX64.dsc | 2 +- OvmfPkg/OvmfPkgIa32.dsc | 2 +- OvmfPkg/OvmfPkgIa32X64.dsc | 2 +- OvmfPkg/OvmfPkgX64.dsc | 2 +- 6 files changed, 5 insertions(+), 5 deletions(-) rename OvmfPkg/{ =3D> inc}/NetworkComponents.dsc.inc (100%) diff --git a/OvmfPkg/NetworkComponents.dsc.inc b/OvmfPkg/inc/NetworkCompone= nts.dsc.inc similarity index 100% rename from OvmfPkg/NetworkComponents.dsc.inc rename to OvmfPkg/inc/NetworkComponents.dsc.inc diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc index 79a73a63099f..9bb7b8043544 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.dsc +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc @@ -827,7 +827,7 @@ [Components] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/inc/NetworkComponents.dsc.inc =20 OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index 49c77ecf32e3..abcefb8824f0 100644 --- a/OvmfPkg/Microvm/MicrovmX64.dsc +++ b/OvmfPkg/Microvm/MicrovmX64.dsc @@ -817,7 +817,7 @@ [Components] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/inc/NetworkComponents.dsc.inc =20 OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index ba41816de4c9..f27e9634ec62 100644 --- a/OvmfPkg/OvmfPkgIa32.dsc +++ b/OvmfPkg/OvmfPkgIa32.dsc @@ -879,7 +879,7 @@ [Components] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/inc/NetworkComponents.dsc.inc =20 OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index c26d6a353849..631014cd60a3 100644 --- a/OvmfPkg/OvmfPkgIa32X64.dsc +++ b/OvmfPkg/OvmfPkgIa32X64.dsc @@ -893,7 +893,7 @@ [Components.X64] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/inc/NetworkComponents.dsc.inc =20 OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index dc213ca3c1f9..12de436a7910 100644 --- a/OvmfPkg/OvmfPkgX64.dsc +++ b/OvmfPkg/OvmfPkgX64.dsc @@ -961,7 +961,7 @@ [Components] # Network Support # !include NetworkPkg/NetworkComponents.dsc.inc -!include OvmfPkg/NetworkComponents.dsc.inc +!include OvmfPkg/inc/NetworkComponents.dsc.inc =20 OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 --=20 2.38.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#96898): https://edk2.groups.io/g/devel/message/96898 Mute This Topic: https://groups.io/mt/95405114/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri Apr 26 18:22:05 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+96897+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+96897+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1669986346; cv=none; d=zohomail.com; s=zohoarc; b=dE9bnqTmRAr6u/r7u9hVPrSbZCGpQkDmDTTxD3DEx7V5wUomALVyd8HibrlIW6SUK+dw3gCSqAmzDFZEdSapLimOh99WrbZ+d3yNMvUFIynvapm709DdeNlHQbRpdSv01Jul0Y/5eFjY2wnRG6GEsmnnJZI/r4XrUGS5/mxnO3Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1669986346; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=EYsm9czmCbA6PPZDCOePTRdee4mmiYxHL99PPGPuhrc=; b=hSE8f8vSoX99Q78fFclpjNotXMEFJGQjHSsntVCQRKJEWjMHE3j38+N1QNmXdd1Uz15zNyuCUd9k6Hh7TLa9Zphf953MDPH8Us65NvNDFuYm9E5WgSQHbI/ZhlDQR92/xySDR99Sk5hhE3strkPfjF/9tBi49/umUV+LvtTbum0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+96897+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1669986346842802.3690597559556; Fri, 2 Dec 2022 05:05:46 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id GUCMYY1788612xoQ6eNHH741; Fri, 02 Dec 2022 05:05:46 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.74325.1669986345713347229 for ; Fri, 02 Dec 2022 05:05:45 -0800 X-Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-147-MiY5VWaOPR60v3RMvuewyw-1; Fri, 02 Dec 2022 08:05:42 -0500 X-MC-Unique: MiY5VWaOPR60v3RMvuewyw-1 X-Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C8E76101A56C; Fri, 2 Dec 2022 13:05:41 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 630A7111E3FA; Fri, 2 Dec 2022 13:05:41 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 59F5E1801543; Fri, 2 Dec 2022 14:05:33 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Anthony Perard , Jordan Justen , Min Xu , Sebastien Boeuf , Ard Biesheuvel , Rebecca Cran , Julien Grall , James Bottomley , Tom Lendacky , Erdem Aktas , Gerd Hoffmann , Jiewen Yao , Brijesh Singh , Pawel Polawski , Peter Grehan , Oliver Steffen Subject: [edk2-devel] [PATCH 3/3] OvmfPkg: move fdf include snippets to inc subdirectory Date: Fri, 2 Dec 2022 14:05:33 +0100 Message-Id: <20221202130533.3187383-4-kraxel@redhat.com> In-Reply-To: <20221202130533.3187383-1-kraxel@redhat.com> References: <20221202130533.3187383-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,kraxel@redhat.com X-Gm-Message-State: PadrkdOsRQuILMFpkATtrctox1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1669986346; bh=WCaSU+2WJKoGykCaEpz/aCnjJ7FD02umzI6LSFvQ7ng=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=lgzrxlfE5iWuiqs+/yUodPd5oPtp25N6bPaqhEMvkMjq043EPHxRvck96dNfyJjZ7I3 IjCMJjrLx+x/rIbjtEx6jY8L2kahfAiCdrxYIMqsYD9eWGZRDRxqV0j4CGof92tFXxtdi i9VO0J/OeFBEnnDFd+c1CLAuhu2oVCAbnbs= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1669986347780100011 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Gerd Hoffmann --- OvmfPkg/AmdSev/AmdSevX64.fdf | 6 +++--- OvmfPkg/Bhyve/BhyveX64.fdf | 6 +++--- OvmfPkg/CloudHv/CloudHvX64.fdf | 2 +- OvmfPkg/IntelTdx/IntelTdxX64.fdf | 8 ++++---- OvmfPkg/Microvm/MicrovmX64.fdf | 6 +++--- OvmfPkg/OvmfPkgIa32.fdf | 8 ++++---- OvmfPkg/OvmfPkgIa32X64.fdf | 8 ++++---- OvmfPkg/OvmfPkgX64.fdf | 8 ++++---- OvmfPkg/OvmfXen.fdf | 8 ++++---- OvmfPkg/Include/WorkArea.h | 2 +- OvmfPkg/Sec/AmdSev.h | 2 +- OvmfPkg/Sec/AmdSev.c | 2 +- OvmfPkg/{ =3D> inc}/FvmainCompactScratchEnd.fdf.inc | 0 OvmfPkg/{ =3D> inc}/OvmfPkgDefines.fdf.inc | 0 OvmfPkg/{ =3D> inc}/VarStore.fdf.inc | 0 OvmfPkg/{ =3D> inc}/XenElfHeader.fdf.inc | 0 16 files changed, 33 insertions(+), 33 deletions(-) rename OvmfPkg/{ =3D> inc}/FvmainCompactScratchEnd.fdf.inc (100%) rename OvmfPkg/{ =3D> inc}/OvmfPkgDefines.fdf.inc (100%) rename OvmfPkg/{ =3D> inc}/VarStore.fdf.inc (100%) rename OvmfPkg/{ =3D> inc}/XenElfHeader.fdf.inc (100%) diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf index bd23888e819f..dc110bd5bc7b 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc =20 # # Build the variable store and the firmware code as one unified flash devi= ce @@ -24,7 +24,7 @@ [FD.OVMF] BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(FW_BLOCKS) =20 -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc =20 $(VARS_SIZE)|$(FVMAIN_SIZE) FV =3D FVMAIN_COMPACT @@ -351,7 +351,7 @@ [FV.FVMAIN_COMPACT] } } =20 -!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf index e8227f865f75..d22064967084 100644 --- a/OvmfPkg/Bhyve/BhyveX64.fdf +++ b/OvmfPkg/Bhyve/BhyveX64.fdf @@ -24,7 +24,7 @@ [FD.BHYVE] BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(FW_BLOCKS) =20 -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc =20 $(VARS_SIZE)|$(FVMAIN_SIZE) FV =3D FVMAIN_COMPACT @@ -43,7 +43,7 @@ [FD.BHYVE_VARS] BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(VARS_BLOCKS) =20 -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc =20 [FD.BHYVE_CODE] BaseAddress =3D $(CODE_BASE_ADDRESS) @@ -368,7 +368,7 @@ [FV.FVMAIN_COMPACT] } } =20 -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf index 23296f4bfeae..a45cfa050403 100644 --- a/OvmfPkg/CloudHv/CloudHvX64.fdf +++ b/OvmfPkg/CloudHv/CloudHvX64.fdf @@ -378,7 +378,7 @@ [FV.FVMAIN_COMPACT] } } =20 -!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.fdf b/OvmfPkg/IntelTdx/IntelTdxX6= 4.fdf index 6923eb883113..f594e88d62e7 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf +++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc =20 # # Build the variable store and the firmware code as one unified flash devi= ce @@ -24,7 +24,7 @@ [FD.OVMF] BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(FW_BLOCKS) =20 -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc =20 $(VARS_SIZE)|$(FVMAIN_SIZE) FV =3D FVMAIN_COMPACT @@ -43,7 +43,7 @@ [FD.OVMF_VARS] BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(VARS_BLOCKS) =20 -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc =20 [FD.OVMF_CODE] BaseAddress =3D $(CODE_BASE_ADDRESS) @@ -332,7 +332,7 @@ [FV.FVMAIN_COMPACT] } } =20 -# !include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +# !include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf index 380ba3a36883..a9a0944bb91d 100644 --- a/OvmfPkg/Microvm/MicrovmX64.fdf +++ b/OvmfPkg/Microvm/MicrovmX64.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc =20 # # Build the variable store and the firmware code as one unified flash devi= ce @@ -24,7 +24,7 @@ [FD.MICROVM] BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(FW_BLOCKS) =20 -!include OvmfPkg/VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc =20 $(VARS_SIZE)|$(FVMAIN_SIZE) FV =3D FVMAIN_COMPACT @@ -335,7 +335,7 @@ [FV.FVMAIN_COMPACT] } } =20 -!include OvmfPkg/FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 0b0c18674727..f4046321a8b5 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc =20 # # Build the variable store and the firmware code as one unified flash devi= ce @@ -24,7 +24,7 @@ [FD.OVMF] BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(FW_BLOCKS) =20 -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc =20 $(VARS_SIZE)|$(FVMAIN_SIZE) FV =3D FVMAIN_COMPACT @@ -43,7 +43,7 @@ [FD.OVMF_VARS] BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(VARS_BLOCKS) =20 -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc =20 [FD.OVMF_CODE] BaseAddress =3D $(CODE_BASE_ADDRESS) @@ -410,7 +410,7 @@ [FV.FVMAIN_COMPACT] } } =20 -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 4ed3a4f9d72b..e2a2c89f19b7 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc =20 # # Build the variable store and the firmware code as one unified flash devi= ce @@ -24,7 +24,7 @@ [FD.OVMF] BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(FW_BLOCKS) =20 -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc =20 $(VARS_SIZE)|$(FVMAIN_SIZE) FV =3D FVMAIN_COMPACT @@ -43,7 +43,7 @@ [FD.OVMF_VARS] BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(VARS_BLOCKS) =20 -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc =20 [FD.OVMF_CODE] BaseAddress =3D $(CODE_BASE_ADDRESS) @@ -413,7 +413,7 @@ [FV.FVMAIN_COMPACT] } } =20 -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index d0744c463da4..70f8e8b782da 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc =20 # # Build the variable store and the firmware code as one unified flash devi= ce @@ -24,7 +24,7 @@ [FD.OVMF] BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(FW_BLOCKS) =20 -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc =20 $(VARS_SIZE)|$(FVMAIN_SIZE) FV =3D FVMAIN_COMPACT @@ -43,7 +43,7 @@ [FD.OVMF_VARS] BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(VARS_BLOCKS) =20 -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc =20 [FD.OVMF_CODE] BaseAddress =3D $(CODE_BASE_ADDRESS) @@ -440,7 +440,7 @@ [FV.FVMAIN_COMPACT] } } =20 -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index 029b7dadcb25..63df9b54d4ad 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -12,7 +12,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/inc/OvmfPkgDefines.fdf.inc =20 # # This will allow the flash device image to be recognize as an ELF, with f= irst @@ -32,7 +32,7 @@ [FD.OVMF] 0x00000000|0x00040000 !endif =20 -!include XenElfHeader.fdf.inc +!include OvmfPkg/inc/XenElfHeader.fdf.inc =20 !if ($(FD_SIZE_IN_KB) =3D=3D 1024) || ($(FD_SIZE_IN_KB) =3D=3D 2048) 0x0000e000|0x00001000 @@ -86,7 +86,7 @@ [FD.OVMF_VARS] BlockSize =3D $(BLOCK_SIZE) NumBlocks =3D $(VARS_BLOCKS) =20 -!include VarStore.fdf.inc +!include OvmfPkg/inc/VarStore.fdf.inc =20 [FD.OVMF_CODE] BaseAddress =3D $(CODE_BASE_ADDRESS) @@ -388,7 +388,7 @@ [FV.FVMAIN_COMPACT] } } =20 -!include FvmainCompactScratchEnd.fdf.inc +!include OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/Include/WorkArea.h b/OvmfPkg/Include/WorkArea.h index bf56fc4a6f65..65a37df0f70a 100644 --- a/OvmfPkg/Include/WorkArea.h +++ b/OvmfPkg/Include/WorkArea.h @@ -21,7 +21,7 @@ // sizeof (CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER) // PcdOvmfConfidentialComputingWorkAreaHeader defined in: // OvmfPkg/OvmfPkg.dec -// OvmfPkg/OvmfPkgDefines.fdf.inc +// OvmfPkg/inc/OvmfPkgDefines.fdf.inc typedef struct _CONFIDENTIAL_COMPUTING_WORK_AREA_HEADER { UINT8 GuestType; UINT8 Reserved1[3]; diff --git a/OvmfPkg/Sec/AmdSev.h b/OvmfPkg/Sec/AmdSev.h index dffd2ceb9656..66ac6e67e3ba 100644 --- a/OvmfPkg/Sec/AmdSev.h +++ b/OvmfPkg/Sec/AmdSev.h @@ -71,7 +71,7 @@ SevEsIsEnabled ( /** Validate System RAM used for decompressing the PEI and DXE firmware volum= es when SEV-SNP is active. The PCDs SecValidatedStart and SecValidatedEnd are - set in OvmfPkg/FvmainCompactScratchEnd.fdf.inc. + set in OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc. =20 **/ VOID diff --git a/OvmfPkg/Sec/AmdSev.c b/OvmfPkg/Sec/AmdSev.c index 6af38aaf46ee..51c322b0ad22 100644 --- a/OvmfPkg/Sec/AmdSev.c +++ b/OvmfPkg/Sec/AmdSev.c @@ -284,7 +284,7 @@ SevEsIsEnabled ( /** Validate System RAM used for decompressing the PEI and DXE firmware volum= es when SEV-SNP is active. The PCDs SecValidatedStart and SecValidatedEnd are - set in OvmfPkg/FvmainCompactScratchEnd.fdf.inc. + set in OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc. =20 **/ VOID diff --git a/OvmfPkg/FvmainCompactScratchEnd.fdf.inc b/OvmfPkg/inc/FvmainCo= mpactScratchEnd.fdf.inc similarity index 100% rename from OvmfPkg/FvmainCompactScratchEnd.fdf.inc rename to OvmfPkg/inc/FvmainCompactScratchEnd.fdf.inc diff --git a/OvmfPkg/OvmfPkgDefines.fdf.inc b/OvmfPkg/inc/OvmfPkgDefines.fd= f.inc similarity index 100% rename from OvmfPkg/OvmfPkgDefines.fdf.inc rename to OvmfPkg/inc/OvmfPkgDefines.fdf.inc diff --git a/OvmfPkg/VarStore.fdf.inc b/OvmfPkg/inc/VarStore.fdf.inc similarity index 100% rename from OvmfPkg/VarStore.fdf.inc rename to OvmfPkg/inc/VarStore.fdf.inc diff --git a/OvmfPkg/XenElfHeader.fdf.inc b/OvmfPkg/inc/XenElfHeader.fdf.inc similarity index 100% rename from OvmfPkg/XenElfHeader.fdf.inc rename to OvmfPkg/inc/XenElfHeader.fdf.inc --=20 2.38.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#96897): https://edk2.groups.io/g/devel/message/96897 Mute This Topic: https://groups.io/mt/95405113/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-