From nobody Fri Apr 19 17:00:23 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+97182+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+97182+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1670591050; cv=none; d=zohomail.com; s=zohoarc; b=O67wVYyWpT9bOPpZdaSkWmt8B6dnSGIhCIivbGN6TXUa48nLLknKikoiDBL6uJD0OaVfWXyQfHTTPYbHl+X9ByIiIltkVCuyepo+BDq28axkvQzfUcimme73yLMKeeSg2uxftNP/jls2ZiLTAYr0sT7WfobyuLwWyVIsEPxgxnM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670591050; 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=dbjEAjCjOZDdccmAK02uQkgH/Xwj/p33kPb17Sup5sE=; b=PU1WD0TOQNHvSPHS2mUSVjBcdJyGOl6o1XRlec7raaadx6PNHyMYTuszmtrOSQxnqVgiQflLtOap1yKZtacp/VaoCElr3QcJVLqhilZPz1YLM5vAnSzhfr8S4v7NYXWf1FulGcVXPRigWojTq3L2blgljhNZ/9fq65D0nyuI4Fg= 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+97182+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 1670591050478347.0295751730921; Fri, 9 Dec 2022 05:04:10 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id ArREYY1788612xpWOYl6h9N5; Fri, 09 Dec 2022 05:04:10 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.372.1670591049409236640 for ; Fri, 09 Dec 2022 05:04:09 -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-584-fxjClHtzOReMpgcASu3rMw-1; Fri, 09 Dec 2022 08:03:52 -0500 X-MC-Unique: fxjClHtzOReMpgcASu3rMw-1 X-Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 20FF5101A54E for ; Fri, 9 Dec 2022 13:03:52 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.102]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 8D4C8492CA2; Fri, 9 Dec 2022 13:03:51 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 1F5A518009A1; Fri, 9 Dec 2022 14:03:48 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Pawel Polawski , Oliver Steffen , Gerd Hoffmann Subject: [edk2-devel] [PATCH v2 1/3] OvmfPkg: move dsc and fdf include snippets for TPM support to subdirs Date: Fri, 9 Dec 2022 14:03:46 +0100 Message-Id: <20221209130348.59145-2-kraxel@redhat.com> In-Reply-To: <20221209130348.59145-1-kraxel@redhat.com> References: <20221209130348.59145-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.9 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: smOSZv5klM88YupoKVRGOErWx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1670591050; bh=/SmJ+A+xxpFUeqWhNgwCKLWFCcWmEIQzVb75Gac5EPY=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=LlnJW4yw4HN4EcYWojTF7hxCH2wIUe+rm5508HEdQ7vov+dj8EFP6QEhbr6OxrLd1uF ElL1ouQxOmk2oIRZnEWY5uELA26IBSB99qAlNsY+WRIfVDjgww1Ns+9VKBRZ0lwOj6BEH u6UrEWAkoPZY1Kb0NZiU0CL4TY/WkGipxjM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1670591051321100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Gerd Hoffmann Reviewed-by: Jiewen Yao --- .../{ =3D> Include/Dsc}/OvmfTpmComponentsDxe.dsc.inc | 0 .../{ =3D> Include/Dsc}/OvmfTpmComponentsPei.dsc.inc | 0 OvmfPkg/{ =3D> Include/Dsc}/OvmfTpmDefines.dsc.inc | 0 OvmfPkg/{ =3D> Include/Dsc}/OvmfTpmLibs.dsc.inc | 0 OvmfPkg/{ =3D> Include/Dsc}/OvmfTpmPcds.dsc.inc | 0 OvmfPkg/{ =3D> Include/Dsc}/OvmfTpmPcdsHii.dsc.inc | 0 .../{ =3D> Include/Dsc}/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 +++++++------- 13 files changed, 36 insertions(+), 36 deletions(-) rename OvmfPkg/{ =3D> Include/Dsc}/OvmfTpmComponentsDxe.dsc.inc (100%) rename OvmfPkg/{ =3D> Include/Dsc}/OvmfTpmComponentsPei.dsc.inc (100%) rename OvmfPkg/{ =3D> Include/Dsc}/OvmfTpmDefines.dsc.inc (100%) rename OvmfPkg/{ =3D> Include/Dsc}/OvmfTpmLibs.dsc.inc (100%) rename OvmfPkg/{ =3D> Include/Dsc}/OvmfTpmPcds.dsc.inc (100%) rename OvmfPkg/{ =3D> Include/Dsc}/OvmfTpmPcdsHii.dsc.inc (100%) rename OvmfPkg/{ =3D> Include/Dsc}/OvmfTpmSecurityStub.dsc.inc (100%) diff --git a/OvmfPkg/OvmfTpmComponentsDxe.dsc.inc b/OvmfPkg/Include/Dsc/Ovm= fTpmComponentsDxe.dsc.inc similarity index 100% rename from OvmfPkg/OvmfTpmComponentsDxe.dsc.inc rename to OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc diff --git a/OvmfPkg/OvmfTpmComponentsPei.dsc.inc b/OvmfPkg/Include/Dsc/Ovm= fTpmComponentsPei.dsc.inc similarity index 100% rename from OvmfPkg/OvmfTpmComponentsPei.dsc.inc rename to OvmfPkg/Include/Dsc/OvmfTpmComponentsPei.dsc.inc diff --git a/OvmfPkg/OvmfTpmDefines.dsc.inc b/OvmfPkg/Include/Dsc/OvmfTpmDe= fines.dsc.inc similarity index 100% rename from OvmfPkg/OvmfTpmDefines.dsc.inc rename to OvmfPkg/Include/Dsc/OvmfTpmDefines.dsc.inc diff --git a/OvmfPkg/OvmfTpmLibs.dsc.inc b/OvmfPkg/Include/Dsc/OvmfTpmLibs.= dsc.inc similarity index 100% rename from OvmfPkg/OvmfTpmLibs.dsc.inc rename to OvmfPkg/Include/Dsc/OvmfTpmLibs.dsc.inc diff --git a/OvmfPkg/OvmfTpmPcds.dsc.inc b/OvmfPkg/Include/Dsc/OvmfTpmPcds.= dsc.inc similarity index 100% rename from OvmfPkg/OvmfTpmPcds.dsc.inc rename to OvmfPkg/Include/Dsc/OvmfTpmPcds.dsc.inc diff --git a/OvmfPkg/OvmfTpmPcdsHii.dsc.inc b/OvmfPkg/Include/Dsc/OvmfTpmPc= dsHii.dsc.inc similarity index 100% rename from OvmfPkg/OvmfTpmPcdsHii.dsc.inc rename to OvmfPkg/Include/Dsc/OvmfTpmPcdsHii.dsc.inc diff --git a/OvmfPkg/OvmfTpmSecurityStub.dsc.inc b/OvmfPkg/Include/Dsc/Ovmf= TpmSecurityStub.dsc.inc similarity index 100% rename from OvmfPkg/OvmfTpmSecurityStub.dsc.inc rename to OvmfPkg/Include/Dsc/OvmfTpmSecurityStub.dsc.inc diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc index 8f7cae787e97..e0b04d673419 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/Include/Dsc/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/Include/Dsc/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/Include/Dsc/OvmfTpmPcds.dsc.inc =20 gEfiMdePkgTokenSpaceGuid.PcdFSBClock|1000000000 =20 [PcdsDynamicHii] -!include OvmfPkg/OvmfTpmPcdsHii.dsc.inc +!include OvmfPkg/Include/Dsc/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/Include/Dsc/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/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } =20 MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -766,4 +766,4 @@ [Components] # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc index ce277cb2398b..fcc5722a6b66 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/Include/Dsc/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/Include/Dsc/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/Include/Dsc/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/Include/Dsc/OvmfTpmPcdsHii.dsc.inc =20 ##########################################################################= ###### # @@ -690,7 +690,7 @@ [Components] !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/Include/Dsc/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/Include/Dsc/OvmfTpmSecurityStub.dsc.inc !endif } =20 @@ -945,4 +945,4 @@ [Components] # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index 994a02d30107..649005201fcb 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/Include/Dsc/OvmfTpmSecurityStub.dsc.inc !endif } =20 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 6f774baf90f5..5a2214a872ed 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/Include/Dsc/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/Include/Dsc/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/Include/Dsc/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/Include/Dsc/OvmfTpmPcdsHii.dsc.inc =20 ##########################################################################= ###### # @@ -721,7 +721,7 @@ [Components] !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/Include/Dsc/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/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } =20 MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -1014,7 +1014,7 @@ [Components] # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/Include/Dsc/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..bac41d7309c7 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/Include/Dsc/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/Include/Dsc/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/Include/Dsc/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/Include/Dsc/OvmfTpmPcdsHii.dsc.inc =20 ##########################################################################= ###### # @@ -734,7 +734,7 @@ [Components.IA32] !endif UefiCpuPkg/CpuMpPei/CpuMpPei.inf =20 -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/Include/Dsc/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/Include/Dsc/OvmfTpmSecurityStub.dsc.inc } =20 MdeModulePkg/Universal/EbcDxe/EbcDxe.inf @@ -1032,4 +1032,4 @@ [Components.X64] # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.inc diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 63c3a47aea30..9b6257a6919e 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/Include/Dsc/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/Include/Dsc/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/Include/Dsc/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/Include/Dsc/OvmfTpmPcdsHii.dsc.inc =20 ##########################################################################= ###### # @@ -780,7 +780,7 @@ [Components] NULL|OvmfPkg/Library/MpInitLibDepLib/PeiMpInitLibUpDepLib.inf } =20 -!include OvmfPkg/OvmfTpmComponentsPei.dsc.inc +!include OvmfPkg/Include/Dsc/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/Include/Dsc/OvmfTpmSecurityStub.dsc.inc !endif } =20 @@ -1102,4 +1102,4 @@ [Components] # # TPM support # -!include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc +!include OvmfPkg/Include/Dsc/OvmfTpmComponentsDxe.dsc.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 (#97182): https://edk2.groups.io/g/devel/message/97182 Mute This Topic: https://groups.io/mt/95559461/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 19 17:00:23 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+97180+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+97180+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1670591040; cv=none; d=zohomail.com; s=zohoarc; b=i027m+74DhG6Cm70XZ4qKrC8g28AWmK0wt8VFUkj2XNt2RGFupNSDEKxmMwKrTapbWJK3/WTqvi+nBRhOkqIWqTRuFU4djpe21BlTCGldJtfFbr6cLCC7ZVgc6ArGEvvfThHKyY/cZhnTe9RAJaEO7CZlPn9bbUrgZXmIBpfeVM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670591040; 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=bIwGViMZVAy5c5Uj/ylDtwKllMOLt0fGt57uP2PvFvE=; b=Pg7I3PAEfvf6+239klJQDaPcl60xeUvsBsP/3rQgSBJMb2/+EjSq5Bjj1arT24VnWZ9/IBU1QYoaEC+8ag8u8SxsWEZDvU8/AQpWkzajw6oA1sAEbgUAQIXKYaCVV9hCvBHEgnoOFTzNm7vs6DnUBa7+9fn+KzIMbwRRnYU2ZIM= 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+97180+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 1670591040262630.2433900988925; Fri, 9 Dec 2022 05:04:00 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id OzPnYY1788612xj6gkxpI7V2; Fri, 09 Dec 2022 05:03:59 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web11.342.1670591038922624560 for ; Fri, 09 Dec 2022 05:03:59 -0800 X-Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-346-VIEMCYEfMhSYLtS0ww9-aA-1; Fri, 09 Dec 2022 08:03:56 -0500 X-MC-Unique: VIEMCYEfMhSYLtS0ww9-aA-1 X-Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 7F8713C0219F for ; Fri, 9 Dec 2022 13:03:56 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.102]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4A7551415102; Fri, 9 Dec 2022 13:03:56 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 280CA18009A5; Fri, 9 Dec 2022 14:03:48 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Pawel Polawski , Oliver Steffen , Gerd Hoffmann Subject: [edk2-devel] [PATCH v2 2/3] OvmfPkg: move dsc include snippet for Network support to Include/Dsc Date: Fri, 9 Dec 2022 14:03:47 +0100 Message-Id: <20221209130348.59145-3-kraxel@redhat.com> In-Reply-To: <20221209130348.59145-1-kraxel@redhat.com> References: <20221209130348.59145-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 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: 3WP85ANjzTexvHI5LD7N78GPx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1670591039; bh=NKkpehOJQ5SBdjfWO39ZsjfhmMtyZ/D5moo3mbNfsy4=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=vpfYIEcNzB18hvQGnG1CeRN4yGTIrpr1roroV8oCHFo3D/cbNwpY5Gfrx3iuQS+L+2b gGtinDjcOueaSmw+61B2l7QBc5EKqchHUdW1caOgFBEx1rYKro2jwulFdkga5LXF1+8k1 gMtNJeqGCYsSvullMsxJOq+yykjaw+/S7VM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1670591041211100001 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Gerd Hoffmann Reviewed-by: Jiewen Yao --- OvmfPkg/{ =3D> Include/Dsc}/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> Include/Dsc}/NetworkComponents.dsc.inc (100%) diff --git a/OvmfPkg/NetworkComponents.dsc.inc b/OvmfPkg/Include/Dsc/Networ= kComponents.dsc.inc similarity index 100% rename from OvmfPkg/NetworkComponents.dsc.inc rename to OvmfPkg/Include/Dsc/NetworkComponents.dsc.inc diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc index fcc5722a6b66..4fe7cb5f1b68 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/Include/Dsc/NetworkComponents.dsc.inc =20 OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc index 649005201fcb..93d4cf3da255 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/Include/Dsc/NetworkComponents.dsc.inc =20 OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc index 5a2214a872ed..f8250fa63546 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/Include/Dsc/NetworkComponents.dsc.inc =20 OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc index bac41d7309c7..aca292ce83cf 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/Include/Dsc/NetworkComponents.dsc.inc =20 OvmfPkg/VirtioNetDxe/VirtioNet.inf =20 diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc index 9b6257a6919e..3f6465d8d603 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/Include/Dsc/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 (#97180): https://edk2.groups.io/g/devel/message/97180 Mute This Topic: https://groups.io/mt/95559458/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 19 17:00:23 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+97181+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+97181+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1670591041; cv=none; d=zohomail.com; s=zohoarc; b=Drc+H+kzS1L6bjl4D2kV6OgUFrhgJ+tjJk+LZJ9HK2209XasjLbyiB8P/NdSs/ilHK+nDW0f+RJsgRNBR6Lx6CcQa5ym8gg+CDinb3Ph3Gl9GC4BT7oF8YP3s4X0rpyARaFN824GdkfWraENrzb8C2suooY25bt3bzkyBt60dYM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1670591041; 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=TvoCf1laN3RgSEyfx2//V7QCS4ngugwwp85//T62lP8=; b=aigG4CCn2ABeIQv5aUk5tJPRIOLgqdvfHdoxSHOjqdsQKvCVpr2Zu8B3wofqNMZkbbKma1abj4MkBJA71uCEzRFx4tBNLAAwQqB6q+/O1Th6eFPDI6MbCyyvi7Frd74sA+nH7o0mtfmY054L/5LmjOh4slkBwFk+3gEwSCkxQII= 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+97181+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 1670591041621665.7235545183692; Fri, 9 Dec 2022 05:04:01 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id wseLYY1788612x4qfFqkAh8H; Fri, 09 Dec 2022 05:04:01 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mx.groups.io with SMTP id smtpd.web10.366.1670591040650579240 for ; Fri, 09 Dec 2022 05:04:00 -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-348-_wF0SZnWMpyzPC12Z103hQ-1; Fri, 09 Dec 2022 08:03:56 -0500 X-MC-Unique: _wF0SZnWMpyzPC12Z103hQ-1 X-Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id D2260803B38 for ; Fri, 9 Dec 2022 13:03:55 +0000 (UTC) X-Received: from sirius.home.kraxel.org (unknown [10.39.192.102]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4BA732024CC0; Fri, 9 Dec 2022 13:03:55 +0000 (UTC) X-Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 2D7CD18009A6; Fri, 9 Dec 2022 14:03:48 +0100 (CET) From: "Gerd Hoffmann" To: devel@edk2.groups.io Cc: Pawel Polawski , Oliver Steffen , Gerd Hoffmann Subject: [edk2-devel] [PATCH v2 3/3] mv OvmfPkg: move fdf include snippets to Include/Fdf Date: Fri, 9 Dec 2022 14:03:48 +0100 Message-Id: <20221209130348.59145-4-kraxel@redhat.com> In-Reply-To: <20221209130348.59145-1-kraxel@redhat.com> References: <20221209130348.59145-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.4 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: Dmymj0y2o4PIpc1B9cFF6hZsx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1670591041; bh=Ztlg+wgGvliI2P9CqEKDHIf1ZEWbLPPMFmUdKY1iIt4=; h=Cc:Content-Type:Date:From:Reply-To:Subject:To; b=P/TlbaXxb1TCk9118wWcxiyDUsOO2Z4blKsAe7tPA4niwtNfOMoWjvlfs+5DN3WxCsz rvxhyvst9Lq6xE0uOKqX5vqXNwZr7IgJu1M2C+rQMw47RT2MOmJFe0Oj0d5yxld+ayocX LDtq8reeReOoC5sZ156Fd7ZlXjb5c1b5Cgk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1670591043279100005 Content-Type: text/plain; charset="utf-8"; x-default="true" Signed-off-by: Gerd Hoffmann Reviewed-by: Jiewen Yao --- 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> Include/Fdf}/FvmainCompactScratchEnd.fdf.inc | 0 OvmfPkg/{ =3D> Include/Fdf}/OvmfPkgDefines.fdf.inc | 0 OvmfPkg/{ =3D> Include/Fdf}/VarStore.fdf.inc | 0 OvmfPkg/{ =3D> Include/Fdf}/XenElfHeader.fdf.inc | 0 16 files changed, 33 insertions(+), 33 deletions(-) rename OvmfPkg/{ =3D> Include/Fdf}/FvmainCompactScratchEnd.fdf.inc (100%) rename OvmfPkg/{ =3D> Include/Fdf}/OvmfPkgDefines.fdf.inc (100%) rename OvmfPkg/{ =3D> Include/Fdf}/VarStore.fdf.inc (100%) rename OvmfPkg/{ =3D> Include/Fdf}/XenElfHeader.fdf.inc (100%) diff --git a/OvmfPkg/AmdSev/AmdSevX64.fdf b/OvmfPkg/AmdSev/AmdSevX64.fdf index 4658e1d30ed0..5fb3b5d27632 100644 --- a/OvmfPkg/AmdSev/AmdSevX64.fdf +++ b/OvmfPkg/AmdSev/AmdSevX64.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/Include/Fdf/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/Include/Fdf/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/Include/Fdf/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/Bhyve/BhyveX64.fdf b/OvmfPkg/Bhyve/BhyveX64.fdf index e8227f865f75..153b3cfeba55 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/Include/Fdf/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/Include/Fdf/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/Include/Fdf/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/CloudHv/CloudHvX64.fdf b/OvmfPkg/CloudHv/CloudHvX64.fdf index a41a5536933d..0d13d4066d27 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/Include/Fdf/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.fdf b/OvmfPkg/IntelTdx/IntelTdxX6= 4.fdf index 6923eb883113..e79ad3e10217 100644 --- a/OvmfPkg/IntelTdx/IntelTdxX64.fdf +++ b/OvmfPkg/IntelTdx/IntelTdxX64.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/Include/Fdf/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/Include/Fdf/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/Include/Fdf/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/Include/Fdf/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/Microvm/MicrovmX64.fdf b/OvmfPkg/Microvm/MicrovmX64.fdf index 380ba3a36883..b83fd1e6e4fe 100644 --- a/OvmfPkg/Microvm/MicrovmX64.fdf +++ b/OvmfPkg/Microvm/MicrovmX64.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkg/OvmfPkgDefines.fdf.inc +!include OvmfPkg/Include/Fdf/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/Include/Fdf/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/Include/Fdf/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfPkgIa32.fdf b/OvmfPkg/OvmfPkgIa32.fdf index 7023ade8cebe..72bce02caba1 100644 --- a/OvmfPkg/OvmfPkgIa32.fdf +++ b/OvmfPkg/OvmfPkgIa32.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/Include/Fdf/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/Include/Fdf/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/Include/Fdf/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/Include/Fdf/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfPkgIa32X64.fdf b/OvmfPkg/OvmfPkgIa32X64.fdf index 80de4fa2c0df..576c985ae008 100644 --- a/OvmfPkg/OvmfPkgIa32X64.fdf +++ b/OvmfPkg/OvmfPkgIa32X64.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/Include/Fdf/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/Include/Fdf/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/Include/Fdf/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/Include/Fdf/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfPkgX64.fdf b/OvmfPkg/OvmfPkgX64.fdf index c0f5a1ef3c30..c4aa88243186 100644 --- a/OvmfPkg/OvmfPkgX64.fdf +++ b/OvmfPkg/OvmfPkgX64.fdf @@ -11,7 +11,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/Include/Fdf/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/Include/Fdf/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/Include/Fdf/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/Include/Fdf/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/OvmfXen.fdf b/OvmfPkg/OvmfXen.fdf index 029b7dadcb25..8be69338c7b6 100644 --- a/OvmfPkg/OvmfXen.fdf +++ b/OvmfPkg/OvmfXen.fdf @@ -12,7 +12,7 @@ ##########################################################################= ###### =20 [Defines] -!include OvmfPkgDefines.fdf.inc +!include OvmfPkg/Include/Fdf/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/Include/Fdf/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/Include/Fdf/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/Include/Fdf/FvmainCompactScratchEnd.fdf.inc =20 ##########################################################################= ###### =20 diff --git a/OvmfPkg/Include/WorkArea.h b/OvmfPkg/Include/WorkArea.h index bf56fc4a6f65..6c3702b716f0 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/Include/Fdf/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..f75877096e11 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/Include/Fdf/FvmainCompactScratchEnd.fdf.inc. =20 **/ VOID diff --git a/OvmfPkg/Sec/AmdSev.c b/OvmfPkg/Sec/AmdSev.c index 6af38aaf46ee..520b1251321b 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/Include/Fdf/FvmainCompactScratchEnd.fdf.inc. =20 **/ VOID diff --git a/OvmfPkg/FvmainCompactScratchEnd.fdf.inc b/OvmfPkg/Include/Fdf/= FvmainCompactScratchEnd.fdf.inc similarity index 100% rename from OvmfPkg/FvmainCompactScratchEnd.fdf.inc rename to OvmfPkg/Include/Fdf/FvmainCompactScratchEnd.fdf.inc diff --git a/OvmfPkg/OvmfPkgDefines.fdf.inc b/OvmfPkg/Include/Fdf/OvmfPkgDe= fines.fdf.inc similarity index 100% rename from OvmfPkg/OvmfPkgDefines.fdf.inc rename to OvmfPkg/Include/Fdf/OvmfPkgDefines.fdf.inc diff --git a/OvmfPkg/VarStore.fdf.inc b/OvmfPkg/Include/Fdf/VarStore.fdf.inc similarity index 100% rename from OvmfPkg/VarStore.fdf.inc rename to OvmfPkg/Include/Fdf/VarStore.fdf.inc diff --git a/OvmfPkg/XenElfHeader.fdf.inc b/OvmfPkg/Include/Fdf/XenElfHeade= r.fdf.inc similarity index 100% rename from OvmfPkg/XenElfHeader.fdf.inc rename to OvmfPkg/Include/Fdf/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 (#97181): https://edk2.groups.io/g/devel/message/97181 Mute This Topic: https://groups.io/mt/95559459/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-