From nobody Thu Apr 25 08:08:19 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-